From f127214ad1076769c9cb4a97963ee3ad5053e970 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 18 三月 2025 10:15:47 +0800
Subject: [PATCH] 锂电设备A200相关代码更新
---
src/main/java/com/whyc/service/BattLithiumTestDataService.java | 2
src/main/resources/mapper/BattTestDataIdMapper.xml | 2
src/main/java/com/whyc/mapper/BattLithiumTestDataMapper.java | 6
src/main/java/com/whyc/controller/DevActmTestParamController.java | 5
src/main/java/com/whyc/service/ExcelExportService.java | 22 +-
src/main/resources/mapper/BattLithiumTestDataInfMapper.xml | 8
src/main/java/com/whyc/controller/BattLithiumTestDataInfController.java | 10
src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestDataInf.java | 15 -
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 47 ++++++
src/main/java/com/whyc/service/BattLithiumRtDataService.java | 12
src/main/java/com/whyc/service/BattLithiumTestDataInfService.java | 58 ++++----
/dev/null | 22 ---
src/main/java/com/whyc/service/SubTableService.java | 99 ++++++++++++++
src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java | 12
src/main/java/com/whyc/mapper/BattLithiumTestDataInfMapper.java | 22 +++
src/main/java/com/whyc/pojo/db_lithium_ram_db/BattLithiumRtData.java | 13 -
src/main/java/com/whyc/service/SubTablePageInfoService.java | 20 +-
src/main/java/com/whyc/mapper/BattLithiumRtDataMapper.java | 6
src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestData.java | 13 -
src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java | 14 +-
20 files changed, 280 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestDataInfController.java b/src/main/java/com/whyc/controller/BattLithiumTestDataInfController.java
similarity index 89%
rename from src/main/java/com/whyc/controller/BattTestDataInfController.java
rename to src/main/java/com/whyc/controller/BattLithiumTestDataInfController.java
index a73e6ac..94f160b 100644
--- a/src/main/java/com/whyc/controller/BattTestDataInfController.java
+++ b/src/main/java/com/whyc/controller/BattLithiumTestDataInfController.java
@@ -1,7 +1,7 @@
package com.whyc.controller;
import com.whyc.dto.Response;
-import com.whyc.service.BattTestDataInfService;
+import com.whyc.service.BattLithiumTestDataInfService;
import com.whyc.service.ExcelExportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,11 +15,11 @@
import java.util.Map;
@RestController
-@Api(tags = "娴嬭瘯绠＄悊")
-@RequestMapping("tinf")
-public class BattTestDataInfController {
+@Api(tags = "閿傜數姹犳祴璇曚俊鎭〃")
+@RequestMapping("battLithiumTestDataInf")
+public class BattLithiumTestDataInfController {
@Autowired
- private BattTestDataInfService service;
+ private BattLithiumTestDataInfService service;
@Autowired
private ExcelExportService exportService;
diff --git a/src/main/java/com/whyc/controller/DevActmTestParamController.java b/src/main/java/com/whyc/controller/DevActmTestParamController.java
index 94b9a32..2cc20d1 100644
--- a/src/main/java/com/whyc/controller/DevActmTestParamController.java
+++ b/src/main/java/com/whyc/controller/DevActmTestParamController.java
@@ -10,6 +10,11 @@
import java.util.List;
+/**
+ * TODO 鏆傛棤杩欎釜瀛楁,椤圭洰瀹岀粨鏃剁‘璁ゆ病鏈夌殑鏃跺�欏垹闄�
+ */
+
+@Deprecated
@RestController
@Api(tags = "actm鍧囪 浠帶鍒舵搷浣�")
@RequestMapping("actmparam")
diff --git a/src/main/java/com/whyc/mapper/BattLithiumRtDataMapper.java b/src/main/java/com/whyc/mapper/BattLithiumRtDataMapper.java
new file mode 100644
index 0000000..79239b5
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattLithiumRtDataMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_ram_db.BattLithiumRtData;
+
+public interface BattLithiumRtDataMapper extends CustomMapper<BattLithiumRtData>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattLithiumTestDataInfMapper.java b/src/main/java/com/whyc/mapper/BattLithiumTestDataInfMapper.java
new file mode 100644
index 0000000..bf3a786
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattLithiumTestDataInfMapper.java
@@ -0,0 +1,22 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestDataInf;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BattLithiumTestDataInfMapper extends CustomMapper<BattLithiumTestDataInf>{
+ //鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻
+ List<BattLithiumTestDataInf> getDevTinf(@Param("uid") int uid);
+ //鏈勾
+ List<BattLithiumTestDataInf> getDevTinfByYear(@Param("uid")int userId);
+
+ //鏈湀
+ List<BattLithiumTestDataInf> getDevTinfByMonth(@Param("uid")int userId);
+
+ //杩戜竴鍛�(mysql涓笉浼氱畻涓婁粖澶�)
+ List<BattLithiumTestDataInf> getDevTinfByWeek(@Param("uid")int userId, @Param("type")int type);
+
+ //鑾峰彇鍏呮斁鐢垫暟鎹�
+ List<BattLithiumTestDataInf> getTinfById(@Param("type")int type, @Param("devId")Integer devId);
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattLithiumTestDataMapper.java b/src/main/java/com/whyc/mapper/BattLithiumTestDataMapper.java
new file mode 100644
index 0000000..4c190e3
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattLithiumTestDataMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
+
+public interface BattLithiumTestDataMapper extends CustomMapper<BattLithiumTestData>{
+}
\ 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 0a568f6..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
deleted file mode 100644
index 1ff3371..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/BattTestDataInfMapper.java b/src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
deleted file mode 100644
index d46ae4f..0000000
--- a/src/main/java/com/whyc/mapper/BattTestDataInfMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_batt_testdata.BattTestDataInf;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface BattTestDataInfMapper extends CustomMapper<BattTestDataInf>{
- //鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻
- List<BattTestDataInf> getDevTinf(@Param("uid") int uid);
- //鏈勾
- List<BattTestDataInf> getDevTinfByYear(@Param("uid")int userId);
-
- //鏈湀
- List<BattTestDataInf> getDevTinfByMonth(@Param("uid")int userId);
-
- //杩戜竴鍛�(mysql涓笉浼氱畻涓婁粖澶�)
- List<BattTestDataInf> getDevTinfByWeek(@Param("uid")int userId, @Param("type")int type);
-
- //鑾峰彇鍏呮斁鐢垫暟鎹�
- List<BattTestDataInf> getTinfById(@Param("type")int type, @Param("devId")Integer devId);
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/BattRtdata.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/BattLithiumRtData.java
similarity index 84%
rename from src/main/java/com/whyc/pojo/db_lithium_ram_db/BattRtdata.java
rename to src/main/java/com/whyc/pojo/db_lithium_ram_db/BattLithiumRtData.java
index 6a85f1c..3d34b9a 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/BattRtdata.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/BattLithiumRtData.java
@@ -13,19 +13,16 @@
import java.util.Date;
/**
- * <p>
- * 鐢垫睜缁勫崟浣撳疄鏃剁姸鎬佷俊鎭〃
- * </p>
*
- * @author lxw
- * @since 2024-08-28
+ * 閿傜數璁惧鐢垫睜缁勭姸鎬�
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName(schema = "db_lithium_ram_db",value ="tb_batt_rtdata")
-@ApiModel(value="BattRtdata瀵硅薄", description="鐢垫睜缁勫崟浣撳疄鏃剁姸鎬佷俊鎭〃")
-public class BattRtdata implements Serializable {
+@TableName(schema = "db_lithium_ram_db",value ="tb_lithium_rtdata")
+@ApiModel(value="閿傜數璁惧鐢垫睜缁勭姸鎬�", description="鐢垫睜缁勫崟浣撳疄鏃剁姸鎬佷俊鎭〃")
+public class BattLithiumRtData implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataId.java b/src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestData.java
similarity index 90%
rename from src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataId.java
rename to src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestData.java
index 8b58fe7..68d7d72 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataId.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestData.java
@@ -1,4 +1,4 @@
-package com.whyc.pojo.db_batt_testdata;
+package com.whyc.pojo.db_lithium_testdata;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,18 +15,15 @@
import java.util.List;
/**
- * <p>
- * 璁惧鐢垫睜鍘嗗彶鏁版嵁璁板綍琛�
- * </p>
*
- * @author lxw
- * @since 2024-09-09
+ * 閿傜數鐢垫睜缁勬祴璇曟暟鎹褰曡〃
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="BatttestdataId瀵硅薄", description="璁惧鐢垫睜鍘嗗彶鏁版嵁璁板綍琛�")
-public class BattTestDataId implements Serializable {
+@ApiModel(value="閿傜數鐢垫睜缁勬祴璇曟暟鎹〃", description="璁惧鐢垫睜鍘嗗彶鏁版嵁璁板綍琛�")
+public class BattLithiumTestData implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataInf.java b/src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestDataInf.java
similarity index 90%
rename from src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataInf.java
rename to src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestDataInf.java
index 81ff55c..3ebe227 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BattTestDataInf.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_testdata/BattLithiumTestDataInf.java
@@ -1,4 +1,4 @@
-package com.whyc.pojo.db_batt_testdata;
+package com.whyc.pojo.db_lithium_testdata;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -14,19 +14,16 @@
import java.util.Date;
/**
- * <p>
- * 鐢垫睜缁勫巻鍙叉暟鎹�昏〃
- * </p>
*
- * @author lxw
- * @since 2024-09-05
+ * 閿傜數鐢垫睜缁勭殑娴嬭瘯鏁版嵁
+ *
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName(schema = "db_batt_testdata",value ="tb_batttestdata_inf")
-@ApiModel(value="BatttestdataInf瀵硅薄", description="鐢垫睜缁勫巻鍙叉暟鎹�昏〃")
-public class BattTestDataInf implements Serializable {
+@TableName(schema = "db_lithium_testdata",value ="tb_batttestdata_inf")
+@ApiModel(value="閿傜數鐢垫睜缁勭殑娴嬭瘯鏁版嵁", description="鐢垫睜缁勫巻鍙叉暟鎹�昏〃")
+public class BattLithiumTestDataInf implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/service/BattRtDataService.java b/src/main/java/com/whyc/service/BattLithiumRtDataService.java
similarity index 76%
rename from src/main/java/com/whyc/service/BattRtDataService.java
rename to src/main/java/com/whyc/service/BattLithiumRtDataService.java
index 5b30577..d76dae2 100644
--- a/src/main/java/com/whyc/service/BattRtDataService.java
+++ b/src/main/java/com/whyc/service/BattLithiumRtDataService.java
@@ -2,18 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.BattRtDataMapper;
-import com.whyc.pojo.db_lithium_ram_db.BattRtdata;
+import com.whyc.mapper.BattLithiumRtDataMapper;
+import com.whyc.pojo.db_lithium_ram_db.BattLithiumRtData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
-public class BattRtDataService {
+public class BattLithiumRtDataService {
@Autowired(required = false)
- private BattRtDataMapper mapper;
+ private BattLithiumRtDataMapper mapper;
//鑾峰彇a200鐢垫睜缁勬暟鎹�
@@ -22,7 +22,7 @@
wrapper.eq("dev_id",devId);
wrapper.orderByAsc("batt_idx");
wrapper.orderByAsc("mon_num");
- List<BattRtdata> list=mapper.selectList(wrapper);
+ List<BattLithiumRtData> list=mapper.selectList(wrapper);
return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜缁勬暟鎹�");
}
@@ -33,7 +33,7 @@
wrapper.eq("batt_idx",index);
wrapper.orderByAsc("batt_idx");
wrapper.orderByAsc("mon_num");
- List<BattRtdata> list=mapper.selectList(wrapper);
+ List<BattLithiumRtData> list=mapper.selectList(wrapper);
return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜缁勬暟鎹�");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattTestDataInfService.java b/src/main/java/com/whyc/service/BattLithiumTestDataInfService.java
similarity index 66%
rename from src/main/java/com/whyc/service/BattTestDataInfService.java
rename to src/main/java/com/whyc/service/BattLithiumTestDataInfService.java
index 395a250..5f4927a 100644
--- a/src/main/java/com/whyc/service/BattTestDataInfService.java
+++ b/src/main/java/com/whyc/service/BattLithiumTestDataInfService.java
@@ -2,10 +2,10 @@
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.pojo.db_batt_testdata.BattTestDataId;
-import com.whyc.pojo.db_batt_testdata.BattTestDataInf;
+import com.whyc.mapper.BattLithiumTestDataMapper;
+import com.whyc.mapper.BattLithiumTestDataInfMapper;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestDataInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,13 +16,13 @@
import java.util.stream.Collectors;
@Service
-public class BattTestDataInfService {
+public class BattLithiumTestDataInfService {
@Autowired(required = false)
- private BattTestDataInfMapper mapper;
+ private BattLithiumTestDataInfMapper mapper;
@Autowired(required = false)
- private BattTestDataIdMapper dataMapper;
+ private BattLithiumTestDataMapper dataMapper;
@Autowired(required = false)
private SubTablePageInfoService subService;
@@ -31,7 +31,7 @@
public Map<String, Object> getDevTinfByYearMonth(int userId) {
Map<String,Object> map=new HashMap<>();
//鏈勾
- List<BattTestDataInf> listYear=mapper.getDevTinfByYear(userId);
+ List<BattLithiumTestDataInf> listYear=mapper.getDevTinfByYear(userId);
Map<String,Object> a200Map=new HashMap<>();
Map<String,Object> actmMap=new HashMap<>();
@@ -44,11 +44,11 @@
actmYearMap.put(3,0);
actmYearMap.put(4,0);
//鏈勾
- Map<Integer, List<BattTestDataInf>> typeMapY = listYear.stream().collect(Collectors.groupingBy(BattTestDataInf::getDevType));
+ Map<Integer, List<BattLithiumTestDataInf>> typeMapY = listYear.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getDevType));
for (Integer type : typeMapY.keySet()) {
- List<BattTestDataInf> list=typeMapY.get(type);
- Map<Integer, List<BattTestDataInf>> testMapY = list.stream().collect(Collectors.groupingBy(BattTestDataInf::getTestType));
+ List<BattLithiumTestDataInf> list=typeMapY.get(type);
+ Map<Integer, List<BattLithiumTestDataInf>> testMapY = list.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getTestType));
for (Integer test : testMapY.keySet()) {
if(type==1){
a200YearMap.put(test, testMapY.get(test).size());
@@ -70,11 +70,11 @@
actmMonthMap.put(2,0);
actmMonthMap.put(3,0);
actmMonthMap.put(4,0);
- List<BattTestDataInf> listMonth=mapper.getDevTinfByMonth(userId);
- Map<Integer, List<BattTestDataInf>> typeMapM = listMonth.stream().collect(Collectors.groupingBy(BattTestDataInf::getDevType));
+ List<BattLithiumTestDataInf> listMonth=mapper.getDevTinfByMonth(userId);
+ Map<Integer, List<BattLithiumTestDataInf>> typeMapM = listMonth.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getDevType));
for (Integer type : typeMapM.keySet()) {
- List<BattTestDataInf> list=typeMapM.get(type);
- Map<Integer, List<BattTestDataInf>> testMapM = list.stream().collect(Collectors.groupingBy(BattTestDataInf::getTestType));
+ List<BattLithiumTestDataInf> list=typeMapM.get(type);
+ Map<Integer, List<BattLithiumTestDataInf>> testMapM = list.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getTestType));
for (Integer test : testMapM.keySet()) {
if(type==1){
a200MonthMap.put(test, testMapM.get(test).size());
@@ -116,11 +116,11 @@
actmdataMap.put(resultDate.toString(),actmweekDataMap);
}
- List<BattTestDataInf> listW1=mapper.getDevTinfByWeek(userId,1);
- Map<String, List<BattTestDataInf>> typeMapW1 = listW1.stream().collect(Collectors.groupingBy(BattTestDataInf::getWeekDay));
+ List<BattLithiumTestDataInf> listW1=mapper.getDevTinfByWeek(userId,1);
+ Map<String, List<BattLithiumTestDataInf>> typeMapW1 = listW1.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getWeekDay));
for (String day : typeMapW1.keySet()) {
- List<BattTestDataInf> list1=typeMapW1.get(day);
- Map<Integer, List<BattTestDataInf>> testMapM1 = list1.stream().collect(Collectors.groupingBy(BattTestDataInf::getTestType));
+ List<BattLithiumTestDataInf> list1=typeMapW1.get(day);
+ Map<Integer, List<BattLithiumTestDataInf>> testMapM1 = list1.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getTestType));
//杩戜竴鍛╝200
Map<Integer,Integer> a200weekMap=new HashMap<>();
a200weekMap.put(2,0);
@@ -131,11 +131,11 @@
a200dataMap.put(day,a200weekMap);
}
- List<BattTestDataInf> listW2=mapper.getDevTinfByWeek(userId,2);
- Map<String, List<BattTestDataInf>> typeMapW2= listW2.stream().collect(Collectors.groupingBy(BattTestDataInf::getWeekDay));
+ List<BattLithiumTestDataInf> listW2=mapper.getDevTinfByWeek(userId,2);
+ Map<String, List<BattLithiumTestDataInf>> typeMapW2= listW2.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getWeekDay));
for (String day : typeMapW2.keySet()) {
- List<BattTestDataInf> list2=typeMapW2.get(day);
- Map<Integer, List<BattTestDataInf>> testMapM2 = list2.stream().collect(Collectors.groupingBy(BattTestDataInf::getTestType));
+ List<BattLithiumTestDataInf> list2=typeMapW2.get(day);
+ Map<Integer, List<BattLithiumTestDataInf>> testMapM2 = list2.stream().collect(Collectors.groupingBy(BattLithiumTestDataInf::getTestType));
//杩戜竴鍛╝ctm
Map<Integer,Integer> actmweekMap=new HashMap<>();
actmweekMap.put(2,0);
@@ -154,12 +154,12 @@
public Response getTinfById(Integer devId) {
Map<String,Object> map=new HashMap<>();
//鑾峰彇鍏呮斁鐢垫暟鎹�
- List<BattTestDataInf> listDis=mapper.getTinfById(3,devId);
- List<BattTestDataInf> listChr=mapper.getTinfById(2,devId);
+ List<BattLithiumTestDataInf> listDis=mapper.getTinfById(3,devId);
+ List<BattLithiumTestDataInf> listChr=mapper.getTinfById(2,devId);
map.put("dis",listDis);
map.put("chr",listChr);
if(devId/100000000==2){
- List<BattTestDataInf> listJun=mapper.getTinfById(4,devId);
+ List<BattLithiumTestDataInf> listJun=mapper.getTinfById(4,devId);
map.put("jun",listJun);
}
@@ -167,17 +167,17 @@
}
//鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�
public Response getTdataById(Integer devId, Integer testRecordCount) {
- List<BattTestDataId> list=subService.getTdataById(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataById(devId,testRecordCount);
return new Response().setII(1,list!=null,list,"鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�");
}
//鑾峰彇鏀剧數inf
- public BattTestDataInf getTinfExport(Integer devId, Integer testRecordCount) {
+ public BattLithiumTestDataInf getTinfExport(Integer devId, Integer testRecordCount) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.eq("test_record_count",testRecordCount);
wrapper.last("limit 1");
- BattTestDataInf tinf=mapper.selectOne(wrapper);
+ BattLithiumTestDataInf tinf=mapper.selectOne(wrapper);
return tinf;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattTestDataIdService.java b/src/main/java/com/whyc/service/BattLithiumTestDataService.java
similarity index 66%
rename from src/main/java/com/whyc/service/BattTestDataIdService.java
rename to src/main/java/com/whyc/service/BattLithiumTestDataService.java
index fcfdf15..155443f 100644
--- a/src/main/java/com/whyc/service/BattTestDataIdService.java
+++ b/src/main/java/com/whyc/service/BattLithiumTestDataService.java
@@ -3,5 +3,5 @@
import org.springframework.stereotype.Service;
@Service
-public class BattTestDataIdService {
+public class BattLithiumTestDataService {
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index e2119e8..5035407 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -1,8 +1,8 @@
package com.whyc.service;
import com.whyc.dto.ActmStopReason;
-import com.whyc.pojo.db_batt_testdata.BattTestDataId;
-import com.whyc.pojo.db_batt_testdata.BattTestDataInf;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestDataInf;
import com.whyc.util.ActionUtil;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -23,7 +23,7 @@
private SubTablePageInfoService subService;
@Autowired(required = false)
- private BattTestDataInfService infService;
+ private BattLithiumTestDataInfService infService;
//瀵煎嚭鏂囦欢
public void exportExcel1(Integer devId, Integer testRecordCount,HttpServletResponse response) {
@@ -40,12 +40,12 @@
row.createCell(i).setCellValue(titiles[i]);
}
rowNum++;
- List<BattTestDataId> list=subService.getTdataById(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataById(devId,testRecordCount);
if(list!=null){
//鏁版嵁鏍�
for (int i = 0; i < list.size(); i++) {
sheet.createRow(rowNum); //鍒涘缓琛�
- BattTestDataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
for(int j=0;j<titiles.length;j++){
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
sheet.getRow(rowNum).createCell(1).setCellValue(tdata.getBattIdx()+1);
@@ -106,7 +106,7 @@
cellStyle.setFont(font);
String[] titiles=new String[]{"Time(H:M:S)","Group V(V)","Group A(A)","Cap (AH)","Temp H(掳C)","Temp L(掳C)"};
- List<BattTestDataId> list=subService.getTdataByIdWithListA200(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataByIdWithListA200(devId,testRecordCount);
int rowNum=0;
// 鍒涘缓鏍囬琛�
@@ -129,7 +129,7 @@
for (int i = 0; i < list.size(); i++) {
Row row1 = sheet.createRow(rowNum); //鍒涘缓琛�
row1.setHeightInPoints(20.0f);
- BattTestDataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
sheet.getRow(rowNum).createCell(1).setCellValue(String.format("%.1f",tdata.getGroupVol()));
sheet.getRow(rowNum).createCell(2).setCellValue(String.format("%.1f",tdata.getTestCurr()));
@@ -177,7 +177,7 @@
cellStyle.setFont(font);
//鑾峰彇鏀剧數inf
- BattTestDataInf tinf=infService.getTinfExport(devId,testRecordCount);
+ BattLithiumTestDataInf tinf=infService.getTinfExport(devId,testRecordCount);
String[] titiles33=new String[]{"PACK/妯＄粍鍙�:","娴嬭瘯寮�濮嬫椂闂�:","娴嬭瘯缁撴潫鏃堕棿:","鏁版嵁绫诲瀷:","鍋滄鍘熷洜:","棰勬斁瀹归噺(AH):"
,"鏀剧數鐢垫祦(A):","娴嬭瘯鏃堕暱(h:m:s):","鍗曚覆涓嬮檺(V):","缁勭涓嬮檺(V):","鐢佃姱涓叉暟:","鏈�楂樻俯搴�(掳C):","鏈�浣庢俯搴�(掳C):","閲囬泦棰戠巼(绉�):"};
String[] titiles34=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "鏀剧數鏁版嵁",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCap())
@@ -226,7 +226,7 @@
cellStyle.setFont(font);
String[] titiles=new String[]{"娴嬭瘯鏃堕暱"};
- List<BattTestDataId> list=subService.getTdataByIdWithListActm(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataByIdWithListActm(devId,testRecordCount);
int rowNum=0;
// 鍒涘缓鏍囬琛�
@@ -252,7 +252,7 @@
for (int i = 0; i < list.size(); i++) {
Row row1 = sheet.createRow(rowNum); //鍒涘缓琛�
row1.setHeightInPoints(20.0f);
- BattTestDataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
List<Float> monVols = tdata.getMonVols();
List<Float> monCurrs = tdata.getMonCurrs();
@@ -302,7 +302,7 @@
cellStyle.setFont(font);
//鑾峰彇鏀剧數inf
- BattTestDataInf tinf=infService.getTinfExport(devId,testRecordCount);
+ BattLithiumTestDataInf tinf=infService.getTinfExport(devId,testRecordCount);
String[] titiles3=new String[]{"鐢垫睜鍖呭簭鍙�:","妯＄粍缂栧彿:","宸ヤ綔妯″紡:","鐢垫睜绫诲瀷:","鐢垫睜涓叉暟:","鐢靛帇闃�鍊�(v):"
,"宸ヤ綔鐢垫祦(A):","寮�濮嬫祴璇曟椂闂�:","缁撴潫娴嬭瘯鏃堕棿:","鍋滄鍘熷洜:"};
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 5c6b176..3cdfc2f 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -3,7 +3,7 @@
import com.whyc.dto.DevA200AlarmDto;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
-import com.whyc.pojo.db_batt_testdata.BattTestDataId;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,16 +19,16 @@
@Autowired
private MybatisSqlExecuteService sqlExecuteService;
//鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�
- public List<BattTestDataId> getTdataById(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataById(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
- List<BattTestDataId> list=new ArrayList<>();
+ List<BattLithiumTestData> list=new ArrayList<>();
while (rs.next()){
- BattTestDataId tdata=new BattTestDataId();
+ BattLithiumTestData tdata=new BattLithiumTestData();
tdata.setNum(rs.getInt("num"));
tdata.setDevId(rs.getInt("dev_id"));
tdata.setBattIdx(rs.getInt("batt_idx"));
@@ -59,7 +59,7 @@
}
//鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�
- public List<BattTestDataId> getTdataByIdWithListA200(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataByIdWithListA200(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
@@ -69,7 +69,7 @@
List list=new ArrayList<>();
List<Float> monVols=null;
List<Integer> monNums=null;
- BattTestDataId tdata=null;
+ BattLithiumTestData tdata=null;
int num=0;
try {
while (rs.next()){
@@ -82,7 +82,7 @@
tdata.setMonNums(monNums);
list.add(tdata);
}
- tdata=new BattTestDataId();
+ tdata=new BattLithiumTestData();
monVols=new ArrayList<>();
monNums=new ArrayList<>();
tdata.setDevId(rs.getInt("dev_id"));
@@ -212,7 +212,7 @@
}
- public List<BattTestDataId> getTdataByIdWithListActm(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataByIdWithListActm(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
@@ -225,7 +225,7 @@
List<Float> monCaps=null;
List<Float> monWhs=null;
List<Integer> monNums=null;
- BattTestDataId tdata=null;
+ BattLithiumTestData tdata=null;
int num=0;
try {
while (rs.next()){
@@ -245,7 +245,7 @@
tdata.setMonWhs(monWhs);
list.add(tdata);
}
- tdata=new BattTestDataId();
+ tdata=new BattLithiumTestData();
monVols=new ArrayList<>();
monNums=new ArrayList<>();
monCurrs=new ArrayList<>();
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index 8202027..d446bc7 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -1,7 +1,9 @@
package com.whyc.service;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.BattAlarmHistory;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
import com.whyc.pojo.db_dis_batt.BattTestInfData;
import com.whyc.pojo.db_power_alarm.PowerAlarmHistory;
import com.whyc.util.ActionUtil;
@@ -210,4 +212,101 @@
});
return list.stream().findFirst().orElse((BattTestInfData) ActionUtil.objeNull);
}
+
+ //鏌ヨDevAlm鍘嗗彶鍛婅鏁伴噺
+ public int getCountForDevAlm(DevA200AlarmDto dto) {
+ String sql="select count(distinct num) as number from db_alarm." +dto.getTableName()
+ +" where 1=1 ";
+
+ if(dto.getStartTime()!=null){
+ sql+=" and alm_starttime >='"+ ThreadLocalUtil.format(dto.getStartTime(),1)+"' ";
+ }
+ if(dto.getEndTime()!=null){
+ sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
+ }
+ if(dto.getDevType()!=null){
+ sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
+ }
+ if(dto.getDevId()!=null){
+ sql+=" and dev_id="+dto.getDevId();
+ }
+ if(dto.getAlmId()!=null){
+ sql+=" and alm_id="+dto.getAlmId();
+ }
+ sql+=" and dev_id in (" +
+ " SELECT distinct dev_id from db_user.tb_battgroup_baojigroup,db_user.tb_battgroup_usr" +
+ " where tb_battgroup_baojigroup.baoji_group_id=tb_battgroup_usr.baoji_group_id" +
+ " and uid="+dto.getUid()+
+ ")";
+ sql+=" order by alm_starttime desc ";
+ List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ LinkedList<Object> temp = new LinkedList<>();
+ try {
+ while (rs.next())
+ temp.add(rs.getInt("number"));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return temp;
+ }
+ });
+ int num =0;
+ if(list!=null){
+ num= (int) list.get(0);
+ }
+ return num;
+ }
+ //鏌ヨdevalm鍘嗗彶鍛婅
+ public List getListDevAlm(DevA200AlarmDto dto){
+ String sql="select * from db_alarm." +dto.getTableName()
+ +" where 1=1 ";
+
+ if(dto.getStartTime()!=null){
+ sql+=" and alm_starttime >='"+ ThreadLocalUtil.format(dto.getStartTime(),1)+"' ";
+ }
+ if(dto.getEndTime()!=null){
+ sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
+ }
+ if(dto.getDevType()!=null){
+ sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
+ }
+ if(dto.getDevId()!=null){
+ sql+=" and dev_id="+dto.getDevId();
+ }
+ if(dto.getAlmId()!=null){
+ sql+=" and alm_id="+dto.getAlmId();
+ }
+ sql+=" and dev_id in (" +
+ " SELECT distinct dev_id from db_user.tb_battgroup_baojigroup,db_user.tb_battgroup_usr" +
+ " where tb_battgroup_baojigroup.baoji_group_id=tb_battgroup_usr.baoji_group_id" +
+ " and uid="+dto.getUid()+
+ ")";
+ sql+=" ORDER BY alm_starttime desc limit "+dto.getLimitStart()+","+dto.getLimitEnd()+" ";
+ List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<DevLithiumAlarmDataYear> list=new ArrayList<>();
+ while (rs.next()){
+ DevLithiumAlarmDataYear dataYear=new DevLithiumAlarmDataYear();
+ dataYear.setNum(rs.getInt("num"));
+ dataYear.setDevId(rs.getInt("dev_id"));
+ dataYear.setAlmId(rs.getInt("alm_id"));
+ dataYear.setAlmSignalId(rs.getInt("alm_signal_id"));
+ dataYear.setAlmStarttime(rs.getTimestamp("alm_starttime"));
+ dataYear.setAlmValue(rs.getFloat("alm_value"));
+ dataYear.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
+ dataYear.setConfirmedUid(rs.getInt("confirmed_uid"));
+ dataYear.setConfirmedTime(rs.getTimestamp("confirmed_time"));
+ dataYear.setAlmEndtime(rs.getTimestamp("alm_endtime"));
+ dataYear.setAlmClearedType(rs.getInt("alm_cleared_type"));
+ list.add(dataYear);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index 82a70d7..c32da4f 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -1,12 +1,18 @@
package com.whyc.util;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.DevAlmEnum;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_alarm.BattAlarmHistory;
-import com.whyc.pojo.db_power_alarm.PowerAlarm;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.pojo.db_power_alarm.PowerAlarmHistory;
+import com.whyc.pojo.db_user.UserInf;
+import com.whyc.service.DevLithiumInfService;
import com.whyc.service.SubTableService;
+import com.whyc.service.UserInfService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,6 +23,7 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
/**
* 鏁版嵁閲忔瀬澶х殑琛�,鎸夌収骞翠唤鍒嗚〃,鍒嗛〉鏌ヨ鏃惰幏鍙栨暟鎹�
*/
@@ -27,6 +34,12 @@
@Autowired
private SubTableService service;
+
+ @Autowired
+ private DevLithiumInfService devLithiumInfService;
+
+ @Autowired
+ private UserInfService userInfService;
//鎸夊勾鏈堝垎琛�
/**鎸夊勾浠借〃鍒嗛〉鏌ヨ*/
@@ -64,6 +77,14 @@
powerAlarmHistory.setAlmEndTime(queryTime.get(1));
powerAlarmHistory.setRecordYear(tableName);
int currentCount = service.getPowerHisCount(powerAlarmHistory);
+ queryCountMap.put(tableYear, currentCount);
+ }
+ else if (pojo instanceof DevA200AlarmDto) {
+ DevA200AlarmDto dto = (DevA200AlarmDto) pojo;
+ dto.setStartTime(queryTime.get(0));
+ dto.setEndTime(queryTime.get(1));
+ dto.setTableName(tableName);
+ int currentCount = service.getCountForDevAlm(dto);
queryCountMap.put(tableYear, currentCount);
}
@@ -121,6 +142,30 @@
List<PowerAlarmHistory> list = service.getPowerHisList(powerAlarmHistory);
dataList.addAll(list);
}
+ else if (pojo instanceof DevA200AlarmDto) {
+ if(!key.equals("default")){
+ DevA200AlarmDto dto = (DevA200AlarmDto) pojo;
+ dto.setStartTime(queryTime.get(0));
+ dto.setEndTime(queryTime.get(1));
+ List<Integer> limitList = tableAndLimitMap.get(key);
+ dto.setLimitStart(limitList.get(0));
+ dto.setLimitEnd(limitList.get(1));
+ dto.setTableName(recordYear);
+ List<DevLithiumAlarmDataYear> list = service.getListDevAlm(dto);
+ for (DevLithiumAlarmDataYear year:list) {
+ int devId=year.getDevId();
+ int uid=year.getConfirmedUid();
+ DevLithiumInf dinf=devLithiumInfService.getDinfByDevId(devId);
+ UserInf uinf= userInfService.getUinfByUId(uid);
+ int almId=year.getAlmId();
+ String almName= DevAlmEnum.getValue(almId);
+ year.setAlmName(almName!=null?almName:"");
+ year.setDevInf(dinf);
+ year.setConfirmedUname(uinf!=null?uinf.getUname():"");
+ }
+ dataList.addAll(list);
+ }
+ }
}
pageInfo.setList(dataList);
return pageInfo;
diff --git a/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
index 1a73f11..70e2d90 100644
--- a/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
@@ -5,7 +5,7 @@
import com.whyc.dto.RtStateDto;
import com.whyc.service.A200RealStateService;
import com.whyc.service.ActmRealStateService;
-import com.whyc.service.BattRtDataService;
+import com.whyc.service.BattLithiumRtDataService;
import com.whyc.service.WorkStateChangeEventService;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@
private Thread thread;
- private static BattRtDataService battRtDataService;
+ private static BattLithiumRtDataService battLithiumRtDataService;
private static A200RealStateService a200RtStateService;
@@ -43,8 +43,8 @@
private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>();
@Autowired
- public void setBattRtDataService(BattRtDataService battRtDataService) {
- DevLithiumRtStateSocket.battRtDataService = battRtDataService;
+ public void setBattRtDataService(BattLithiumRtDataService battLithiumRtDataService) {
+ DevLithiumRtStateSocket.battLithiumRtDataService = battLithiumRtDataService;
}
@Autowired
@@ -111,8 +111,8 @@
private Response getActmState(int devId) {
Map<String, Response> map = new HashMap<>();
Response resActmState=actmRtStateService.getActmState(devId);
- Response rtDataState0=battRtDataService.getActmRtdataState(devId,0);
- Response rtDataState1=battRtDataService.getActmRtdataState(devId,1);
+ Response rtDataState0= battLithiumRtDataService.getActmRtdataState(devId,0);
+ Response rtDataState1= battLithiumRtDataService.getActmRtdataState(devId,1);
Response event=eventService.getWorkEvent(devId);
map.put("resActmState",resActmState);
map.put("rtDataState0",rtDataState0);
@@ -125,7 +125,7 @@
private Response getA200State(int devId) {
Map<String, Response> map = new HashMap<>();
Response resA200State=a200RtStateService.getA200State(devId);
- Response rtDataState=battRtDataService.getA200RtdataState(devId);
+ Response rtDataState= battLithiumRtDataService.getA200RtdataState(devId);
Response event=eventService.getWorkEvent(devId);
map.put("resA200State",resA200State);
map.put("rtDataState",rtDataState);
diff --git a/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java
index 295a58d..ca56187 100644
--- a/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumStatisticSocket.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.BattLithiumTestDataInfService;
import com.whyc.service.DevLithiumInfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@
private static DevLithiumInfService devLithiumInfService;
- private static BattTestDataInfService battTestDataInfService;
+ private static BattLithiumTestDataInfService battLithiumTestDataInfService;
private HttpSession httpSession;
@@ -43,8 +43,8 @@
}
@Autowired
- public void setBattTestDataInfService(BattTestDataInfService battTestDataInfService) {
- DevLithiumStatisticSocket.battTestDataInfService = battTestDataInfService;
+ public void setBattTestDataInfService(BattLithiumTestDataInfService battLithiumTestDataInfService) {
+ DevLithiumStatisticSocket.battLithiumTestDataInfService = battLithiumTestDataInfService;
}
@@ -79,7 +79,7 @@
CountDownLatch latch = new CountDownLatch(3);
//鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻/閿傜數鍧囪 浠祴璇曠粺璁�
poolExecutor.execute(() -> {
- Map<String,Object> lithiumTestInfMap = battTestDataInfService.getDevTinfByYearMonth(userId);
+ Map<String,Object> lithiumTestInfMap = battLithiumTestDataInfService.getDevTinfByYearMonth(userId);
map.put("lithiumTestInf",lithiumTestInfMap);
latch.countDown();
});
@@ -91,7 +91,7 @@
});
//杩戜竴鍛ㄧ數姹犳祴璇曡秼鍔跨粺璁�(浠庡綋鍓嶆椂闂村紑濮�)
poolExecutor.execute(() -> {
- Map<String,Object> devTestByWeekMap=battTestDataInfService.getDevTinfByWeek(userId);
+ Map<String,Object> devTestByWeekMap= battLithiumTestDataInfService.getDevTinfByWeek(userId);
map.put("devLithiumTestByWeek",devTestByWeekMap);
latch.countDown();
});
diff --git a/src/main/resources/mapper/BattTestDataInfMapper.xml b/src/main/resources/mapper/BattLithiumTestDataInfMapper.xml
similarity index 92%
rename from src/main/resources/mapper/BattTestDataInfMapper.xml
rename to src/main/resources/mapper/BattLithiumTestDataInfMapper.xml
index 85b46e3..7452233 100644
--- a/src/main/resources/mapper/BattTestDataInfMapper.xml
+++ b/src/main/resources/mapper/BattLithiumTestDataInfMapper.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.BattLithiumTestDataInfMapper">
+ <resultMap id="staticTinf" type="BattLithiumTestDataInf">
<id property="num" column="num"></id>
<result property="devId" column="dev_id"></result>
<result property="testType" column="test_type"></result>
@@ -51,7 +51,7 @@
)
</where>
</select>
- <resultMap id="staticTinfWeek" type="batttestdataInf">
+ <resultMap id="staticTinfWeek" type="BattLithiumTestDataInf">
<id property="num" column="num"></id>
<result property="devId" column="dev_id"></result>
<result property="testType" column="test_type"></result>
@@ -75,7 +75,7 @@
)
</where>
</select>
- <select id="getTinfById" resultType="com.whyc.pojo.db_batt_testdata.BattTestDataInf">
+ <select id="getTinfById" resultType="com.whyc.pojo.db_lithium_testdata.BattLithiumTestDataInf">
select *
from db_batt_testdata.tb_batttestdata_inf
<where>
diff --git a/src/main/resources/mapper/BattTestDataIdMapper.xml b/src/main/resources/mapper/BattTestDataIdMapper.xml
index ab52905..d18b6af 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.BattLithiumTestDataMapper">
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1