From 1f7c4004dfa2d39e3b761ce4a833f47d7663f461 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 14 三月 2025 17:23:06 +0800
Subject: [PATCH] 类名命名规范化
---
src/main/java/com/whyc/mapper/BattGroupUsrMapper.java | 2
src/main/java/com/whyc/service/BaojiGroupService.java | 14 +-
src/main/java/com/whyc/mapper/BattAlarmParamMapper.java | 2
src/main/java/com/whyc/service/ExcelExportService.java | 2
src/main/java/com/whyc/service/BattTestDataIdService.java | 2
src/main/java/com/whyc/webSocket/DevStaticSocket.java | 6
src/main/java/com/whyc/service/BattGroupBaojiGroupService.java | 6
src/main/java/com/whyc/mapper/BattTestDataIdMapper.java | 6 +
src/main/java/com/whyc/controller/DevAlarmDataHisController.java | 2
src/main/java/com/whyc/service/PoweralarmParamService.java | 5
src/main/resources/mapper/PowerAlarmParamMapper.xml | 2
src/main/java/com/whyc/mapper/BattTestDataInfMapper.java | 2
src/main/java/com/whyc/mapper/BattRtDataMapper.java | 6 +
src/main/java/com/whyc/service/A200RealStateService.java | 6
src/main/resources/mapper/BaojiGroupMapper.xml | 4
src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java | 2
src/main/java/com/whyc/controller/AlarmParamController.java | 4
src/main/java/com/whyc/mapper/ActmRealStateMapper.java | 6 +
src/main/java/com/whyc/service/BattRtDataService.java | 6
src/main/java/com/whyc/service/BattGroupUsrService.java | 6
src/main/java/com/whyc/webSocket/DevRtStateSocket.java | 18 ++--
src/main/resources/mapper/BattTestDataIdMapper.xml | 2
src/main/java/com/whyc/service/ActmRealStateService.java | 6
src/main/java/com/whyc/mapper/BaojiGroupMapper.java | 2
src/main/java/com/whyc/service/DevInfService.java | 12 +-
src/main/resources/mapper/BattGroupUsrMapper.xml | 2
src/main/resources/mapper/BattTestDataInfMapper.xml | 4
/dev/null | 6 -
src/main/java/com/whyc/service/BattTestDataInfService.java | 10 +-
src/main/java/com/whyc/mapper/A200RealStateMapper.java | 6 +
src/main/resources/mapper/BattGroupBaojiGroupMapper.xml | 2
src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java | 14 +-
src/main/resources/mapper/BattAlarmParamMapper.xml | 4
src/main/java/com/whyc/controller/BattTestDataInfController.java | 6
src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java | 2
src/main/java/com/whyc/service/BattAlarmParamService.java | 7 -
36 files changed, 105 insertions(+), 89 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmParamController.java b/src/main/java/com/whyc/controller/AlarmParamController.java
index 87bbc50..d9a6de9 100644
--- a/src/main/java/com/whyc/controller/AlarmParamController.java
+++ b/src/main/java/com/whyc/controller/AlarmParamController.java
@@ -3,7 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.pojo.db_param.PoweralarmParam;
-import com.whyc.service.BattalarmParamService;
+import com.whyc.service.BattAlarmParamService;
import com.whyc.service.PoweralarmParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +18,7 @@
public class AlarmParamController {
@Autowired
- private BattalarmParamService service;
+ private BattAlarmParamService service;
@Autowired
private PoweralarmParamService powerService;
diff --git a/src/main/java/com/whyc/controller/BattgroupBaojigroupController.java b/src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java
similarity index 86%
rename from src/main/java/com/whyc/controller/BattgroupBaojigroupController.java
rename to src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java
index ca8d78b..f2dc490 100644
--- a/src/main/java/com/whyc/controller/BattgroupBaojigroupController.java
+++ b/src/main/java/com/whyc/controller/BattGroupBaojiGroupController.java
@@ -3,9 +3,9 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.BaojigroupService;
-import com.whyc.service.BattgroupBaojigroupService;
-import com.whyc.service.BattgroupUsrService;
+import com.whyc.service.BaojiGroupService;
+import com.whyc.service.BattGroupBaojiGroupService;
+import com.whyc.service.BattGroupUsrService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,15 +17,15 @@
@RestController
@Api(tags = "鍖呮満缁勭鐞�")
@RequestMapping("baoji")
-public class BattgroupBaojigroupController {
+public class BattGroupBaojiGroupController {
@Autowired
- private BattgroupBaojigroupService groupService;
+ private BattGroupBaojiGroupService groupService;
@Autowired
- private BattgroupUsrService usrService;
+ private BattGroupUsrService usrService;
@Autowired
- private BaojigroupService baojiService;
+ private BaojiGroupService baojiService;
@ApiOperation(value = "娣诲姞鍖呮満缁�")
diff --git a/src/main/java/com/whyc/controller/BatttestdataInfController.java b/src/main/java/com/whyc/controller/BattTestDataInfController.java
similarity index 93%
rename from src/main/java/com/whyc/controller/BatttestdataInfController.java
rename to src/main/java/com/whyc/controller/BattTestDataInfController.java
index 79aa8f9..a73e6ac 100644
--- a/src/main/java/com/whyc/controller/BatttestdataInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestDataInfController.java
@@ -1,7 +1,7 @@
package com.whyc.controller;
import com.whyc.dto.Response;
-import com.whyc.service.BatttestdataInfService;
+import com.whyc.service.BattTestDataInfService;
import com.whyc.service.ExcelExportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,9 +17,9 @@
@RestController
@Api(tags = "娴嬭瘯绠＄悊")
@RequestMapping("tinf")
-public class BatttestdataInfController {
+public class BattTestDataInfController {
@Autowired
- private BatttestdataInfService service;
+ private BattTestDataInfService service;
@Autowired
private ExcelExportService exportService;
diff --git a/src/main/java/com/whyc/controller/DevalarmDataHisController.java b/src/main/java/com/whyc/controller/DevAlarmDataHisController.java
similarity index 97%
rename from src/main/java/com/whyc/controller/DevalarmDataHisController.java
rename to src/main/java/com/whyc/controller/DevAlarmDataHisController.java
index d2183e8..77be2db 100644
--- a/src/main/java/com/whyc/controller/DevalarmDataHisController.java
+++ b/src/main/java/com/whyc/controller/DevAlarmDataHisController.java
@@ -15,7 +15,7 @@
@RestController
@Api(tags = "鍘嗗彶鍛婅绠＄悊")
@RequestMapping("tinf")
-public class DevalarmDataHisController {
+public class DevAlarmDataHisController {
@Autowired
private DevAlarmDataService dataService;
diff --git a/src/main/java/com/whyc/mapper/A200RealStateMapper.java b/src/main/java/com/whyc/mapper/A200RealStateMapper.java
new file mode 100644
index 0000000..16892fc
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/A200RealStateMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
+
+public interface A200RealStateMapper extends CustomMapper<A200Realstate>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/A200RealstateMapper.java b/src/main/java/com/whyc/mapper/A200RealstateMapper.java
deleted file mode 100644
index 813234b..0000000
--- a/src/main/java/com/whyc/mapper/A200RealstateMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
-
-public interface A200RealstateMapper extends CustomMapper<A200Realstate>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/ActmRealStateMapper.java b/src/main/java/com/whyc/mapper/ActmRealStateMapper.java
new file mode 100644
index 0000000..96123c4
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/ActmRealStateMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
+
+public interface ActmRealStateMapper extends CustomMapper<ActmRealstate>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/ActmRealstateMapper.java b/src/main/java/com/whyc/mapper/ActmRealstateMapper.java
deleted file mode 100644
index 322d416..0000000
--- a/src/main/java/com/whyc/mapper/ActmRealstateMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
-
-public interface ActmRealstateMapper extends CustomMapper<ActmRealstate>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BaojigroupMapper.java b/src/main/java/com/whyc/mapper/BaojiGroupMapper.java
similarity index 84%
rename from src/main/java/com/whyc/mapper/BaojigroupMapper.java
rename to src/main/java/com/whyc/mapper/BaojiGroupMapper.java
index 6e53d95..3371b51 100644
--- a/src/main/java/com/whyc/mapper/BaojigroupMapper.java
+++ b/src/main/java/com/whyc/mapper/BaojiGroupMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
-public interface BaojigroupMapper extends CustomMapper<BaojiGroup>{
+public interface BaojiGroupMapper extends CustomMapper<BaojiGroup>{
//鑾峰彇鏈�澶х殑鍖呮満缁勭紪鍙�
Integer getMaxBaojiGroupId();
diff --git a/src/main/java/com/whyc/mapper/BattalarmParamMapper.java b/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java
similarity index 81%
rename from src/main/java/com/whyc/mapper/BattalarmParamMapper.java
rename to src/main/java/com/whyc/mapper/BattAlarmParamMapper.java
index 0d5a183..00a3dc0 100644
--- a/src/main/java/com/whyc/mapper/BattalarmParamMapper.java
+++ b/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
-public interface BattalarmParamMapper extends CustomMapper<BattalarmParam>{
+public interface BattAlarmParamMapper extends CustomMapper<BattalarmParam>{
//鐢垫睜鍛婅鍙傛暟璁剧疆--鍒楄〃鏌ヨ
List<BattalarmParam> serchByCondition(List alarmIds);
diff --git a/src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java b/src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java
similarity index 77%
rename from src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java
rename to src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java
index 58a0b10..8bbc770 100644
--- a/src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java
+++ b/src/main/java/com/whyc/mapper/BattGroupBaojiGroupMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
-public interface BattgroupBaojigroupMapper extends CustomMapper<BattGroupBaojiGroup>{
+public interface BattGroupBaojiGroupMapper extends CustomMapper<BattGroupBaojiGroup>{
//鍖呮満缁勪笅绉婚櫎璁惧
void delDevInBaoji(List<BattGroupBaojiGroup> devList);
diff --git a/src/main/java/com/whyc/mapper/BattgroupUsrMapper.java b/src/main/java/com/whyc/mapper/BattGroupUsrMapper.java
similarity index 70%
rename from src/main/java/com/whyc/mapper/BattgroupUsrMapper.java
rename to src/main/java/com/whyc/mapper/BattGroupUsrMapper.java
index 3a0b8c9..12f23d0 100644
--- a/src/main/java/com/whyc/mapper/BattgroupUsrMapper.java
+++ b/src/main/java/com/whyc/mapper/BattGroupUsrMapper.java
@@ -4,6 +4,6 @@
import java.util.List;
-public interface BattgroupUsrMapper extends CustomMapper<BattGroupUsr>{
+public interface BattGroupUsrMapper extends CustomMapper<BattGroupUsr>{
void delUsrInBaoji(List<BattGroupUsr> usrList);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattRtDataMapper.java b/src/main/java/com/whyc/mapper/BattRtDataMapper.java
new file mode 100644
index 0000000..0a568f6
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattRtDataMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
+
+public interface BattRtDataMapper extends CustomMapper<BattRtdata>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattRtdataMapper.java b/src/main/java/com/whyc/mapper/BattRtdataMapper.java
deleted file mode 100644
index c015a0e..0000000
--- a/src/main/java/com/whyc/mapper/BattRtdataMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
-
-public interface BattRtdataMapper extends CustomMapper<BattRtdata>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattTestDataIdMapper.java b/src/main/java/com/whyc/mapper/BattTestDataIdMapper.java
new file mode 100644
index 0000000..1ff3371
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattTestDataIdMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_batt_testdata.BattTestDataId;
+
+public interface BattTestDataIdMapper extends CustomMapper<BattTestDataId>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java b/src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
similarity index 91%
rename from src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
rename to src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
index 72c0a13..d46ae4f 100644
--- a/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
@@ -5,7 +5,7 @@
import java.util.List;
-public interface BatttestdataInfMapper extends CustomMapper<BattTestDataInf>{
+public interface BattTestDataInfMapper extends CustomMapper<BattTestDataInf>{
//鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻
List<BattTestDataInf> getDevTinf(@Param("uid") int uid);
//鏈勾
diff --git a/src/main/java/com/whyc/mapper/BatttestdataIdMapper.java b/src/main/java/com/whyc/mapper/BatttestdataIdMapper.java
deleted file mode 100644
index f0c7fd1..0000000
--- a/src/main/java/com/whyc/mapper/BatttestdataIdMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_batt_testdata.BattTestDataId;
-
-public interface BatttestdataIdMapper extends CustomMapper<BattTestDataId>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/PoweralarmParamMapper.java b/src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java
similarity index 76%
rename from src/main/java/com/whyc/mapper/PoweralarmParamMapper.java
rename to src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java
index 0b5336d..6d203ca 100644
--- a/src/main/java/com/whyc/mapper/PoweralarmParamMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerAlarmParamMapper.java
@@ -4,7 +4,7 @@
import java.util.List;
-public interface PoweralarmParamMapper extends CustomMapper<PoweralarmParam>{
+public interface PowerAlarmParamMapper extends CustomMapper<PoweralarmParam>{
//鐢垫簮鍛婅鍙傛暟璁剧疆
List<PoweralarmParam> serchByCondition(List<Integer> alarmIds);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/A200RealstateService.java b/src/main/java/com/whyc/service/A200RealStateService.java
similarity index 85%
rename from src/main/java/com/whyc/service/A200RealstateService.java
rename to src/main/java/com/whyc/service/A200RealStateService.java
index 83c5917..0f5d69a 100644
--- a/src/main/java/com/whyc/service/A200RealstateService.java
+++ b/src/main/java/com/whyc/service/A200RealStateService.java
@@ -2,16 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.A200RealstateMapper;
+import com.whyc.mapper.A200RealStateMapper;
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class A200RealstateService {
+public class A200RealStateService {
@Autowired(required = false)
- private A200RealstateMapper mapper;
+ private A200RealStateMapper mapper;
//涓�浣撴満A200瀹炴椂鏁版嵁
public Response getA200State(int devId) {
diff --git a/src/main/java/com/whyc/service/ActmRealstateService.java b/src/main/java/com/whyc/service/ActmRealStateService.java
similarity index 84%
rename from src/main/java/com/whyc/service/ActmRealstateService.java
rename to src/main/java/com/whyc/service/ActmRealStateService.java
index 66c2750..1a51e35 100644
--- a/src/main/java/com/whyc/service/ActmRealstateService.java
+++ b/src/main/java/com/whyc/service/ActmRealStateService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.ActmRealstateMapper;
+import com.whyc.mapper.ActmRealStateMapper;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,10 +10,10 @@
import java.util.List;
@Service
-public class ActmRealstateService {
+public class ActmRealStateService {
@Autowired(required = false)
- private ActmRealstateMapper mapper;
+ private ActmRealStateMapper mapper;
//鍧囪 浠狝ctm瀹炴椂鏁版嵁
public Response getActmState(int devId) {
QueryWrapper wrapper=new QueryWrapper();
diff --git a/src/main/java/com/whyc/service/BaojigroupService.java b/src/main/java/com/whyc/service/BaojiGroupService.java
similarity index 90%
rename from src/main/java/com/whyc/service/BaojigroupService.java
rename to src/main/java/com/whyc/service/BaojiGroupService.java
index df9a914..9421ad4 100644
--- a/src/main/java/com/whyc/service/BaojigroupService.java
+++ b/src/main/java/com/whyc/service/BaojiGroupService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.BaojigroupMapper;
-import com.whyc.mapper.BattgroupBaojigroupMapper;
-import com.whyc.mapper.BattgroupUsrMapper;
+import com.whyc.mapper.BaojiGroupMapper;
+import com.whyc.mapper.BattGroupBaojiGroupMapper;
+import com.whyc.mapper.BattGroupUsrMapper;
import com.whyc.pojo.db_user.BaojiGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,15 +13,15 @@
import java.util.List;
@Service
-public class BaojigroupService {
+public class BaojiGroupService {
@Autowired(required = false)
- private BaojigroupMapper mapper;
+ private BaojiGroupMapper mapper;
@Autowired(required = false)
- private BattgroupBaojigroupMapper groupMapper;
+ private BattGroupBaojiGroupMapper groupMapper;
@Autowired(required = false)
- private BattgroupUsrMapper usrMapper;
+ private BattGroupUsrMapper usrMapper;
//鍖呮満缁勪笅娣诲姞璁惧
public Response addBaoji(String baojiName) {
diff --git a/src/main/java/com/whyc/service/BattalarmParamService.java b/src/main/java/com/whyc/service/BattAlarmParamService.java
similarity index 93%
rename from src/main/java/com/whyc/service/BattalarmParamService.java
rename to src/main/java/com/whyc/service/BattAlarmParamService.java
index bb658fa..cc816d4 100644
--- a/src/main/java/com/whyc/service/BattalarmParamService.java
+++ b/src/main/java/com/whyc/service/BattAlarmParamService.java
@@ -5,12 +5,11 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
-import com.whyc.mapper.BattalarmParamMapper;
+import com.whyc.mapper.BattAlarmParamMapper;
import com.whyc.pojo.db_param.BattalarmParam;
import com.whyc.util.ActionUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -18,9 +17,9 @@
import java.util.Map;
@Service
-public class BattalarmParamService {
+public class BattAlarmParamService {
@Resource
- private BattalarmParamMapper mapper;
+ private BattAlarmParamMapper mapper;
//鐢垫睜鍛婅鍙傛暟璁剧疆--鍒楄〃鏌ヨ
public Response serchBattParamByCondition(List AlarmIds, int pageNum, int pageSize) {
diff --git a/src/main/java/com/whyc/service/BattgroupBaojigroupService.java b/src/main/java/com/whyc/service/BattGroupBaojiGroupService.java
similarity index 87%
rename from src/main/java/com/whyc/service/BattgroupBaojigroupService.java
rename to src/main/java/com/whyc/service/BattGroupBaojiGroupService.java
index c8c3b18..9617593 100644
--- a/src/main/java/com/whyc/service/BattgroupBaojigroupService.java
+++ b/src/main/java/com/whyc/service/BattGroupBaojiGroupService.java
@@ -2,15 +2,15 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.BattgroupBaojigroupMapper;
+import com.whyc.mapper.BattGroupBaojiGroupMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
-public class BattgroupBaojigroupService {
+public class BattGroupBaojiGroupService {
@Autowired(required = false)
- private BattgroupBaojigroupMapper mapper;
+ private BattGroupBaojiGroupMapper mapper;
diff --git a/src/main/java/com/whyc/service/BattgroupUsrService.java b/src/main/java/com/whyc/service/BattGroupUsrService.java
similarity index 87%
rename from src/main/java/com/whyc/service/BattgroupUsrService.java
rename to src/main/java/com/whyc/service/BattGroupUsrService.java
index d92dc06..3057c2d 100644
--- a/src/main/java/com/whyc/service/BattgroupUsrService.java
+++ b/src/main/java/com/whyc/service/BattGroupUsrService.java
@@ -2,14 +2,14 @@
import com.whyc.dto.BaojiDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.BattgroupUsrMapper;
+import com.whyc.mapper.BattGroupUsrMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class BattgroupUsrService {
+public class BattGroupUsrService {
@Autowired(required = false)
- private BattgroupUsrMapper mapper;
+ private BattGroupUsrMapper mapper;
//鍖呮満缁勪笅娣诲姞鐢ㄦ埛
public Response opreateUsrInBaoji(BaojiDto dto) {
diff --git a/src/main/java/com/whyc/service/BattRtdataService.java b/src/main/java/com/whyc/service/BattRtDataService.java
similarity index 91%
rename from src/main/java/com/whyc/service/BattRtdataService.java
rename to src/main/java/com/whyc/service/BattRtDataService.java
index 40df4cd..5b30577 100644
--- a/src/main/java/com/whyc/service/BattRtdataService.java
+++ b/src/main/java/com/whyc/service/BattRtDataService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.BattRtdataMapper;
+import com.whyc.mapper.BattRtDataMapper;
import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,10 +10,10 @@
import java.util.List;
@Service
-public class BattRtdataService {
+public class BattRtDataService {
@Autowired(required = false)
- private BattRtdataMapper mapper;
+ private BattRtDataMapper mapper;
//鑾峰彇a200鐢垫睜缁勬暟鎹�
diff --git a/src/main/java/com/whyc/service/BatttestdataIdService.java b/src/main/java/com/whyc/service/BattTestDataIdService.java
similarity index 69%
rename from src/main/java/com/whyc/service/BatttestdataIdService.java
rename to src/main/java/com/whyc/service/BattTestDataIdService.java
index 93f1162..fcfdf15 100644
--- a/src/main/java/com/whyc/service/BatttestdataIdService.java
+++ b/src/main/java/com/whyc/service/BattTestDataIdService.java
@@ -3,5 +3,5 @@
import org.springframework.stereotype.Service;
@Service
-public class BatttestdataIdService {
+public class BattTestDataIdService {
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BattTestDataInfService.java
similarity index 96%
rename from src/main/java/com/whyc/service/BatttestdataInfService.java
rename to src/main/java/com/whyc/service/BattTestDataInfService.java
index 83249af..395a250 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BattTestDataInfService.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.BatttestdataIdMapper;
-import com.whyc.mapper.BatttestdataInfMapper;
+import com.whyc.mapper.BattTestDataIdMapper;
+import com.whyc.mapper.BattTestDataInfMapper;
import com.whyc.pojo.db_batt_testdata.BattTestDataId;
import com.whyc.pojo.db_batt_testdata.BattTestDataInf;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +16,13 @@
import java.util.stream.Collectors;
@Service
-public class BatttestdataInfService {
+public class BattTestDataInfService {
@Autowired(required = false)
- private BatttestdataInfMapper mapper;
+ private BattTestDataInfMapper mapper;
@Autowired(required = false)
- private BatttestdataIdMapper dataMapper;
+ private BattTestDataIdMapper dataMapper;
@Autowired(required = false)
private SubTablePageInfoService subService;
diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevInfService.java
index 8e15f22..77e4715 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevInfService.java
@@ -7,9 +7,9 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.A200RealstateMapper;
-import com.whyc.mapper.ActmRealstateMapper;
-import com.whyc.mapper.BattgroupBaojigroupMapper;
+import com.whyc.mapper.A200RealStateMapper;
+import com.whyc.mapper.ActmRealStateMapper;
+import com.whyc.mapper.BattGroupBaojiGroupMapper;
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
@@ -28,13 +28,13 @@
private DevInfMapper mapper;
@Autowired(required = false)
- private A200RealstateMapper a200Mapper;
+ private A200RealStateMapper a200Mapper;
@Autowired(required = false)
- private ActmRealstateMapper actmMapper;
+ private ActmRealStateMapper actmMapper;
@Autowired(required = false)
- private BattgroupBaojigroupMapper battBjmapper;
+ private BattGroupBaojiGroupMapper battBjmapper;
//娣诲姞璁惧
@Transactional
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index c021b81..e2119e8 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -23,7 +23,7 @@
private SubTablePageInfoService subService;
@Autowired(required = false)
- private BatttestdataInfService infService;
+ private BattTestDataInfService infService;
//瀵煎嚭鏂囦欢
public void exportExcel1(Integer devId, Integer testRecordCount,HttpServletResponse response) {
diff --git a/src/main/java/com/whyc/service/PoweralarmParamService.java b/src/main/java/com/whyc/service/PoweralarmParamService.java
index 662cfa7..52aaad3 100644
--- a/src/main/java/com/whyc/service/PoweralarmParamService.java
+++ b/src/main/java/com/whyc/service/PoweralarmParamService.java
@@ -4,8 +4,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
-import com.whyc.mapper.PoweralarmParamMapper;
-import com.whyc.pojo.db_param.BattalarmParam;
+import com.whyc.mapper.PowerAlarmParamMapper;
import com.whyc.pojo.db_param.PoweralarmParam;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@
@Service
public class PoweralarmParamService {
@Autowired(required = false)
- private PoweralarmParamMapper mapper;
+ private PowerAlarmParamMapper mapper;
//鐢垫簮鍛婅鍙傛暟璁剧疆
public Response serchPowerParamByCondition(List<Integer> AlarmIds, int pageNum, int pageSize) {
diff --git a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java b/src/main/java/com/whyc/webSocket/DevRtStateSocket.java
index aae69d9..4af1304 100644
--- a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevRtStateSocket.java
@@ -3,9 +3,9 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.dto.RtStateDto;
-import com.whyc.service.A200RealstateService;
-import com.whyc.service.ActmRealstateService;
-import com.whyc.service.BattRtdataService;
+import com.whyc.service.A200RealStateService;
+import com.whyc.service.ActmRealStateService;
+import com.whyc.service.BattRtDataService;
import com.whyc.service.WorkStateChangeEventService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,11 +27,11 @@
private Thread thread;
- private static BattRtdataService rtdataService;
+ private static BattRtDataService rtdataService;
- private static A200RealstateService a200Service;
+ private static A200RealStateService a200Service;
- private static ActmRealstateService actmService;
+ private static ActmRealStateService actmService;
private static WorkStateChangeEventService eventService;
@@ -43,17 +43,17 @@
private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
@Autowired
- public void setBattRtdataService(BattRtdataService rtdataService) {
+ public void setBattRtdataService(BattRtDataService rtdataService) {
DevRtStateSocket.rtdataService = rtdataService;
}
@Autowired
- public void setA200RealstateService(A200RealstateService a200Service) {
+ public void setA200RealstateService(A200RealStateService a200Service) {
DevRtStateSocket.a200Service = a200Service;
}
@Autowired
- public void setActmRealstateService(ActmRealstateService actmService) {
+ public void setActmRealstateService(ActmRealStateService actmService) {
DevRtStateSocket.actmService = actmService;
}
diff --git a/src/main/java/com/whyc/webSocket/DevStaticSocket.java b/src/main/java/com/whyc/webSocket/DevStaticSocket.java
index 6ffc412..9f3f632 100644
--- a/src/main/java/com/whyc/webSocket/DevStaticSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevStaticSocket.java
@@ -4,7 +4,7 @@
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.BatttestdataInfService;
+import com.whyc.service.BattTestDataInfService;
import com.whyc.service.DevInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@
private static DevInfService dinfService;
- private static BatttestdataInfService tinfService;
+ private static BattTestDataInfService tinfService;
private HttpSession httpSession;
@@ -43,7 +43,7 @@
}
@Autowired
- public void setBatttestdataInfService(BatttestdataInfService tinfService) {
+ public void setBatttestdataInfService(BattTestDataInfService tinfService) {
DevStaticSocket.tinfService = tinfService;
}
diff --git a/src/main/resources/mapper/BaojigroupMapper.xml b/src/main/resources/mapper/BaojiGroupMapper.xml
similarity index 95%
rename from src/main/resources/mapper/BaojigroupMapper.xml
rename to src/main/resources/mapper/BaojiGroupMapper.xml
index 36d48b8..bd6fc40 100644
--- a/src/main/resources/mapper/BaojigroupMapper.xml
+++ b/src/main/resources/mapper/BaojiGroupMapper.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BaojigroupMapper">
+<mapper namespace="com.whyc.mapper.BaojiGroupMapper">
<select id="getMaxBaojiGroupId" resultType="java.lang.Integer">
select max(baoji_group_id) from db_user.tb_baojigroup
limit 1
</select>
- <resultMap id="baojiList" type="baojigroup">
+ <resultMap id="baojiList" type="BaojiGroup">
<id property="num" column="num"></id>
<result property="baojiGroupId" column="baoji_group_id"></result>
<result property="baojiGroupName" column="baoji_group_name"></result>
diff --git a/src/main/resources/mapper/BattalarmParamMapper.xml b/src/main/resources/mapper/BattAlarmParamMapper.xml
similarity index 86%
rename from src/main/resources/mapper/BattalarmParamMapper.xml
rename to src/main/resources/mapper/BattAlarmParamMapper.xml
index e2b5d4c..500cb95 100644
--- a/src/main/resources/mapper/BattalarmParamMapper.xml
+++ b/src/main/resources/mapper/BattAlarmParamMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BattalarmParamMapper">
- <select id="serchByCondition" resultType="BattalarmParam">
+<mapper namespace="com.whyc.mapper.BattAlarmParamMapper">
+ <select id="serchByCondition" resultType="BattAlarmParam">
select num,alm_id,alm_name,alm_high_coe,alm_low_coe,alm_high_level,alm_low_level,alm_high_en,alm_low_en from db_param.alarm_param
<where>
<if test="AlarmIds!=null and AlarmIds.size>0">
diff --git a/src/main/resources/mapper/BattgroupBaojigroupMapper.xml b/src/main/resources/mapper/BattGroupBaojiGroupMapper.xml
similarity index 86%
rename from src/main/resources/mapper/BattgroupBaojigroupMapper.xml
rename to src/main/resources/mapper/BattGroupBaojiGroupMapper.xml
index 6c59685..ff39794 100644
--- a/src/main/resources/mapper/BattgroupBaojigroupMapper.xml
+++ b/src/main/resources/mapper/BattGroupBaojiGroupMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BattgroupBaojigroupMapper">
+<mapper namespace="com.whyc.mapper.BattGroupBaojiGroupMapper">
<delete id="delDevInBaoji">
<foreach collection="list" item="item" separator=";" >
delete from db_user.tb_battgroup_baojigroup where baoji_group_id = #{item.baojiGroupId} and dev_id = #{item.devId}
diff --git a/src/main/resources/mapper/BattgroupUsrMapper.xml b/src/main/resources/mapper/BattGroupUsrMapper.xml
similarity index 87%
rename from src/main/resources/mapper/BattgroupUsrMapper.xml
rename to src/main/resources/mapper/BattGroupUsrMapper.xml
index 1d7ae26..fda6486 100644
--- a/src/main/resources/mapper/BattgroupUsrMapper.xml
+++ b/src/main/resources/mapper/BattGroupUsrMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BattgroupUsrMapper">
+<mapper namespace="com.whyc.mapper.BattGroupUsrMapper">
<delete id="delUsrInBaoji">
<foreach collection="list" item="item" separator=";" >
diff --git a/src/main/resources/mapper/BatttestdataIdMapper.xml b/src/main/resources/mapper/BattTestDataIdMapper.xml
similarity index 73%
rename from src/main/resources/mapper/BatttestdataIdMapper.xml
rename to src/main/resources/mapper/BattTestDataIdMapper.xml
index f958f3a..ab52905 100644
--- a/src/main/resources/mapper/BatttestdataIdMapper.xml
+++ b/src/main/resources/mapper/BattTestDataIdMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BatttestdataIdMapper">
+<mapper namespace="com.whyc.mapper.BattTestDataIdMapper">
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/BatttestdataInfMapper.xml b/src/main/resources/mapper/BattTestDataInfMapper.xml
similarity index 96%
rename from src/main/resources/mapper/BatttestdataInfMapper.xml
rename to src/main/resources/mapper/BattTestDataInfMapper.xml
index b4f8737..85b46e3 100644
--- a/src/main/resources/mapper/BatttestdataInfMapper.xml
+++ b/src/main/resources/mapper/BattTestDataInfMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.BatttestdataInfMapper">
- <resultMap id="staticTinf" type="batttestdataInf">
+<mapper namespace="com.whyc.mapper.BattTestDataInfMapper">
+ <resultMap id="staticTinf" type="battTestDataInf">
<id property="num" column="num"></id>
<result property="devId" column="dev_id"></result>
<result property="testType" column="test_type"></result>
diff --git a/src/main/resources/mapper/PoweralarmParamMapper.xml b/src/main/resources/mapper/PowerAlarmParamMapper.xml
similarity index 91%
rename from src/main/resources/mapper/PoweralarmParamMapper.xml
rename to src/main/resources/mapper/PowerAlarmParamMapper.xml
index 3dfeb8d..a8c4fdc 100644
--- a/src/main/resources/mapper/PoweralarmParamMapper.xml
+++ b/src/main/resources/mapper/PowerAlarmParamMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.PoweralarmParamMapper">
+<mapper namespace="com.whyc.mapper.PowerAlarmParamMapper">
<select id="serchByCondition" resultType="com.whyc.pojo.db_param.PoweralarmParam">
select num,alm_id,alm_level,alm_en from db_param.poweralarm_param
--
Gitblit v1.9.1