From 4be5d7232a368f1ca997337f11dd77495b08d246 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 15 三月 2025 09:30:32 +0800
Subject: [PATCH] 漂亮的方法命名3
---
src/main/java/com/whyc/controller/DevInfController.java | 16 ++++----
src/main/java/com/whyc/service/DevAlarmDataService.java | 4 +-
src/main/java/com/whyc/service/DevA200TestParamService.java | 16 ++++----
src/main/java/com/whyc/service/DevActmTestParamService.java | 12 +++---
src/main/java/com/whyc/service/DevInfService.java | 14 +++---
5 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DevInfController.java b/src/main/java/com/whyc/controller/DevInfController.java
index 47d3162..6bba5f6 100644
--- a/src/main/java/com/whyc/controller/DevInfController.java
+++ b/src/main/java/com/whyc/controller/DevInfController.java
@@ -35,19 +35,19 @@
@ApiOperation(value = "鑾峰彇璁惧淇℃伅(涓嶅垎椤电敤浜庡寘鏈虹粍)")
@GetMapping("getDinf")
- public Response getDinf(){
- return service.getDinf();
+ public Response getDevInf(){
+ return service.getDevInf();
}
@ApiOperation(value = "鏍规嵁璁惧id鑾峰彇璁惧淇℃伅")
@GetMapping("getDinfById")
- public Response getDinfById(@RequestParam Integer devId){
- return service.getDinfById(devId);
+ public Response getDevInfById(@RequestParam Integer devId){
+ return service.getDevInfById(devId);
}
@ApiOperation(value = "鑾峰彇宸︿晶鍒楄〃")
@GetMapping("getDevBytype")
- public Response getDevBytype(@RequestParam(required = false) Integer devType){
- return service.getDevBytype(devType);
+ public Response getDevByType(@RequestParam(required = false) Integer devType){
+ return service.getDevByType(devType);
}
@ApiOperation(value = "鏂拌幏鍙栧乏渚у垪琛�")
@@ -65,8 +65,8 @@
@ApiOperation(value = "鍒犻櫎璁惧(鍚屾椂鍒犻櫎瀹炴椂鍜屽寘鏈虹粍淇℃伅)")
@GetMapping("delDinf")
- public Response delDinf( Integer devId){
- return service.delDinf(devId);
+ public Response delDevInf( Integer devId){
+ return service.delDevInf(devId);
}
@ApiOperation(value = "寮哄埗绉婚櫎鎵归噺璁惧")
diff --git a/src/main/java/com/whyc/service/DevA200TestParamService.java b/src/main/java/com/whyc/service/DevA200TestParamService.java
index 9e512c9..b40daec 100644
--- a/src/main/java/com/whyc/service/DevA200TestParamService.java
+++ b/src/main/java/com/whyc/service/DevA200TestParamService.java
@@ -33,7 +33,7 @@
private DevA200TestParamMapper mapper;
@Autowired(required = false)
- private DevInfMapper dinfMapper;
+ private DevInfMapper devInfMapper;
private final RestTemplate restTemplate;
@@ -64,7 +64,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
ResultA200Dto dto= getA200Dto(url);
if(dto.getCode().equals("200")){
@@ -85,7 +85,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -137,7 +137,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/startTest";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -150,7 +150,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/pauseTest";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -163,7 +163,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/stopTest";
ResultA200Dto dto= getA200Dto(url);
return dto;
@@ -197,7 +197,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- dinfMapper.update(null,wrapper);
+ devInfMapper.update(null,wrapper);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺鎺у埗a200涓�浣撴満");
@@ -240,7 +240,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- dinfMapper.update(null,wrapper);
+ devInfMapper.update(null,wrapper);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺鎺у埗a200涓�浣撴満");
diff --git a/src/main/java/com/whyc/service/DevActmTestParamService.java b/src/main/java/com/whyc/service/DevActmTestParamService.java
index d545e26..71782e8 100644
--- a/src/main/java/com/whyc/service/DevActmTestParamService.java
+++ b/src/main/java/com/whyc/service/DevActmTestParamService.java
@@ -32,7 +32,7 @@
private DevActmTestParamMapper mapper;
@Autowired(required = false)
- private DevInfMapper dinfMapper;
+ private DevInfMapper devInfMapper;
private final RestTemplate restTemplate;
@@ -46,7 +46,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -69,7 +69,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -126,7 +126,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -171,7 +171,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- dinfMapper.update(null,wrapper);
+ devInfMapper.update(null,wrapper);
}
map.put(devId,dto);
}
@@ -198,7 +198,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevInf dinf=devInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/setBatteryStorageNumber";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
diff --git a/src/main/java/com/whyc/service/DevAlarmDataService.java b/src/main/java/com/whyc/service/DevAlarmDataService.java
index 08a70f4..f6d8cd6 100644
--- a/src/main/java/com/whyc/service/DevAlarmDataService.java
+++ b/src/main/java/com/whyc/service/DevAlarmDataService.java
@@ -30,7 +30,7 @@
private SubTablePageInfoUtil service;
@Autowired(required = false)
- private UserInfService uinfService;
+ private UserInfService uerInfService;
//鑾峰彇璁惧鍛婅淇℃伅
public Response getDevAlmInf(int uid, DalmDto dto) {
@@ -38,7 +38,7 @@
dto.setUid(uid);
List<DevAlarmData> list=mapper.getDevAlmInf(dto);
for (DevAlarmData data:list) {
- UserInf uinf=uinfService.getUinfByUId(data.getConfirmedUid());
+ UserInf uinf=uerInfService.getUinfByUId(data.getConfirmedUid());
data.setConfirmedUname(uinf!=null?uinf.getUname():"");
int almId=data.getAlmId();
data.setAlmName(DevAlmEnum.getValue(almId));
diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevInfService.java
index 77e4715..4065eb9 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevInfService.java
@@ -34,7 +34,7 @@
private ActmRealStateMapper actmMapper;
@Autowired(required = false)
- private BattGroupBaojiGroupMapper battBjmapper;
+ private BattGroupBaojiGroupMapper battBaojiMapper;
//娣诲姞璁惧
@Transactional
@@ -55,7 +55,7 @@
listBj.add(baojigroup);
}
//灏嗚澶囨坊鍔犺繘鎸囧畾鐨勫寘鏈虹粍
- battBjmapper.insertBatchSomeColumn(listBj);
+ battBaojiMapper.insertBatchSomeColumn(listBj);
}
}
return new Response().set(1,bl>0);
@@ -106,7 +106,7 @@
}
//鑾峰彇宸︿晶鍒楄〃
- public Response getDevBytype(Integer devType) {
+ public Response getDevByType(Integer devType) {
QueryWrapper wrapper=new QueryWrapper();
if (devType!=null){
wrapper.eq("dev_type",devType);
@@ -149,7 +149,7 @@
return new Response().set(1,flag>0,"缂栬緫璁惧淇℃伅");
}
//鑾峰彇璁惧淇℃伅(涓嶅垎椤电敤浜庡寘鏈虹粍)
- public Response getDinf() {
+ public Response getDevInf() {
QueryWrapper wrapper=new QueryWrapper();
wrapper.orderByAsc("dev_id");
List<DevInf> list=mapper.selectList(wrapper);
@@ -157,7 +157,7 @@
}
//鏍规嵁璁惧id鑾峰彇璁惧淇℃伅
- public Response getDinfById(Integer devId) {
+ public Response getDevInfById(Integer devId) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
@@ -166,11 +166,11 @@
}
//鍒犻櫎璁惧(鍚屾椂鍒犻櫎瀹炴椂鍜屽寘鏈虹粍淇℃伅)
@Transactional
- public Response delDinf(Integer devId) {
+ public Response delDevInf(Integer devId) {
//鍏堝垹闄ゅ寘鏈虹粍淇℃伅
UpdateWrapper baojiWrapper=new UpdateWrapper();
baojiWrapper.eq("dev_id",devId);
- battBjmapper.delete(baojiWrapper);
+ battBaojiMapper.delete(baojiWrapper);
//鍐嶅垹闄ゅ疄鏃朵俊鎭�
if(devId/100000000==1){
UpdateWrapper a200Wrapper=new UpdateWrapper();
--
Gitblit v1.9.1