From e50d8c30b43dd30daa77da27101ce21d8ef2fcef Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 17 三月 2025 17:20:10 +0800
Subject: [PATCH] 锂电设备相关代码更新
---
src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java | 9
src/main/java/com/whyc/pojo/db_user/BaojiGroup.java | 6
src/main/java/com/whyc/webSocket/DevLithiumInfSocket.java | 18
src/main/java/com/whyc/service/DevA200TestParamService.java | 20
src/main/java/com/whyc/controller/DevLithiumAlarmDataHisController.java | 31 ++
src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java | 2
src/main/java/com/whyc/service/DevLithiumAlarmDataService.java | 38 +-
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevLithiumInf.java | 12
src/main/java/com/whyc/service/SubTablePageInfoService.java | 12
src/main/java/com/whyc/dto/DevA200AlarmDto.java | 2
src/main/java/com/whyc/service/DevLithiumInfService.java | 54 ++--
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java | 7
src/main/java/com/whyc/service/A200RealStateService.java | 4
src/main/resources/mapper/BaojiGroupMapper.xml | 4
src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java | 2
src/main/java/com/whyc/pojo/db_param/BattalarmParam.java | 2
src/main/java/com/whyc/mapper/ActmRealStateMapper.java | 4
src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmDataYear.java | 12
src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealState.java | 8
src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java | 46 ++--
src/main/java/com/whyc/mapper/DevLithiumInfMapper.java | 23 ++
src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java | 2
src/main/java/com/whyc/mapper/DevLithiumAlarmDataMapper.java | 14 +
src/main/java/com/whyc/pojo/db_user/UserInf.java | 2
src/main/java/com/whyc/controller/DevLithiumAlarmDataController.java | 48 ++++
src/main/resources/mapper/DevLithiumAlarmDataMapper.xml | 10
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java | 7
src/main/java/com/whyc/service/ActmRealStateService.java | 4
src/main/resources/mapper/DevLithiumInfMapper.xml | 10
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java | 7
/dev/null | 74 ------
src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmData.java | 12
src/main/java/com/whyc/mapper/A200RealStateMapper.java | 4
src/main/java/com/whyc/webSocket/DevLithiumLineSocket.java | 14
src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java | 34 +-
src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java | 2
src/main/java/com/whyc/webSocket/DevLithiumAlarmSocket.java | 20
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java | 6
src/main/java/com/whyc/service/DevActmTestParamService.java | 16
src/main/java/com/whyc/controller/DevLithiumInfController.java | 14
src/main/java/com/whyc/webSocket/DevLithiumAlmPopupSocket.java | 18
41 files changed, 322 insertions(+), 312 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DevAlarmDataHisController.java b/src/main/java/com/whyc/controller/DevAlarmDataHisController.java
deleted file mode 100644
index b053997..0000000
--- a/src/main/java/com/whyc/controller/DevAlarmDataHisController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.whyc.controller;
-
-import com.whyc.dto.DalmDto;
-import com.whyc.dto.Response;
-import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevAlarmDataService;
-import com.whyc.util.ActionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.ParseException;
-
-@RestController
-@Api(tags = "鍘嗗彶鍛婅绠＄悊")
-@RequestMapping("tinf")
-public class DevAlarmDataHisController {
- @Autowired
- private DevAlarmDataService dataService;
-
- @ApiOperation(value = "娴嬭瘯瀹炴椂鍛婅")
- @PostMapping("getDAlmInf")
- public Response getDevAlmInf(@RequestParam int uid, @RequestBody DalmDto dto){
- return dataService.getDevAlmInf(uid,dto);
- }
- @ApiOperation(value = "寮圭獥鍛婅")
- @GetMapping("getDAlmPopUp")
- public Response getDevAlmPopUp(){
- UserInf uinf= ActionUtil.getUser();
- return dataService.getDevAlmPopUp(uinf.getUid());
- }
-
- @ApiOperation(value = "鑾峰彇鍘嗗彶鍛婅")
- @PostMapping("getDAlmHis")
- public Response getDevAlmHis( @RequestBody DalmDto dto) throws ParseException {
- return dataService.getDevAlmHis(dto);
- }
-
- @ApiOperation(value = "纭瀹炴椂鍛婅")
- @GetMapping("confiirmAlm")
- public Response confirmAlm(@RequestParam int num){
- return dataService.confirmAlm(num);
- }
-
- @ApiOperation(value = "鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷")
- @GetMapping("getAllAlmName")
- public Response getAllAlmName(){
- return dataService.getAllAlmName();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/DevLithiumAlarmDataController.java b/src/main/java/com/whyc/controller/DevLithiumAlarmDataController.java
new file mode 100644
index 0000000..c22ed01
--- /dev/null
+++ b/src/main/java/com/whyc/controller/DevLithiumAlarmDataController.java
@@ -0,0 +1,48 @@
+package com.whyc.controller;
+
+import com.whyc.dto.DevA200AlarmDto;
+import com.whyc.dto.Response;
+import com.whyc.pojo.db_user.UserInf;
+import com.whyc.service.DevLithiumAlarmDataService;
+import com.whyc.util.ActionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+
+/**
+ * 閿傜數璁惧鍛婅-瀹炴椂
+ */
+@RestController
+@Api(tags = "閿傜數璁惧鍛婅")
+@RequestMapping("devLithiumAlarmData")
+public class DevLithiumAlarmDataController {
+ @Autowired
+ private DevLithiumAlarmDataService dataService;
+
+ @ApiOperation(value = "瀹炴椂鍛婅")
+ @PostMapping("getPage")
+ public Response getPage(@RequestParam int uid, @RequestBody DevA200AlarmDto dto){
+ return dataService.getPage(uid,dto);
+ }
+ @ApiOperation(value = "寮圭獥鍛婅")
+ @GetMapping("getPopup")
+ public Response getPopup(){
+ UserInf uinf= ActionUtil.getUser();
+ return dataService.getPopup(uinf.getUid());
+ }
+
+ @ApiOperation(value = "纭瀹炴椂鍛婅")
+ @GetMapping("confirm")
+ public Response confirm(@RequestParam int num){
+ return dataService.confirm(num);
+ }
+
+ @ApiOperation(value = "鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷")
+ @GetMapping("getAllAlmName")
+ public Response getAllAlmName(){
+ return dataService.getAllAlmName();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/DevLithiumAlarmDataHisController.java b/src/main/java/com/whyc/controller/DevLithiumAlarmDataHisController.java
new file mode 100644
index 0000000..548c4d7
--- /dev/null
+++ b/src/main/java/com/whyc/controller/DevLithiumAlarmDataHisController.java
@@ -0,0 +1,31 @@
+package com.whyc.controller;
+
+import com.whyc.dto.DevA200AlarmDto;
+import com.whyc.dto.Response;
+import com.whyc.pojo.db_user.UserInf;
+import com.whyc.service.DevLithiumAlarmDataService;
+import com.whyc.util.ActionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+
+/**
+ * 閿傜數璁惧鍛婅-鍘嗗彶
+ */
+@RestController
+@Api(tags = "閿傜數璁惧鍛婅鍘嗗彶")
+@RequestMapping("devLithiumAlarmDataHistory")
+public class DevLithiumAlarmDataHisController {
+ @Autowired
+ private DevLithiumAlarmDataService dataService;
+
+ @ApiOperation(value = "鑾峰彇鍘嗗彶鍛婅")
+ @PostMapping("getPage")
+ public Response getPage( @RequestBody DevA200AlarmDto dto) throws ParseException {
+ return dataService.getPage(dto);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/DevInfController.java b/src/main/java/com/whyc/controller/DevLithiumInfController.java
similarity index 86%
rename from src/main/java/com/whyc/controller/DevInfController.java
rename to src/main/java/com/whyc/controller/DevLithiumInfController.java
index 6bba5f6..cbe9747 100644
--- a/src/main/java/com/whyc/controller/DevInfController.java
+++ b/src/main/java/com/whyc/controller/DevLithiumInfController.java
@@ -2,8 +2,8 @@
import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
-import com.whyc.service.DevInfService;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
+import com.whyc.service.DevLithiumInfService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,17 +13,17 @@
import java.util.Map;
@RestController
-@Api(tags = "璁惧")
+@Api(tags = "閿傜數璁惧淇℃伅")
@RequestMapping("devInf")
-public class DevInfController {
+public class DevLithiumInfController {
@Autowired
- private DevInfService service;
+ private DevLithiumInfService service;
@ApiOperation(value = "娣诲姞璁惧")
@PostMapping("addDev")
- public Response addDev(@RequestBody DevInf devInf){
+ public Response addDev(@RequestBody DevLithiumInf devInf){
return service.addDev(devInf);
}
@@ -59,7 +59,7 @@
@ApiOperation(value = "缂栬緫璁惧淇℃伅")
@PostMapping("updateInf")
- public Response updateInf(@RequestBody DevInf dinf){
+ public Response updateInf(@RequestBody DevLithiumInf dinf){
return service.updateInf(dinf);
}
diff --git a/src/main/java/com/whyc/dto/DalmDto.java b/src/main/java/com/whyc/dto/DevA200AlarmDto.java
similarity index 92%
rename from src/main/java/com/whyc/dto/DalmDto.java
rename to src/main/java/com/whyc/dto/DevA200AlarmDto.java
index 2606d3d..88bb5cd 100644
--- a/src/main/java/com/whyc/dto/DalmDto.java
+++ b/src/main/java/com/whyc/dto/DevA200AlarmDto.java
@@ -5,7 +5,7 @@
import java.util.Date;
@Data
-public class DalmDto {
+public class DevA200AlarmDto {
private Integer devId;
private Integer devType;
private Integer almId;
diff --git a/src/main/java/com/whyc/mapper/A200RealStateMapper.java b/src/main/java/com/whyc/mapper/A200RealStateMapper.java
index 16892fc..9a20267 100644
--- a/src/main/java/com/whyc/mapper/A200RealStateMapper.java
+++ b/src/main/java/com/whyc/mapper/A200RealStateMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
-import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
+import com.whyc.pojo.db_lithium_ram_db.A200RealState;
-public interface A200RealStateMapper extends CustomMapper<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
index 96123c4..0c8761d 100644
--- a/src/main/java/com/whyc/mapper/ActmRealStateMapper.java
+++ b/src/main/java/com/whyc/mapper/ActmRealStateMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
-import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
+import com.whyc.pojo.db_lithium_ram_db.ActmRealState;
-public interface ActmRealStateMapper extends CustomMapper<ActmRealstate>{
+public interface ActmRealStateMapper extends CustomMapper<ActmRealState>{
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DevAlarmDataMapper.java b/src/main/java/com/whyc/mapper/DevAlarmDataMapper.java
deleted file mode 100644
index c1c2050..0000000
--- a/src/main/java/com/whyc/mapper/DevAlarmDataMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.dto.DalmDto;
-import com.whyc.pojo.db_alarm.DevAlarmData;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface DevAlarmDataMapper extends CustomMapper<DevAlarmData>{
- //鑾峰彇璁惧鍛婅淇℃伅
- List<DevAlarmData> getDevAlmInf(@Param("dto") DalmDto dto);
- //寮圭獥鍛婅
- List<DevAlarmData> getDevAlmPopUp(@Param("uid") int uid);
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DevInfMapper.java b/src/main/java/com/whyc/mapper/DevInfMapper.java
deleted file mode 100644
index 5440d9a..0000000
--- a/src/main/java/com/whyc/mapper/DevInfMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.dto.DevInfDto;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface DevInfMapper extends CustomMapper<DevInf>{
- //鏌ヨ鍖呮満浜虹鐞嗙殑璁惧id
- List<DevInf> getAllInf(@Param("dto") DevInfDto dto);
- //鏌ヨ璇ョ被鍨嬫渶澶ц澶囩紪鍙�
- Integer getMaxDevId(Integer devType);
- //鑾峰彇宸︿晶娉
- List<DevInf> getLine(@Param("uid") Integer uid);
-
- //鑾峰彇宸︿晶娉
- List<DevInf> getDevType(@Param("uid") Integer uid,@Param("devType") Integer devType);
-
- //璁惧鍒嗙被鎬绘暟缁熻
- List<DevInf> getDevStaticByType(@Param("uid") Integer userId);
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DevLithiumAlarmDataMapper.java b/src/main/java/com/whyc/mapper/DevLithiumAlarmDataMapper.java
new file mode 100644
index 0000000..0ca8614
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/DevLithiumAlarmDataMapper.java
@@ -0,0 +1,14 @@
+package com.whyc.mapper;
+
+import com.whyc.dto.DevA200AlarmDto;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DevLithiumAlarmDataMapper extends CustomMapper<DevLithiumAlarmData>{
+ //鑾峰彇璁惧鍛婅淇℃伅
+ List<DevLithiumAlarmData> getDevAlmInf(@Param("dto") DevA200AlarmDto dto);
+ //寮圭獥鍛婅
+ List<DevLithiumAlarmData> getPopup(@Param("uid") int uid);
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DevLithiumInfMapper.java b/src/main/java/com/whyc/mapper/DevLithiumInfMapper.java
new file mode 100644
index 0000000..4c73e75
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/DevLithiumInfMapper.java
@@ -0,0 +1,23 @@
+package com.whyc.mapper;
+
+import com.whyc.dto.DevInfDto;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DevLithiumInfMapper extends CustomMapper<DevLithiumInf>{
+ //鏌ヨ鍖呮満浜虹鐞嗙殑璁惧id
+ List<DevLithiumInf> getAllInf(@Param("dto") DevInfDto dto);
+ //鏌ヨ璇ョ被鍨嬫渶澶ц澶囩紪鍙�
+ Integer getMaxDevId(Integer devType);
+ //鑾峰彇宸︿晶娉
+ List<DevLithiumInf> getLine(@Param("uid") Integer uid);
+
+ //鑾峰彇宸︿晶娉
+ List<DevLithiumInf> getDevType(@Param("uid") Integer uid, @Param("devType") Integer devType);
+
+ //璁惧鍒嗙被鎬绘暟缁熻
+ List<DevLithiumInf> getDevStaticByType(@Param("uid") Integer userId);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java b/src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmData.java
similarity index 92%
rename from src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java
rename to src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmData.java
index c16ba1c..28490f8 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmData.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,19 +16,15 @@
import java.util.Date;
/**
- * <p>
- * 璁惧瀹炴椂鍛婅璁板綍琛�
- * </p>
*
- * @author lxw
- * @since 2024-09-11
+ * 璁惧瀹炴椂鍛婅璁板綍琛�
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema = "db_alarm",value ="tb_devalarm_data")
@ApiModel(value="DevalarmData瀵硅薄", description="璁惧瀹炴椂鍛婅璁板綍琛�")
-public class DevAlarmData implements Serializable {
+public class DevLithiumAlarmData implements Serializable {
private static final long serialVersionUID = 1L;
@@ -76,7 +72,7 @@
private Integer almClearedType;
@TableField(exist = false)
- private DevInf devInf;
+ private DevLithiumInf devInf;
}
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java b/src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmDataYear.java
similarity index 90%
rename from src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java
rename to src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmDataYear.java
index 4229052..daabae6 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevLithiumAlarmDataYear.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,19 +16,15 @@
import java.util.Date;
/**
- * <p>
- * 璁惧鍘嗗彶鍛婅璁板綍琛�
- * </p>
*
- * @author lxw
- * @since 2024-09-11
+ * 閿傜數璁惧鍘嗗彶鍛婅璁板綍琛�
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_devalarm_data_Year")
@ApiModel(value="DevalarmDataYear瀵硅薄", description="璁惧鍘嗗彶鍛婅璁板綍琛�")
-public class DevAlarmDataYear implements Serializable {
+public class DevLithiumAlarmDataYear implements Serializable {
private static final long serialVersionUID = 1L;
@@ -76,5 +72,5 @@
private Integer almClearedType;
@TableField(exist = false)
- private DevInf devInf;
+ private DevLithiumInf devInf;
}
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200Realstate.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java
similarity index 96%
rename from src/main/java/com/whyc/pojo/db_lithium_ram_db/A200Realstate.java
rename to src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java
index ce6488d..cc82fdd 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200Realstate.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java
@@ -13,19 +13,16 @@
import java.util.Date;
/**
- * <p>
- * A200 璁惧瀹炴椂鐘舵�佽〃
- * </p>
*
- * @author lxw
- * @since 2024-08-28
+ * A200 璁惧瀹炴椂鐘舵�佽〃
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_a200_realstate")
@ApiModel(value="A200Realstate瀵硅薄", description="A200 璁惧瀹炴椂鐘舵�佽〃")
-public class A200Realstate implements Serializable {
+public class A200RealState implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealstate.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealState.java
similarity index 96%
rename from src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealstate.java
rename to src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealState.java
index 86c8059..3ed8fd3 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealstate.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/ActmRealState.java
@@ -12,19 +12,15 @@
import java.io.Serializable;
/**
- * <p>
- * ACTM 璁惧瀹炴椂鐘舵�佽〃
- * </p>
*
- * @author lxw
- * @since 2024-08-28
+ * ACTM 璁惧瀹炴椂鐘舵�佽〃
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_actm_realstate")
@ApiModel(value="ActmRealstate瀵硅薄", description="ACTM 璁惧瀹炴椂鐘舵�佽〃")
-public class ActmRealstate implements Serializable {
+public class ActmRealState implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java
index e1fc9d1..f73494b 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java
@@ -12,12 +12,9 @@
import java.io.Serializable;
/**
- * <p>
- * A200娴嬭瘯鍙傛暟琛�
- * </p>
*
- * @author lxw
- * @since 2024-08-28
+ * A200娴嬭瘯鍙傛暟琛�
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java
index db907e2..1af1a2b 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java
@@ -12,12 +12,9 @@
import java.io.Serializable;
/**
- * <p>
- * actm 娴嬭瘯鍙傛暟琛�
- * </p>
*
- * @author lxw
- * @since 2024-08-28
+ * actm 娴嬭瘯鍙傛暟琛�
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevLithiumInf.java
similarity index 92%
rename from src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java
rename to src/main/java/com/whyc/pojo/db_lithium_ram_db/DevLithiumInf.java
index c51f568..a8ae460 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevLithiumInf.java
@@ -16,19 +16,15 @@
import java.util.List;
/**
- * <p>
- *
- * </p>
- *
- * @author lxw
- * @since 2024-08-28
+ * 閿傜數璁惧淇℃伅琛�
+ * 鍖呭惈a200鍜宎ctm
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_dev_inf")
-@ApiModel(value="DevInf瀵硅薄", description="")
-public class DevInf implements Serializable {
+@ApiModel(value="DevLithiumInf瀵硅薄", description="")
+public class DevLithiumInf implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java
index b015676..2472f2e 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java
@@ -12,12 +12,9 @@
import java.io.Serializable;
/**
- * <p>
- * 璁惧宸ヤ綔鍒囨崲鎻忚堪閰嶇疆琛�
- * </p>
*
- * @author lxw
- * @since 2024-09-04
+ * 璁惧宸ヤ綔鍒囨崲鎻忚堪閰嶇疆琛�
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java
index 77cc308..533d686 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java
@@ -15,12 +15,8 @@
import java.util.Date;
/**
- * <p>
- * 璁惧宸ヤ綔鐘舵�佸垏鎹簨浠惰〃
- * </p>
*
- * @author lxw
- * @since 2024-09-02
+ * 璁惧宸ヤ綔鐘舵�佸垏鎹簨浠惰〃
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java b/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java
index 1cdf4ee..3cd17b6 100644
--- a/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java
+++ b/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java
@@ -14,7 +14,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java
index 84f3d9d..02b7c26 100644
--- a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java
+++ b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt1.java
@@ -15,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java
index d4fbe7d..d957a68 100644
--- a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java
+++ b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt2.java
@@ -15,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java
index 4bfcb8c..bd86b7c 100644
--- a/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java
+++ b/src/main/java/com/whyc/pojo/db_power_rt/PowerRealRt3.java
@@ -15,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/pojo/db_user/BaojiGroup.java b/src/main/java/com/whyc/pojo/db_user/BaojiGroup.java
index af0b130..84c4a56 100644
--- a/src/main/java/com/whyc/pojo/db_user/BaojiGroup.java
+++ b/src/main/java/com/whyc/pojo/db_user/BaojiGroup.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
@@ -41,7 +41,7 @@
private List<UserInf> usrList;
@TableField(exist = false)
- private List<DevInf> devList;
+ private List<DevLithiumInf> devList;
}
diff --git a/src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java b/src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java
index 3e0d7dd..60e77c0 100644
--- a/src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java
+++ b/src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java
@@ -12,7 +12,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/pojo/db_user/UserInf.java b/src/main/java/com/whyc/pojo/db_user/UserInf.java
index da6afbb..9d43d83 100644
--- a/src/main/java/com/whyc/pojo/db_user/UserInf.java
+++ b/src/main/java/com/whyc/pojo/db_user/UserInf.java
@@ -12,7 +12,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author lxw
diff --git a/src/main/java/com/whyc/service/A200RealStateService.java b/src/main/java/com/whyc/service/A200RealStateService.java
index 0f5d69a..cd27602 100644
--- a/src/main/java/com/whyc/service/A200RealStateService.java
+++ b/src/main/java/com/whyc/service/A200RealStateService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.A200RealStateMapper;
-import com.whyc.pojo.db_lithium_ram_db.A200Realstate;
+import com.whyc.pojo.db_lithium_ram_db.A200RealState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,7 +18,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- A200Realstate a200state=mapper.selectOne(wrapper);
+ A200RealState a200state=mapper.selectOne(wrapper);
return new Response().setII(1,a200state!=null,a200state,"涓�浣撴満A200瀹炴椂鏁版嵁");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/ActmRealStateService.java b/src/main/java/com/whyc/service/ActmRealStateService.java
index 1a51e35..8040976 100644
--- a/src/main/java/com/whyc/service/ActmRealStateService.java
+++ b/src/main/java/com/whyc/service/ActmRealStateService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.ActmRealStateMapper;
-import com.whyc.pojo.db_lithium_ram_db.ActmRealstate;
+import com.whyc.pojo.db_lithium_ram_db.ActmRealState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,7 +18,7 @@
public Response getActmState(int devId) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
- List<ActmRealstate> list=mapper.selectList(wrapper);
+ List<ActmRealState> list=mapper.selectList(wrapper);
return new Response().setII(1,list!=null,list,"鍧囪 浠狝ctm瀹炴椂鏁版嵁");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevA200TestParamService.java b/src/main/java/com/whyc/service/DevA200TestParamService.java
index 5a2b079..57fbb25 100644
--- a/src/main/java/com/whyc/service/DevA200TestParamService.java
+++ b/src/main/java/com/whyc/service/DevA200TestParamService.java
@@ -7,9 +7,9 @@
import com.whyc.dto.ResultA200Dto;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevA200TestParamMapper;
-import com.whyc.mapper.DevInfMapper;
+import com.whyc.mapper.DevLithiumInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.JsonUtil;
import com.whyc.util.TestParamHttpUtil;
@@ -33,7 +33,7 @@
private DevA200TestParamMapper mapper;
@Autowired(required = false)
- private DevInfMapper devInfMapper;
+ private DevLithiumInfMapper devLithiumInfMapper;
private final RestTemplate restTemplate;
@@ -64,7 +64,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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);
- devInfMapper.update(null,wrapper);
+ devLithiumInfMapper.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);
- devInfMapper.update(null,wrapper);
+ devLithiumInfMapper.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 f9d0125..d81fa8c 100644
--- a/src/main/java/com/whyc/service/DevActmTestParamService.java
+++ b/src/main/java/com/whyc/service/DevActmTestParamService.java
@@ -5,9 +5,9 @@
import com.whyc.dto.*;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevActmTestParamMapper;
-import com.whyc.mapper.DevInfMapper;
+import com.whyc.mapper.DevLithiumInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.util.TestParamHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,7 +29,7 @@
private DevActmTestParamMapper mapper;
@Autowired(required = false)
- private DevInfMapper devInfMapper;
+ private DevLithiumInfMapper devLithiumInfMapper;
private final RestTemplate restTemplate;
@@ -43,7 +43,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -67,7 +67,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -123,7 +123,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -168,7 +168,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- devInfMapper.update(null,wrapper);
+ devLithiumInfMapper.update(null,wrapper);
}
map.put(devId,dto);
}
@@ -195,7 +195,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=devInfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.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/DevLithiumAlarmDataService.java
similarity index 68%
rename from src/main/java/com/whyc/service/DevAlarmDataService.java
rename to src/main/java/com/whyc/service/DevLithiumAlarmDataService.java
index f6d8cd6..5ed5b0a 100644
--- a/src/main/java/com/whyc/service/DevAlarmDataService.java
+++ b/src/main/java/com/whyc/service/DevLithiumAlarmDataService.java
@@ -4,10 +4,10 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.DevAlmEnum;
-import com.whyc.dto.DalmDto;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.DevAlarmDataMapper;
-import com.whyc.pojo.db_alarm.DevAlarmData;
+import com.whyc.mapper.DevLithiumAlarmDataMapper;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmData;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.SubTablePageInfoUtil;
@@ -21,10 +21,10 @@
import java.util.Map;
@Service
-public class DevAlarmDataService {
+public class DevLithiumAlarmDataService {
@Autowired(required = false)
- private DevAlarmDataMapper mapper;
+ private DevLithiumAlarmDataMapper mapper;
@Autowired(required = false)
private SubTablePageInfoUtil service;
@@ -33,21 +33,21 @@
private UserInfService uerInfService;
//鑾峰彇璁惧鍛婅淇℃伅
- public Response getDevAlmInf(int uid, DalmDto dto) {
+ public Response getPage(int uid, DevA200AlarmDto dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
dto.setUid(uid);
- List<DevAlarmData> list=mapper.getDevAlmInf(dto);
- for (DevAlarmData data:list) {
+ List<DevLithiumAlarmData> list=mapper.getDevAlmInf(dto);
+ for (DevLithiumAlarmData data:list) {
UserInf uinf=uerInfService.getUinfByUId(data.getConfirmedUid());
data.setConfirmedUname(uinf!=null?uinf.getUname():"");
int almId=data.getAlmId();
data.setAlmName(DevAlmEnum.getValue(almId));
}
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鑾峰彇璁惧鍛婅淇℃伅");
+ return new Response().setII(1,list!=null,pageInfo,null);
}
//鑾峰彇鍘嗗彶鍛婅
- public Response getDevAlmHis(DalmDto dto) throws ParseException {
+ public Response getPage(DevA200AlarmDto dto) throws ParseException {
UserInf uinf= ActionUtil.getUser();
dto.setUid(uinf.getUid());
if(dto.getStartTime()==null){
@@ -58,31 +58,31 @@
}
PageInfo pageInfo=service.getPageInfo(dto.getPageNum(),dto.getPageSize(),dto.getStartTime(),dto.getEndTime()
,"db_alarm", "tb_devalarm_data", dto);
- return new Response().setII(1,pageInfo!=null,pageInfo,"鑾峰彇璁惧鍛婅淇℃伅");
+ return new Response().setII(1,pageInfo!=null,pageInfo,null);
}
//纭瀹炴椂鍛婅
- public Response confirmAlm(int num) {
+ public Response confirm(int num) {
UserInf uinf= ActionUtil.getUser();
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.set("alm_is_confirmed",1);
wrapper.set("confirmed_uid",uinf.getUid());
wrapper.set("confirmed_time",new Date());
wrapper.eq("num",num);
- int flag=mapper.update((DevAlarmData) ActionUtil.objeNull,wrapper);
- return new Response().set(1,flag>0,"纭瀹炴椂鍛婅");
+ int flag=mapper.update((DevLithiumAlarmData) ActionUtil.objeNull,wrapper);
+ return new Response().set(1,flag>0,null);
}
//鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷
public Response getAllAlmName() {
Map<Integer,String> map=DevAlmEnum.getOpInfo();
- return new Response().setII(1,true,map,"鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷");
+ return new Response().setII(1,true,map,null);
}
//寮圭獥鍛婅
- public Response getDevAlmPopUp(Integer uid) {
- List<DevAlarmData> list=mapper.getDevAlmPopUp(uid);
- for (DevAlarmData data:list) {
+ public Response getPopup(Integer uid) {
+ List<DevLithiumAlarmData> list=mapper.getPopup(uid);
+ for (DevLithiumAlarmData data:list) {
int almId=data.getAlmId();
data.setAlmName(DevAlmEnum.getValue(almId));
}
- return new Response().setII(1,list!=null,list,"寮圭獥鍛婅");
+ return new Response().setII(1,list!=null,list,null);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevInfService.java b/src/main/java/com/whyc/service/DevLithiumInfService.java
similarity index 82%
rename from src/main/java/com/whyc/service/DevInfService.java
rename to src/main/java/com/whyc/service/DevLithiumInfService.java
index 4065eb9..cd9f02c 100644
--- a/src/main/java/com/whyc/service/DevInfService.java
+++ b/src/main/java/com/whyc/service/DevLithiumInfService.java
@@ -10,10 +10,10 @@
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;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.mapper.DevLithiumInfMapper;
+import com.whyc.pojo.db_lithium_ram_db.A200RealState;
+import com.whyc.pojo.db_lithium_ram_db.ActmRealState;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.pojo.db_user.BattGroupBaojiGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,9 +23,9 @@
import java.util.stream.Collectors;
@Service
-public class DevInfService {
+public class DevLithiumInfService {
@Autowired(required = false)
- private DevInfMapper mapper;
+ private DevLithiumInfMapper mapper;
@Autowired(required = false)
private A200RealStateMapper a200Mapper;
@@ -38,7 +38,7 @@
//娣诲姞璁惧
@Transactional
- public Response addDev(DevInf devInf) {
+ public Response addDev(DevLithiumInf devInf) {
QueryWrapper wrapper=new QueryWrapper();
//鍒ゆ柇璁惧绫诲瀷鐢熸垚devId
int devId=getDevId(devInf.getDevType());
@@ -78,12 +78,12 @@
Map<String, Object> allMap = new HashMap<>();
PageHelper.startPage(devInfDto.getPageNum(), devInfDto.getPageSize());
devInfDto.setUid(uid);
- List<DevInf> listype=mapper.getAllInf(devInfDto);
+ List<DevLithiumInf> listype=mapper.getAllInf(devInfDto);
PageInfo pageInfo=new PageInfo(listype);
- List<DevInf> list=mapper.getLine(uid);
- Map<Integer, List<DevInf>> typeDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevType));
- Map<Integer, List<DevInf>> onlineDevMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
+ List<DevLithiumInf> list=mapper.getLine(uid);
+ Map<Integer, List<DevLithiumInf>> typeDevMap = list.stream().collect(Collectors.groupingBy(DevLithiumInf::getDevType));
+ Map<Integer, List<DevLithiumInf>> onlineDevMap = list.stream().collect(Collectors.groupingBy(DevLithiumInf::getDevOnline));
Map<Integer, Object> typeMap = new HashMap<>();
typeMap.put(1,0);
typeMap.put(2,0);
@@ -112,26 +112,26 @@
wrapper.eq("dev_type",devType);
}
wrapper.orderByAsc("dev_id");
- List<DevInf> list=mapper.selectList(wrapper);
+ List<DevLithiumInf> list=mapper.selectList(wrapper);
return new Response().setII(1,list!=null,list,"鑾峰彇宸︿晶鍒楄〃");
}
//鑾峰彇宸︿晶娉
public Response getDevType(int uid) {
Map<String, Object> allMap = new HashMap<>();
- List<DevInf> a200List=mapper.getDevType(uid,1);
- for (DevInf a200:a200List) {
+ List<DevLithiumInf> a200List=mapper.getDevType(uid,1);
+ for (DevLithiumInf a200:a200List) {
QueryWrapper a200wrapper= Wrappers.query();
a200wrapper.eq("dev_id",a200.getDevId());
a200wrapper.last("limit 1");
- A200Realstate a200state=a200Mapper.selectOne(a200wrapper);
+ A200RealState a200state=a200Mapper.selectOne(a200wrapper);
//a200.setA200sTate(a200state);
a200.setState(a200state!=null?a200state:null);
}
- List<DevInf> actmList=mapper.getDevType(uid,2);
- for (DevInf actm:actmList) {
+ List<DevLithiumInf> actmList=mapper.getDevType(uid,2);
+ for (DevLithiumInf actm:actmList) {
QueryWrapper actmwrapper= Wrappers.query();
actmwrapper.eq("dev_id",actm.getDevId());
- List<ActmRealstate> actmstates=actmMapper.selectList(actmwrapper);
+ List<ActmRealState> actmstates=actmMapper.selectList(actmwrapper);
//actm.setActmsTate(actmstate);
actm.setActmstates(actmstates!=null?actmstates:null);
}
@@ -140,7 +140,7 @@
return new Response().setII(1,allMap.size()>0,allMap,"鑾峰彇宸︿晶鍒楄〃");
}
//缂栬緫璁惧淇℃伅
- public Response updateInf(DevInf dinf) {
+ public Response updateInf(DevLithiumInf dinf) {
//缂栬緫璁惧灏遍噸缃姞杞�
dinf.setReloadEn(1);
UpdateWrapper wrapper=new UpdateWrapper();
@@ -152,7 +152,7 @@
public Response getDevInf() {
QueryWrapper wrapper=new QueryWrapper();
wrapper.orderByAsc("dev_id");
- List<DevInf> list=mapper.selectList(wrapper);
+ List<DevLithiumInf> list=mapper.selectList(wrapper);
return new Response().setII(1,list!=null,list,"鑾峰彇璁惧淇℃伅(涓嶅垎椤电敤浜庡寘鏈虹粍)");
}
@@ -161,7 +161,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=mapper.selectOne(wrapper);
+ DevLithiumInf dinf=mapper.selectOne(wrapper);
return new Response().setII(1,dinf!=null,dinf,"鏍规嵁璁惧id鑾峰彇璁惧淇℃伅");
}
//鍒犻櫎璁惧(鍚屾椂鍒犻櫎瀹炴椂鍜屽寘鏈虹粍淇℃伅)
@@ -214,12 +214,12 @@
Map<String,Object> typestateMap=new HashMap<>();
typestateMap.put("a200",a200staticStateMap);
typestateMap.put("actm",actmstaticStateMap);
- List<DevInf> list=mapper.getDevStaticByType(userId);
- Map<Integer, List<DevInf>> typeMap = list.stream().collect(Collectors.groupingBy(DevInf::getDevType));
+ List<DevLithiumInf> list=mapper.getDevStaticByType(userId);
+ Map<Integer, List<DevLithiumInf>> typeMap = list.stream().collect(Collectors.groupingBy(DevLithiumInf::getDevType));
for (Integer type : typeMap.keySet()) {
staticTypeMap.put(type, typeMap.get(type).size());
- List<DevInf> typeList= typeMap.get(type);
- Map<Integer, List<DevInf>> stateMap = typeList.stream().collect(Collectors.groupingBy(DevInf::getDevOnline));
+ List<DevLithiumInf> typeList= typeMap.get(type);
+ Map<Integer, List<DevLithiumInf>> stateMap = typeList.stream().collect(Collectors.groupingBy(DevLithiumInf::getDevOnline));
if(type==1){
for (Integer state : stateMap.keySet()) {
a200staticStateMap.put(state, stateMap.get(state).size());
@@ -240,11 +240,11 @@
}
//鏍规嵁devId鑾峰彇璁惧淇℃伅
- public DevInf getDinfByDevId(int devId){
+ public DevLithiumInf getDinfByDevId(int devId){
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=mapper.selectOne(wrapper);
+ DevLithiumInf dinf=mapper.selectOne(wrapper);
return dinf;
}
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index f6de71b..5c6b176 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -1,8 +1,8 @@
package com.whyc.service;
-import com.whyc.dto.DalmDto;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.mapper.CallBack;
-import com.whyc.pojo.db_alarm.DevAlarmDataYear;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
import com.whyc.pojo.db_batt_testdata.BattTestDataId;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,7 +116,7 @@
return list;
}
//鏌ヨDevAlm鍘嗗彶鍛婅鏁伴噺
- public int getCountForDevAlm(DalmDto dto) {
+ public int getCountForDevAlm(DevA200AlarmDto dto) {
String sql="select count(distinct num) as number from db_alarm." +dto.getTableName()
+" where 1=1 ";
@@ -161,7 +161,7 @@
return num;
}
//鏌ヨdevalm鍘嗗彶鍛婅
- public List getListDevAlm(DalmDto dto){
+ public List getListDevAlm(DevA200AlarmDto dto){
String sql="select * from db_alarm." +dto.getTableName()
+" where 1=1 ";
@@ -189,9 +189,9 @@
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
- List<DevAlarmDataYear> list=new ArrayList<>();
+ List<DevLithiumAlarmDataYear> list=new ArrayList<>();
while (rs.next()){
- DevAlarmDataYear dataYear=new DevAlarmDataYear();
+ DevLithiumAlarmDataYear dataYear=new DevLithiumAlarmDataYear();
dataYear.setNum(rs.getInt("num"));
dataYear.setDevId(rs.getInt("dev_id"));
dataYear.setAlmId(rs.getInt("alm_id"));
diff --git a/src/main/java/com/whyc/webSocket/DevAlarmSocket.java b/src/main/java/com/whyc/webSocket/DevAlarmSocket.java
deleted file mode 100644
index 715fed4..0000000
--- a/src/main/java/com/whyc/webSocket/DevAlarmSocket.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.whyc.webSocket;
-
-import com.whyc.config.WebSocketConfig;
-import com.whyc.dto.DalmDto;
-import com.whyc.dto.Response;
-import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevAlarmDataService;
-import com.whyc.util.ActionUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpSession;
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * 璁惧瀹炴椂杩炴帴淇℃伅
- */
-@Component
-@ServerEndpoint(value = "/dalmSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevAlarmSocket {
- private Session session;
-
- private Thread thread;
-
- private static DevAlarmDataService dalmService;
-
- private HttpSession httpSession;
-
- private volatile boolean runFlag = true;
-
- private volatile Map<String, Thread> threadMap = new HashMap<>();
-
- private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
-
- @Autowired
- public void setDevalarmDataService(DevAlarmDataService dalmService) {
- DevAlarmSocket.dalmService = dalmService;
- }
-
- @OnOpen
- public void onOpen(Session session, EndpointConfig config) {
- this.session = session;
- this.httpSession = (HttpSession) config.getUserProperties().get("httpSession");
- }
- @OnMessage
- public void onMessage(Session session, String message) {
- DalmDto dto = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(message, DalmDto.class);
- UserInf user = (UserInf) this.httpSession.getAttribute("user");
- final int userId = user.getUid();
- //final int userId = 101;
- thread = new Thread("Thread_DevalarmSocket") {
- @Override
- public void run() {
- while (runFlag && !isInterrupted()) {
- Thread thread = currentThread();
- threadFlagMap.put(thread.getId(), true);
- try {
- Response res=dalmService.getDevAlmInf(userId, dto);
- if (session.isOpen()) {
- //鎺ㄩ�佷俊鎭�
- synchronized (session) {
- session.getBasicRemote().sendObject(res);
- }
- threadFlagMap.put(thread.getId(), false);
- }
- sleep(4000);
- } catch (Exception e) {
- interrupt();
- }
- }
- }
- };
- thread.start();
- threadFlagMap.put(thread.getId(),true);
- //鍋滄鑰佺殑socket绾跨▼
- Thread threadBefore = threadMap.get(session.getId());
- if(threadBefore !=null && threadBefore.isAlive()){
- while (threadFlagMap.get(threadBefore.getId())){
- }
- threadBefore.interrupt();
- }
- //灏嗙嚎绋嬪瓨鍌�,渚夸簬璋冪敤瀹氫綅
- threadMap.put(session.getId(), this.thread);
- }
-
-
- @OnClose
- public void onClose(CloseReason closeReason){
- System.err.println("closeReason = " + closeReason);
- runFlag = false;
- if (thread != null && thread.isAlive()) {
- thread.interrupt();
- }
- threadMap.remove(session.getId());
- }
-
- @OnError
- public void onError(Throwable error) {
- error.printStackTrace();
- if (thread != null && thread.isAlive()) {
- thread.interrupt();
- }
- threadMap.remove(session.getId());
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/webSocket/DevAlmPopUp.java b/src/main/java/com/whyc/webSocket/DevAlmPopUp.java
deleted file mode 100644
index ba7359d..0000000
--- a/src/main/java/com/whyc/webSocket/DevAlmPopUp.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.whyc.webSocket;
-
-import com.whyc.config.WebSocketConfig;
-import com.whyc.dto.Response;
-import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevAlarmDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpSession;
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-
-/**
- * 鍛婅寮圭獥
- */
-@Component
-@ServerEndpoint(value = "/almPop",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevAlmPopUp{
-
- private Session session;
-
- private Thread thread;
- private static DevAlarmDataService almService;
-
- private HttpSession httpSession;
-
- @Autowired
- public void setDevalarmDataService(DevAlarmDataService almService) {
- DevAlmPopUp.almService = almService;
- }
-
- @OnOpen
- public void onOpen(Session session, EndpointConfig config){
- this.httpSession = (HttpSession) config.getUserProperties().get("httpSession");
- UserInf user = (UserInf) this.httpSession.getAttribute("user");
- final int userId = user.getUid();
- //final int userId = 101;
- Thread thread = new Thread() {
- @Override
- public void run() {
- try {
- while (!currentThread().isInterrupted()) {
- Response res = almService.getDevAlmPopUp(userId);
- session.getBasicRemote().sendObject(res);
- sleep(4000);
- }
- } catch (Exception e) {
- this.interrupt();
- }
- }
- };
- thread.start();
- this.thread = thread;
- }
- @OnClose
- public void onClose(CloseReason closeReason) throws IOException {
- System.err.println("closeReason = " + closeReason);
- if(session.isOpen()){
- session.close();
- }
- }
-
- @OnError
- public void onError(Throwable error) throws IOException {
- error.printStackTrace();
- thread.isInterrupted();
- if(session.isOpen()){
- session.close();
- }
- }
-
-}
diff --git a/src/main/java/com/whyc/webSocket/DevInfSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumAlarmSocket.java
similarity index 81%
copy from src/main/java/com/whyc/webSocket/DevInfSocket.java
copy to src/main/java/com/whyc/webSocket/DevLithiumAlarmSocket.java
index 0b37f68..8afae37 100644
--- a/src/main/java/com/whyc/webSocket/DevInfSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumAlarmSocket.java
@@ -1,10 +1,10 @@
package com.whyc.webSocket;
import com.whyc.config.WebSocketConfig;
-import com.whyc.dto.DevInfDto;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevInfService;
+import com.whyc.service.DevLithiumAlarmDataService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -20,13 +20,13 @@
* 璁惧瀹炴椂杩炴帴淇℃伅
*/
@Component
-@ServerEndpoint(value = "/dinfSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevInfSocket {
+@ServerEndpoint(value = "/devLithiumAlarm",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumAlarmSocket {
private Session session;
private Thread thread;
- private static DevInfService dinfService;
+ private static DevLithiumAlarmDataService service;
private HttpSession httpSession;
@@ -37,8 +37,8 @@
private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
@Autowired
- public void setDevInfService(DevInfService dinfService) {
- DevInfSocket.dinfService = dinfService;
+ public void setService(DevLithiumAlarmDataService service) {
+ DevLithiumAlarmSocket.service = service;
}
@OnOpen
@@ -48,18 +48,18 @@
}
@OnMessage
public void onMessage(Session session, String message) {
- DevInfDto devInfDto = ActionUtil.getGson("yyyy-MM-dd").fromJson(message, DevInfDto.class);
+ DevA200AlarmDto dto = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(message, DevA200AlarmDto.class);
UserInf user = (UserInf) this.httpSession.getAttribute("user");
final int userId = user.getUid();
//final int userId = 101;
- thread = new Thread("Thread_DinfSocket") {
+ thread = new Thread("Thread_DevLithiumAlarmSocket") {
@Override
public void run() {
while (runFlag && !isInterrupted()) {
Thread thread = currentThread();
threadFlagMap.put(thread.getId(), true);
try {
- Response res=dinfService.getAllInf(userId, devInfDto);
+ Response res=service.getPage(userId, dto);
if (session.isOpen()) {
//鎺ㄩ�佷俊鎭�
synchronized (session) {
diff --git a/src/main/java/com/whyc/webSocket/DevLineSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumAlmPopupSocket.java
similarity index 72%
copy from src/main/java/com/whyc/webSocket/DevLineSocket.java
copy to src/main/java/com/whyc/webSocket/DevLithiumAlmPopupSocket.java
index 446ae87..5e6414d 100644
--- a/src/main/java/com/whyc/webSocket/DevLineSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumAlmPopupSocket.java
@@ -3,7 +3,7 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevInfService;
+import com.whyc.service.DevLithiumAlarmDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -13,22 +13,22 @@
import java.io.IOException;
/**
- * 宸︿晶鍒楄〃
+ * 閿傜數璁惧鍛婅寮圭獥
*/
@Component
-@ServerEndpoint(value = "/lineSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevLineSocket{
+@ServerEndpoint(value = "/devLithiumAlmPopup",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumAlmPopupSocket {
private Session session;
private Thread thread;
- private static DevInfService dinfService;
+ private static DevLithiumAlarmDataService devLithiumAlarmDataService;
private HttpSession httpSession;
@Autowired
- public void setDevInfService(DevInfService dinfService) {
- DevLineSocket.dinfService = dinfService;
+ public void setDevLithiumAlarmDataService(DevLithiumAlarmDataService devLithiumAlarmDataService) {
+ DevLithiumAlmPopupSocket.devLithiumAlarmDataService = devLithiumAlarmDataService;
}
@OnOpen
@@ -37,12 +37,12 @@
UserInf user = (UserInf) this.httpSession.getAttribute("user");
final int userId = user.getUid();
//final int userId = 101;
- Thread thread = new Thread() {
+ Thread thread = new Thread("Thread_DevLithiumAlmPopupSocket") {
@Override
public void run() {
try {
while (!currentThread().isInterrupted()) {
- Response res = dinfService.getDevType(userId);
+ Response res = devLithiumAlarmDataService.getPopup(userId);
session.getBasicRemote().sendObject(res);
sleep(4000);
}
diff --git a/src/main/java/com/whyc/webSocket/DevInfSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumInfSocket.java
similarity index 85%
rename from src/main/java/com/whyc/webSocket/DevInfSocket.java
rename to src/main/java/com/whyc/webSocket/DevLithiumInfSocket.java
index 0b37f68..0e22d2f 100644
--- a/src/main/java/com/whyc/webSocket/DevInfSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumInfSocket.java
@@ -4,7 +4,7 @@
import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevInfService;
+import com.whyc.service.DevLithiumInfService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,16 +17,16 @@
/**
- * 璁惧瀹炴椂杩炴帴淇℃伅
+ * 閿傜數璁惧瀹炴椂杩炴帴淇℃伅
*/
@Component
-@ServerEndpoint(value = "/dinfSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevInfSocket {
+@ServerEndpoint(value = "/devLithiumInf",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumInfSocket {
private Session session;
private Thread thread;
- private static DevInfService dinfService;
+ private static DevLithiumInfService service;
private HttpSession httpSession;
@@ -37,8 +37,8 @@
private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
@Autowired
- public void setDevInfService(DevInfService dinfService) {
- DevInfSocket.dinfService = dinfService;
+ public void setService(DevLithiumInfService service) {
+ DevLithiumInfSocket.service = service;
}
@OnOpen
@@ -52,14 +52,14 @@
UserInf user = (UserInf) this.httpSession.getAttribute("user");
final int userId = user.getUid();
//final int userId = 101;
- thread = new Thread("Thread_DinfSocket") {
+ thread = new Thread("Thread_DevLithiumInfSocket") {
@Override
public void run() {
while (runFlag && !isInterrupted()) {
Thread thread = currentThread();
threadFlagMap.put(thread.getId(), true);
try {
- Response res=dinfService.getAllInf(userId, devInfDto);
+ Response res=service.getAllInf(userId, devInfDto);
if (session.isOpen()) {
//鎺ㄩ�佷俊鎭�
synchronized (session) {
diff --git a/src/main/java/com/whyc/webSocket/DevLineSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumLineSocket.java
similarity index 80%
rename from src/main/java/com/whyc/webSocket/DevLineSocket.java
rename to src/main/java/com/whyc/webSocket/DevLithiumLineSocket.java
index 446ae87..dc79741 100644
--- a/src/main/java/com/whyc/webSocket/DevLineSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumLineSocket.java
@@ -3,7 +3,7 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
-import com.whyc.service.DevInfService;
+import com.whyc.service.DevLithiumInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -16,19 +16,19 @@
* 宸︿晶鍒楄〃
*/
@Component
-@ServerEndpoint(value = "/lineSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevLineSocket{
+@ServerEndpoint(value = "/devLithiumLine",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumLineSocket {
private Session session;
private Thread thread;
- private static DevInfService dinfService;
+ private static DevLithiumInfService service;
private HttpSession httpSession;
@Autowired
- public void setDevInfService(DevInfService dinfService) {
- DevLineSocket.dinfService = dinfService;
+ public void setService(DevLithiumInfService service) {
+ DevLithiumLineSocket.service = service;
}
@OnOpen
@@ -42,7 +42,7 @@
public void run() {
try {
while (!currentThread().isInterrupted()) {
- Response res = dinfService.getDevType(userId);
+ Response res = service.getDevType(userId);
session.getBasicRemote().sendObject(res);
sleep(4000);
}
diff --git a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
similarity index 72%
rename from src/main/java/com/whyc/webSocket/DevRtStateSocket.java
rename to src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
index 4af1304..1a73f11 100644
--- a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
@@ -18,20 +18,20 @@
/**
- * 璁惧瀹炴椂杩炴帴淇℃伅
+ * 閿傜數璁惧瀹炴椂杩炴帴淇℃伅
*/
@Component
-@ServerEndpoint(value = "/rtstateSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevRtStateSocket {
+@ServerEndpoint(value = "/DevLithiumRtState",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumRtStateSocket {
private Session session;
private Thread thread;
- private static BattRtDataService rtdataService;
+ private static BattRtDataService battRtDataService;
- private static A200RealStateService a200Service;
+ private static A200RealStateService a200RtStateService;
- private static ActmRealStateService actmService;
+ private static ActmRealStateService actmRtStateService;
private static WorkStateChangeEventService eventService;
@@ -43,23 +43,23 @@
private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
@Autowired
- public void setBattRtdataService(BattRtDataService rtdataService) {
- DevRtStateSocket.rtdataService = rtdataService;
+ public void setBattRtDataService(BattRtDataService battRtDataService) {
+ DevLithiumRtStateSocket.battRtDataService = battRtDataService;
}
@Autowired
- public void setA200RealstateService(A200RealStateService a200Service) {
- DevRtStateSocket.a200Service = a200Service;
+ public void setA200RealStateService(A200RealStateService a200RtStateService) {
+ DevLithiumRtStateSocket.a200RtStateService = a200RtStateService;
}
@Autowired
- public void setActmRealstateService(ActmRealStateService actmService) {
- DevRtStateSocket.actmService = actmService;
+ public void setActmRealStateService(ActmRealStateService actmRtStateService) {
+ DevLithiumRtStateSocket.actmRtStateService = actmRtStateService;
}
@Autowired
- public void setWorkstateChangeeventService(WorkStateChangeEventService eventService) {
- DevRtStateSocket.eventService = eventService;
+ public void setWorkStateChangeEventService(WorkStateChangeEventService eventService) {
+ DevLithiumRtStateSocket.eventService = eventService;
}
@OnOpen
@@ -69,7 +69,7 @@
@OnMessage
public void onMessage(Session session, String message) {
RtStateDto dto= ActionUtil.getGson().fromJson(message, RtStateDto.class);
- thread = new Thread("Thread_RtstateSocket") {
+ thread = new Thread("DevLithiumRtStateSocket") {
@Override
public void run() {
while (runFlag && !isInterrupted()) {
@@ -110,13 +110,13 @@
//鍧囪 浠狝ctm瀹炴椂鏁版嵁
private Response getActmState(int devId) {
Map<String, Response> map = new HashMap<>();
- Response resActmState=actmService.getActmState(devId);
- Response rtdataState0=rtdataService.getActmRtdataState(devId,0);
- Response rtdataState1=rtdataService.getActmRtdataState(devId,1);
+ Response resActmState=actmRtStateService.getActmState(devId);
+ Response rtDataState0=battRtDataService.getActmRtdataState(devId,0);
+ Response rtDataState1=battRtDataService.getActmRtdataState(devId,1);
Response event=eventService.getWorkEvent(devId);
map.put("resActmState",resActmState);
- map.put("rtdataState0",rtdataState0);
- map.put("rtdataState1",rtdataState1);
+ map.put("rtDataState0",rtDataState0);
+ map.put("rtDataState1",rtDataState1);
map.put("event",event);
return new Response().setII(1,true,map,"鍧囪 浠狝ctm瀹炴椂鏁版嵁");
}
@@ -124,11 +124,11 @@
//涓�浣撴満A200瀹炴椂鏁版嵁
private Response getA200State(int devId) {
Map<String, Response> map = new HashMap<>();
- Response resA200State=a200Service.getA200State(devId);
- Response rtdataState=rtdataService.getA200RtdataState(devId);
+ Response resA200State=a200RtStateService.getA200State(devId);
+ Response rtDataState=battRtDataService.getA200RtdataState(devId);
Response event=eventService.getWorkEvent(devId);
map.put("resA200State",resA200State);
- map.put("rtdataState",rtdataState);
+ map.put("rtDataState",rtDataState);
map.put("event",event);
return new Response().setII(1,true,map,"涓�浣撴満A200瀹炴椂鏁版嵁");
}
diff --git a/src/main/java/com/whyc/webSocket/DevStaticSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java
similarity index 70%
rename from src/main/java/com/whyc/webSocket/DevStaticSocket.java
rename to src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java
index 9f3f632..295a58d 100644
--- a/src/main/java/com/whyc/webSocket/DevStaticSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java
@@ -5,7 +5,7 @@
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.BattTestDataInfService;
-import com.whyc.service.DevInfService;
+import com.whyc.service.DevLithiumInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -23,28 +23,28 @@
* 宸︿晶鍒楄〃
*/
@Component
-@ServerEndpoint(value = "/staticSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
-public class DevStaticSocket{
+@ServerEndpoint(value = "/devLithiumStatistic",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
+public class DevLithiumStatisticSocket {
private Session session;
private Thread thread;
- private static DevInfService dinfService;
+ private static DevLithiumInfService devLithiumInfService;
- private static BattTestDataInfService tinfService;
+ private static BattTestDataInfService battTestDataInfService;
private HttpSession httpSession;
@Autowired
- public void setDevInfService(DevInfService dinfService) {
- DevStaticSocket.dinfService = dinfService;
+ public void setDevLithiumInfService(DevLithiumInfService devLithiumInfService) {
+ DevLithiumStatisticSocket.devLithiumInfService = devLithiumInfService;
}
@Autowired
- public void setBatttestdataInfService(BattTestDataInfService tinfService) {
- DevStaticSocket.tinfService = tinfService;
+ public void setBattTestDataInfService(BattTestDataInfService battTestDataInfService) {
+ DevLithiumStatisticSocket.battTestDataInfService = battTestDataInfService;
}
@@ -59,7 +59,7 @@
public void run() {
try {
while (!currentThread().isInterrupted()) {
- Response res = getDevStatic(userId);
+ Response res = getStatistics(userId);
session.getBasicRemote().sendObject(res);
sleep(4000);
}
@@ -72,27 +72,27 @@
this.thread = thread;
}
//鑾峰彇缁熻淇℃伅
- private Response getDevStatic(int userId) {
+ private Response getStatistics(int userId) {
Map<String,Object> map=new HashMap<>();
try {
ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(3);
//鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻/閿傜數鍧囪 浠祴璇曠粺璁�
poolExecutor.execute(() -> {
- Map<String,Object> devTinfMap=tinfService.getDevTinfByYearMonth(userId);
- map.put("devTinf",devTinfMap);
+ Map<String,Object> lithiumTestInfMap = battTestDataInfService.getDevTinfByYearMonth(userId);
+ map.put("lithiumTestInf",lithiumTestInfMap);
latch.countDown();
});
//璁惧鍒嗙被鎬绘暟缁熻/璁惧鐘舵�佺粺璁�/鍦板浘淇℃伅
poolExecutor.execute(() -> {
- Map<String,Object> devSaticMap=dinfService.getDevStaticByType(userId);
- map.put("devSatic",devSaticMap);
+ Map<String,Object> devSaticMap=devLithiumInfService.getDevStaticByType(userId);
+ map.put("devLithiumStatistics",devSaticMap);
latch.countDown();
});
//杩戜竴鍛ㄧ數姹犳祴璇曡秼鍔跨粺璁�(浠庡綋鍓嶆椂闂村紑濮�)
poolExecutor.execute(() -> {
- Map<String,Object> devTestByWeekMap=tinfService.getDevTinfByWeek(userId);
- map.put("devTestByWeek",devTestByWeekMap);
+ Map<String,Object> devTestByWeekMap=battTestDataInfService.getDevTinfByWeek(userId);
+ map.put("devLithiumTestByWeek",devTestByWeekMap);
latch.countDown();
});
latch.await(10, TimeUnit.MINUTES);
diff --git a/src/main/resources/mapper/BaojiGroupMapper.xml b/src/main/resources/mapper/BaojiGroupMapper.xml
index bd6fc40..6012a3c 100644
--- a/src/main/resources/mapper/BaojiGroupMapper.xml
+++ b/src/main/resources/mapper/BaojiGroupMapper.xml
@@ -14,7 +14,7 @@
<collection property="usrList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.db_user.UserInf" column="{baojiGroupId=baoji_group_id}"
select="selectUsrList">
</collection>
- <collection property="devList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.db_lithium_ram_db.DevInf" column="{baojiGroupId=baoji_group_id}"
+ <collection property="devList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.db_lithium_ram_db.DevLithiumInf" column="{baojiGroupId=baoji_group_id}"
select="selectDevList">
</collection>
</resultMap>
@@ -32,7 +32,7 @@
order by uid asc
</select>
- <select id="selectDevList" resultType="devInf">
+ <select id="selectDevList" resultType="DevLithiumInf">
select * from db_lithium_ram_db.tb_dev_inf
<where>
dev_id in (
diff --git a/src/main/resources/mapper/DevAlarmDataMapper.xml b/src/main/resources/mapper/DevLithiumAlarmDataMapper.xml
similarity index 88%
rename from src/main/resources/mapper/DevAlarmDataMapper.xml
rename to src/main/resources/mapper/DevLithiumAlarmDataMapper.xml
index e26274d..2cea23c 100644
--- a/src/main/resources/mapper/DevAlarmDataMapper.xml
+++ b/src/main/resources/mapper/DevLithiumAlarmDataMapper.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.DevAlarmDataMapper">
- <resultMap type="com.whyc.pojo.db_alarm.DevAlarmData" id="almDev">
+<mapper namespace="com.whyc.mapper.DevLithiumAlarmDataMapper">
+ <resultMap type="com.whyc.pojo.db_alarm.DevLithiumAlarmData" id="almDev">
<id column="num" property="num"/>
<result column="dev_id" property="devId"/>
<result column="alm_id" property="almId"/>
@@ -14,7 +14,7 @@
<result column="alm_endtime" property="almEndtime"/>
<result column="alm_cleared_type" property="almClearedType"/>
<!-- 瀹冩槸鐢ㄤ簬鎸囧畾浠庤〃鏂圭殑寮曠敤瀹炰綋灞炴�х殑 -->
- <association property="devInf" javaType="devInf"
+ <association property="devInf" javaType="DevLithiumInf"
select="selectDinf"
column="dev_id">
</association>
@@ -50,10 +50,10 @@
order by alm_starttime desc
</where>
</select>
- <select id="selectDinf" resultType="devInf" parameterType="int" >
+ <select id="selectDinf" resultType="DevLithiumInf" parameterType="int" >
select * from db_lithium_ram_db.tb_dev_inf where dev_id = #{dev_id}
</select>
- <select id="getDevAlmPopUp" resultMap="almDev">
+ <select id="getPopup" resultMap="almDev">
select * from db_alarm.tb_devalarm_data
<where>
alm_is_confirmed=0
diff --git a/src/main/resources/mapper/DevInfMapper.xml b/src/main/resources/mapper/DevLithiumInfMapper.xml
similarity index 94%
rename from src/main/resources/mapper/DevInfMapper.xml
rename to src/main/resources/mapper/DevLithiumInfMapper.xml
index ef16f5b..540adb0 100644
--- a/src/main/resources/mapper/DevInfMapper.xml
+++ b/src/main/resources/mapper/DevLithiumInfMapper.xml
@@ -1,8 +1,8 @@
<?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.DevInfMapper">
+<mapper namespace="com.whyc.mapper.DevLithiumInfMapper">
- <select id="getAllInf" resultType="com.whyc.pojo.db_lithium_ram_db.DevInf">
+ <select id="getAllInf" resultType="com.whyc.pojo.db_lithium_ram_db.DevLithiumInf">
select * from db_lithium_ram_db.tb_dev_inf
<where>
dev_type=#{dto.devType}
@@ -33,7 +33,7 @@
</where>
limit 1
</select>
- <select id="getLine" resultType="com.whyc.pojo.db_lithium_ram_db.DevInf">
+ <select id="getLine" resultType="com.whyc.pojo.db_lithium_ram_db.DevLithiumInf">
select * from db_lithium_ram_db.tb_dev_inf
<where>
dev_id in (
@@ -48,7 +48,7 @@
</where>
</select>
- <select id="getDevType" resultType="com.whyc.pojo.db_lithium_ram_db.DevInf">
+ <select id="getDevType" resultType="com.whyc.pojo.db_lithium_ram_db.DevLithiumInf">
select * from db_lithium_ram_db.tb_dev_inf
<where>
dev_type=#{devType}
@@ -63,7 +63,7 @@
)
</where>
</select>
- <select id="getDevStaticByType" resultType="com.whyc.pojo.db_lithium_ram_db.DevInf">
+ <select id="getDevStaticByType" resultType="com.whyc.pojo.db_lithium_ram_db.DevLithiumInf">
select * from db_lithium_ram_db.tb_dev_inf
<where>
dev_id in (
--
Gitblit v1.9.1