diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/src/main/java/com/casic/dao/GasDataRecvMapper.java b/src/main/java/com/casic/dao/GasDataRecvMapper.java
index 558996b..c451e69 100644
--- a/src/main/java/com/casic/dao/GasDataRecvMapper.java
+++ b/src/main/java/com/casic/dao/GasDataRecvMapper.java
@@ -19,10 +19,10 @@
Integer updateData(@Param("imei") String imei, @Param("devcode") String devcode);
- @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime) " +
- "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime}) ")
+ @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime,cell) " +
+ "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime},#{cell}) ")
Integer addData(@Param("devcode") String devcode, @Param("tenantId") String tenantId,
@Param("deviceId") String deviceId, @Param("imei") String imei,
@Param("uptime") Date time, @Param("ch4") String ch4,
- @Param("logtime") Date logtime);
+ @Param("logtime") Date logtime, @Param("cell") String cell);
}
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/src/main/java/com/casic/dao/GasDataRecvMapper.java b/src/main/java/com/casic/dao/GasDataRecvMapper.java
index 558996b..c451e69 100644
--- a/src/main/java/com/casic/dao/GasDataRecvMapper.java
+++ b/src/main/java/com/casic/dao/GasDataRecvMapper.java
@@ -19,10 +19,10 @@
Integer updateData(@Param("imei") String imei, @Param("devcode") String devcode);
- @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime) " +
- "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime}) ")
+ @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime,cell) " +
+ "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime},#{cell}) ")
Integer addData(@Param("devcode") String devcode, @Param("tenantId") String tenantId,
@Param("deviceId") String deviceId, @Param("imei") String imei,
@Param("uptime") Date time, @Param("ch4") String ch4,
- @Param("logtime") Date logtime);
+ @Param("logtime") Date logtime, @Param("cell") String cell);
}
diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java
index 6df6a0a..f2d5375 100644
--- a/src/main/java/com/casic/dao/NbDeviceMapper.java
+++ b/src/main/java/com/casic/dao/NbDeviceMapper.java
@@ -50,6 +50,15 @@
"where device_id=#{deviceId} ")
Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf);
+ @Select("SELECT cell " +
+ " from lucency_gas_data "+
+ " WHERE device_id = #{deviceId} "+
+ " and cell is NOT NULL "+
+ " ORDER BY uptime desc "+
+ " LIMIT 1 ")
+ String getLastCellByDeviceId(@Param("deviceId")String deviceId);
+
+
@Select("select recent_conf " +
"from nb_device " +
"where device_id=#{deviceId} ")
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/src/main/java/com/casic/dao/GasDataRecvMapper.java b/src/main/java/com/casic/dao/GasDataRecvMapper.java
index 558996b..c451e69 100644
--- a/src/main/java/com/casic/dao/GasDataRecvMapper.java
+++ b/src/main/java/com/casic/dao/GasDataRecvMapper.java
@@ -19,10 +19,10 @@
Integer updateData(@Param("imei") String imei, @Param("devcode") String devcode);
- @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime) " +
- "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime}) ")
+ @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime,cell) " +
+ "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime},#{cell}) ")
Integer addData(@Param("devcode") String devcode, @Param("tenantId") String tenantId,
@Param("deviceId") String deviceId, @Param("imei") String imei,
@Param("uptime") Date time, @Param("ch4") String ch4,
- @Param("logtime") Date logtime);
+ @Param("logtime") Date logtime, @Param("cell") String cell);
}
diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java
index 6df6a0a..f2d5375 100644
--- a/src/main/java/com/casic/dao/NbDeviceMapper.java
+++ b/src/main/java/com/casic/dao/NbDeviceMapper.java
@@ -50,6 +50,15 @@
"where device_id=#{deviceId} ")
Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf);
+ @Select("SELECT cell " +
+ " from lucency_gas_data "+
+ " WHERE device_id = #{deviceId} "+
+ " and cell is NOT NULL "+
+ " ORDER BY uptime desc "+
+ " LIMIT 1 ")
+ String getLastCellByDeviceId(@Param("deviceId")String deviceId);
+
+
@Select("select recent_conf " +
"from nb_device " +
"where device_id=#{deviceId} ")
diff --git a/src/main/java/com/casic/service/GasDataService.java b/src/main/java/com/casic/service/GasDataService.java
index 090c624..7a34c2d 100644
--- a/src/main/java/com/casic/service/GasDataService.java
+++ b/src/main/java/com/casic/service/GasDataService.java
@@ -9,7 +9,7 @@
ResponseData> getGasDataList(String devcode, String beginTime, String endTime, Integer currentIndex,
- Integer pageSize,Boolean sortDevcode);
+ Integer pageSize, Boolean sortDevcode, Boolean realData);
ResponseData> getGasHistoryList(String devcode, String beginTime, String endTime, Integer currentIndex,
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/src/main/java/com/casic/dao/GasDataRecvMapper.java b/src/main/java/com/casic/dao/GasDataRecvMapper.java
index 558996b..c451e69 100644
--- a/src/main/java/com/casic/dao/GasDataRecvMapper.java
+++ b/src/main/java/com/casic/dao/GasDataRecvMapper.java
@@ -19,10 +19,10 @@
Integer updateData(@Param("imei") String imei, @Param("devcode") String devcode);
- @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime) " +
- "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime}) ")
+ @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime,cell) " +
+ "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime},#{cell}) ")
Integer addData(@Param("devcode") String devcode, @Param("tenantId") String tenantId,
@Param("deviceId") String deviceId, @Param("imei") String imei,
@Param("uptime") Date time, @Param("ch4") String ch4,
- @Param("logtime") Date logtime);
+ @Param("logtime") Date logtime, @Param("cell") String cell);
}
diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java
index 6df6a0a..f2d5375 100644
--- a/src/main/java/com/casic/dao/NbDeviceMapper.java
+++ b/src/main/java/com/casic/dao/NbDeviceMapper.java
@@ -50,6 +50,15 @@
"where device_id=#{deviceId} ")
Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf);
+ @Select("SELECT cell " +
+ " from lucency_gas_data "+
+ " WHERE device_id = #{deviceId} "+
+ " and cell is NOT NULL "+
+ " ORDER BY uptime desc "+
+ " LIMIT 1 ")
+ String getLastCellByDeviceId(@Param("deviceId")String deviceId);
+
+
@Select("select recent_conf " +
"from nb_device " +
"where device_id=#{deviceId} ")
diff --git a/src/main/java/com/casic/service/GasDataService.java b/src/main/java/com/casic/service/GasDataService.java
index 090c624..7a34c2d 100644
--- a/src/main/java/com/casic/service/GasDataService.java
+++ b/src/main/java/com/casic/service/GasDataService.java
@@ -9,7 +9,7 @@
ResponseData> getGasDataList(String devcode, String beginTime, String endTime, Integer currentIndex,
- Integer pageSize,Boolean sortDevcode);
+ Integer pageSize, Boolean sortDevcode, Boolean realData);
ResponseData> getGasHistoryList(String devcode, String beginTime, String endTime, Integer currentIndex,
diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
index 0bc20ed..8b8683a 100644
--- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
@@ -76,7 +76,7 @@
String imei = String.valueOf(recvDataMap.get("IMEI"));
String deviceId = String.valueOf(recvDataMap.get("deviceId"));
String productId = String.valueOf(recvDataMap.get("productId"));
- fisrtSaveDeviceAndSend(imei, productId, deviceId);
+ firstSaveDeviceAndSend(imei, productId, deviceId);
String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId);
LucencyGasData lucencyGasBuilder = LucencyGasData.builder()
.tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId"))))
@@ -103,16 +103,17 @@
String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId")));
String tenantId = String.valueOf(recvDataMap.get("tenantId"));
String deviceId = String.valueOf(recvDataMap.get("deviceId"));
+ String cell = StringUtils.isEmpty(deviceId) ? "" : nbDeviceMapper.getLastCellByDeviceId(deviceId);
String imei = String.valueOf(recvDataMap.get("IMEI"));
for (Map historyData : historyDataList) {
this.baseMapper.addData(devcode, tenantId, deviceId, imei, new Date(historyData.containsKey("time") ?
Long.valueOf(String.valueOf(historyData.get("time")))
- : System.currentTimeMillis()), String.valueOf(historyData.get("ch4")), new Date());
+ : System.currentTimeMillis()), String.valueOf(historyData.get("ch4")), new Date(), cell);
}
return true;
}
- private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception {
+ private Boolean firstSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception {
String id = nbDeviceMapper.isDeviceId(deviceId);
if (StringUtils.isEmpty(id)) {
NbDevice nbDevice = NbDevice.builder()
diff --git a/pom.xml b/pom.xml
index b33c231..6dc0d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,13 +75,13 @@
com.ctg.ag
ctg-ag-sdk-core
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
com.ctg.ag
ag-sdk-biz
- 2.5.0-SNAPSHOT
+ 2.8.0-SNAPSHOT
diff --git a/src/main/java/com/casic/controller/DataGasController.java b/src/main/java/com/casic/controller/DataGasController.java
index 12ca603..d717430 100644
--- a/src/main/java/com/casic/controller/DataGasController.java
+++ b/src/main/java/com/casic/controller/DataGasController.java
@@ -34,9 +34,10 @@
@RequestParam(value = "beginTime", required = false) String beginTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "sortDevcode", required = true) Boolean sortDevcode,
+ @RequestParam(value = "realData", required = true) Boolean realData,
@RequestParam(value = "currentIndex", required = true) Integer currentIndex,
@RequestParam(value = "pageSize", required = true) Integer pageSize) {
- return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode);
+ return gasDataService.getGasDataList(devcode, beginTime, endTime, currentIndex, pageSize,sortDevcode,realData);
}
@ApiImplicitParams({
diff --git a/src/main/java/com/casic/dao/GasDataRecvMapper.java b/src/main/java/com/casic/dao/GasDataRecvMapper.java
index 558996b..c451e69 100644
--- a/src/main/java/com/casic/dao/GasDataRecvMapper.java
+++ b/src/main/java/com/casic/dao/GasDataRecvMapper.java
@@ -19,10 +19,10 @@
Integer updateData(@Param("imei") String imei, @Param("devcode") String devcode);
- @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime) " +
- "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime}) ")
+ @Insert("insert into lucency_gas_data(devcode,tenant_id,device_id,data_value,uptime,imei,logtime,cell) " +
+ "values(#{devcode},#{tenantId},#{deviceId},#{ch4},#{uptime},#{imei},#{logtime},#{cell}) ")
Integer addData(@Param("devcode") String devcode, @Param("tenantId") String tenantId,
@Param("deviceId") String deviceId, @Param("imei") String imei,
@Param("uptime") Date time, @Param("ch4") String ch4,
- @Param("logtime") Date logtime);
+ @Param("logtime") Date logtime, @Param("cell") String cell);
}
diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java
index 6df6a0a..f2d5375 100644
--- a/src/main/java/com/casic/dao/NbDeviceMapper.java
+++ b/src/main/java/com/casic/dao/NbDeviceMapper.java
@@ -50,6 +50,15 @@
"where device_id=#{deviceId} ")
Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf);
+ @Select("SELECT cell " +
+ " from lucency_gas_data "+
+ " WHERE device_id = #{deviceId} "+
+ " and cell is NOT NULL "+
+ " ORDER BY uptime desc "+
+ " LIMIT 1 ")
+ String getLastCellByDeviceId(@Param("deviceId")String deviceId);
+
+
@Select("select recent_conf " +
"from nb_device " +
"where device_id=#{deviceId} ")
diff --git a/src/main/java/com/casic/service/GasDataService.java b/src/main/java/com/casic/service/GasDataService.java
index 090c624..7a34c2d 100644
--- a/src/main/java/com/casic/service/GasDataService.java
+++ b/src/main/java/com/casic/service/GasDataService.java
@@ -9,7 +9,7 @@
ResponseData> getGasDataList(String devcode, String beginTime, String endTime, Integer currentIndex,
- Integer pageSize,Boolean sortDevcode);
+ Integer pageSize, Boolean sortDevcode, Boolean realData);
ResponseData> getGasHistoryList(String devcode, String beginTime, String endTime, Integer currentIndex,
diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
index 0bc20ed..8b8683a 100644
--- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java
@@ -76,7 +76,7 @@
String imei = String.valueOf(recvDataMap.get("IMEI"));
String deviceId = String.valueOf(recvDataMap.get("deviceId"));
String productId = String.valueOf(recvDataMap.get("productId"));
- fisrtSaveDeviceAndSend(imei, productId, deviceId);
+ firstSaveDeviceAndSend(imei, productId, deviceId);
String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId);
LucencyGasData lucencyGasBuilder = LucencyGasData.builder()
.tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId"))))
@@ -103,16 +103,17 @@
String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId")));
String tenantId = String.valueOf(recvDataMap.get("tenantId"));
String deviceId = String.valueOf(recvDataMap.get("deviceId"));
+ String cell = StringUtils.isEmpty(deviceId) ? "" : nbDeviceMapper.getLastCellByDeviceId(deviceId);
String imei = String.valueOf(recvDataMap.get("IMEI"));
for (Map historyData : historyDataList) {
this.baseMapper.addData(devcode, tenantId, deviceId, imei, new Date(historyData.containsKey("time") ?
Long.valueOf(String.valueOf(historyData.get("time")))
- : System.currentTimeMillis()), String.valueOf(historyData.get("ch4")), new Date());
+ : System.currentTimeMillis()), String.valueOf(historyData.get("ch4")), new Date(), cell);
}
return true;
}
- private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception {
+ private Boolean firstSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception {
String id = nbDeviceMapper.isDeviceId(deviceId);
if (StringUtils.isEmpty(id)) {
NbDevice nbDevice = NbDevice.builder()
diff --git a/src/main/java/com/casic/service/impl/GasDataServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataServiceImpl.java
index 9c38390..a934978 100644
--- a/src/main/java/com/casic/service/impl/GasDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/GasDataServiceImpl.java
@@ -28,22 +28,27 @@
private NbDeviceMapper nbDeviceMapper;
@Override
- public ResponseData> getGasDataList(String devcode, String beginTime, String endTime, Integer currentIndex, Integer pageSize, Boolean sortDevcode) {
+ public ResponseData> getGasDataList(String devcode, String beginTime, String endTime, Integer currentIndex, Integer pageSize, Boolean sortDevcode, Boolean realData) {
ResponseData responseData = new ResponseData();
try {
devcode = StringUtils.isEmpty(devcode) ? "3" : devcode;
QueryWrapper lucencyGasWrapper = new QueryWrapper()
- .select("id,devcode,tenant_id as tenantId,data_value as dataValue,signals,chha,chhha,cell," +
- "device_id as deviceId,logtime,max(uptime) as uptime,imei").like("devcode", devcode);
+ .like("devcode", devcode);
+ if (realData) {
+ lucencyGasWrapper.ne("signals", "");
+ }
if (!StringUtils.isEmpty(beginTime)) {
lucencyGasWrapper = lucencyGasWrapper.gt("uptime", beginTime);
}
if (!StringUtils.isEmpty(endTime)) {
lucencyGasWrapper = lucencyGasWrapper.lt("uptime", endTime);
}
- lucencyGasWrapper = lucencyGasWrapper.groupBy("devcode");
lucencyGasWrapper = sortDevcode ? lucencyGasWrapper.orderByAsc("devcode") : lucencyGasWrapper.orderByDesc("logtime");
- Page userPage = new Page<>(currentIndex - 1, pageSize);
+ Integer count = gasDataRecvMapper.selectCount(lucencyGasWrapper);
+ lucencyGasWrapper = lucencyGasWrapper.groupBy("devcode");
+ lucencyGasWrapper = lucencyGasWrapper.select("id,devcode,tenant_id as tenantId,data_value as dataValue,signals,chha,chhha,cell," +
+ "device_id as deviceId,logtime,max(uptime) as uptime,imei");
+ Page userPage = new Page<>((count-1) / pageSize + 1 < currentIndex ? (count-1) / pageSize + 1 : currentIndex, pageSize);
IPage userIPage = gasDataRecvMapper.selectPage(userPage, lucencyGasWrapper);
Map page = new HashMap();
page.put("total", userIPage.getTotal());