diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index 136912f..2b51783 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -19,6 +19,9 @@ import java.util.stream.Collector; import java.util.stream.Collectors; +/** + * @author cz + */ @Service @Slf4j @RequiredArgsConstructor @@ -93,10 +96,10 @@ @Transactional public void checkAndUpdateDeviceOnline() { //查询硫化氢设备 - List String = deviceDataMapper.getDevcodeByType(devciceType); + List devcodeList = deviceDataMapper.getDevcodeByType(devciceType); //统一查询所有设备的3天内数据的设备编号，然后设备编号转成map，进行 List dataList = deviceDataMapper.getRecentData(dataDay); - List dataSortDevcodeList = dataList; + List dataSortDevcodeList = devcodeList; if (dataList != null) { Map devOnlineMap = new HashMap<>(); for (String devcodeData : dataList) { @@ -106,7 +109,7 @@ e -> !devOnlineMap.containsKey(e)).collect(Collectors.toList()); } //统一更新 - if (CollectionUtils.isNotEmpty(dataList)) { + if (CollectionUtils.isNotEmpty(dataSortDevcodeList)) { deviceDataMapper.updateOnlineByDevs(dataSortDevcodeList); } } diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index 136912f..2b51783 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -19,6 +19,9 @@ import java.util.stream.Collector; import java.util.stream.Collectors; +/** + * @author cz + */ @Service @Slf4j @RequiredArgsConstructor @@ -93,10 +96,10 @@ @Transactional public void checkAndUpdateDeviceOnline() { //查询硫化氢设备 - List String = deviceDataMapper.getDevcodeByType(devciceType); + List devcodeList = deviceDataMapper.getDevcodeByType(devciceType); //统一查询所有设备的3天内数据的设备编号，然后设备编号转成map，进行 List dataList = deviceDataMapper.getRecentData(dataDay); - List dataSortDevcodeList = dataList; + List dataSortDevcodeList = devcodeList; if (dataList != null) { Map devOnlineMap = new HashMap<>(); for (String devcodeData : dataList) { @@ -106,7 +109,7 @@ e -> !devOnlineMap.containsKey(e)).collect(Collectors.toList()); } //统一更新 - if (CollectionUtils.isNotEmpty(dataList)) { + if (CollectionUtils.isNotEmpty(dataSortDevcodeList)) { deviceDataMapper.updateOnlineByDevs(dataSortDevcodeList); } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 9d28170..9b7d0d0 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -30,7 +30,7 @@ private final AlarmRecordMapper alarmRecordMapper; @Override - public Object h2sData(Map h2sDataMap) { + public Object h2sData(Map h2sDataMap) { try { if (h2sDataMap.containsKey(ICCID)) { //开机上报->存储映射管理->查询是否有下发配置-进行回应 @@ -65,7 +65,7 @@ * * @param h2sDataMap */ - private Map powerOnReport(Map h2sDataMap) { + private Map powerOnReport(Map h2sDataMap) { /** * 三码上报 */ @@ -90,7 +90,7 @@ return defaultDeliveryConfig(null); } - private Map dataSave(Map h2sDataMap) { + private Map dataSave(Map h2sDataMap) { DataH2s dataH2s = initH2sData(h2sDataMap); this.baseMapper.clearOnline((String) h2sDataMap.get(DEVCODE)); if (ObjectUtils.isNotEmpty(dataH2s)) { @@ -103,7 +103,7 @@ return defaultDeliveryConfig(null); } - private DataH2s initH2sData(Map h2sDataMap) { + private DataH2s initH2sData(Map h2sDataMap) { DataH2s dataH2s = new DataH2s(); String devcode = (String) h2sDataMap.get(DEVCODE); String wellCode = this.baseMapper.getWellCode(devcode); diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index 136912f..2b51783 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -19,6 +19,9 @@ import java.util.stream.Collector; import java.util.stream.Collectors; +/** + * @author cz + */ @Service @Slf4j @RequiredArgsConstructor @@ -93,10 +96,10 @@ @Transactional public void checkAndUpdateDeviceOnline() { //查询硫化氢设备 - List String = deviceDataMapper.getDevcodeByType(devciceType); + List devcodeList = deviceDataMapper.getDevcodeByType(devciceType); //统一查询所有设备的3天内数据的设备编号，然后设备编号转成map，进行 List dataList = deviceDataMapper.getRecentData(dataDay); - List dataSortDevcodeList = dataList; + List dataSortDevcodeList = devcodeList; if (dataList != null) { Map devOnlineMap = new HashMap<>(); for (String devcodeData : dataList) { @@ -106,7 +109,7 @@ e -> !devOnlineMap.containsKey(e)).collect(Collectors.toList()); } //统一更新 - if (CollectionUtils.isNotEmpty(dataList)) { + if (CollectionUtils.isNotEmpty(dataSortDevcodeList)) { deviceDataMapper.updateOnlineByDevs(dataSortDevcodeList); } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 9d28170..9b7d0d0 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -30,7 +30,7 @@ private final AlarmRecordMapper alarmRecordMapper; @Override - public Object h2sData(Map h2sDataMap) { + public Object h2sData(Map h2sDataMap) { try { if (h2sDataMap.containsKey(ICCID)) { //开机上报->存储映射管理->查询是否有下发配置-进行回应 @@ -65,7 +65,7 @@ * * @param h2sDataMap */ - private Map powerOnReport(Map h2sDataMap) { + private Map powerOnReport(Map h2sDataMap) { /** * 三码上报 */ @@ -90,7 +90,7 @@ return defaultDeliveryConfig(null); } - private Map dataSave(Map h2sDataMap) { + private Map dataSave(Map h2sDataMap) { DataH2s dataH2s = initH2sData(h2sDataMap); this.baseMapper.clearOnline((String) h2sDataMap.get(DEVCODE)); if (ObjectUtils.isNotEmpty(dataH2s)) { @@ -103,7 +103,7 @@ return defaultDeliveryConfig(null); } - private DataH2s initH2sData(Map h2sDataMap) { + private DataH2s initH2sData(Map h2sDataMap) { DataH2s dataH2s = new DataH2s(); String devcode = (String) h2sDataMap.get(DEVCODE); String wellCode = this.baseMapper.getWellCode(devcode); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 9226c8f..3c91579 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -32,6 +32,10 @@ port: 6379 password: ew5T4K3#203lwh config-prefix: 'Casic:' + online: + cron: 0 0/1 * * * ? # 多长时间判断离线 + data-day: 3 #多少天为离线 + type: 14 #硫化氢 swagger: enable: true diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index 136912f..2b51783 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -19,6 +19,9 @@ import java.util.stream.Collector; import java.util.stream.Collectors; +/** + * @author cz + */ @Service @Slf4j @RequiredArgsConstructor @@ -93,10 +96,10 @@ @Transactional public void checkAndUpdateDeviceOnline() { //查询硫化氢设备 - List String = deviceDataMapper.getDevcodeByType(devciceType); + List devcodeList = deviceDataMapper.getDevcodeByType(devciceType); //统一查询所有设备的3天内数据的设备编号，然后设备编号转成map，进行 List dataList = deviceDataMapper.getRecentData(dataDay); - List dataSortDevcodeList = dataList; + List dataSortDevcodeList = devcodeList; if (dataList != null) { Map devOnlineMap = new HashMap<>(); for (String devcodeData : dataList) { @@ -106,7 +109,7 @@ e -> !devOnlineMap.containsKey(e)).collect(Collectors.toList()); } //统一更新 - if (CollectionUtils.isNotEmpty(dataList)) { + if (CollectionUtils.isNotEmpty(dataSortDevcodeList)) { deviceDataMapper.updateOnlineByDevs(dataSortDevcodeList); } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 9d28170..9b7d0d0 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -30,7 +30,7 @@ private final AlarmRecordMapper alarmRecordMapper; @Override - public Object h2sData(Map h2sDataMap) { + public Object h2sData(Map h2sDataMap) { try { if (h2sDataMap.containsKey(ICCID)) { //开机上报->存储映射管理->查询是否有下发配置-进行回应 @@ -65,7 +65,7 @@ * * @param h2sDataMap */ - private Map powerOnReport(Map h2sDataMap) { + private Map powerOnReport(Map h2sDataMap) { /** * 三码上报 */ @@ -90,7 +90,7 @@ return defaultDeliveryConfig(null); } - private Map dataSave(Map h2sDataMap) { + private Map dataSave(Map h2sDataMap) { DataH2s dataH2s = initH2sData(h2sDataMap); this.baseMapper.clearOnline((String) h2sDataMap.get(DEVCODE)); if (ObjectUtils.isNotEmpty(dataH2s)) { @@ -103,7 +103,7 @@ return defaultDeliveryConfig(null); } - private DataH2s initH2sData(Map h2sDataMap) { + private DataH2s initH2sData(Map h2sDataMap) { DataH2s dataH2s = new DataH2s(); String devcode = (String) h2sDataMap.get(DEVCODE); String wellCode = this.baseMapper.getWellCode(devcode); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 9226c8f..3c91579 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -32,6 +32,10 @@ port: 6379 password: ew5T4K3#203lwh config-prefix: 'Casic:' + online: + cron: 0 0/1 * * * ? # 多长时间判断离线 + data-day: 3 #多少天为离线 + type: 14 #硫化氢 swagger: enable: true diff --git a/src/main/resources/mapper/DataH2sMapper.xml b/src/main/resources/mapper/DataH2sMapper.xml index 73ecb52..176609d 100644 --- a/src/main/resources/mapper/DataH2sMapper.xml +++ b/src/main/resources/mapper/DataH2sMapper.xml @@ -44,7 +44,7 @@ insert into bus_imei_iccid(devcode,imei,iccid) - value(#{devcode},#{imei},#{iccid}) + values (#{devcode},#{imei},#{iccid}) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9ebfdec..fa162a5 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,6 @@ 1.8 - diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 43282d3..f749ca3 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -18,8 +18,8 @@ @EnableScheduling public class TaskConfigurer implements SchedulingConfigurer { - @Value("${casic.device.online.corn}") - private String timeConfig; + @Value("${casic.device.online.cron}") + private String timeCron; @Autowired private DeviceDataService deviceDataService; @@ -27,7 +27,7 @@ public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { TriggerTask triggrtTask = new TriggerTask(nextDayDevice(), triggerContext -> { - return new CronTrigger(timeConfig).nextExecutionTime(triggerContext); + return new CronTrigger(timeCron).nextExecutionTime(triggerContext); }); taskRegistrar.addTriggerTask(triggrtTask); } diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index fbd8e59..1ca5eb6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -1,7 +1,6 @@ package com.casic.controller; import com.alibaba.fastjson.JSON; -import com.casic.model.ResponseData; import com.casic.service.ThirdDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -28,18 +27,11 @@ * @return */ @RequestMapping("/h2s-data") - public Object h2sData(@RequestBody Map h2sDataMap) { + public Object h2sData(@RequestBody Map h2sDataMap) { System.out.println(JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } - @RequestMapping("/test") - public Object testNbResponse (@RequestBody Map h2sDataMap){ - ResponseData responseData=new ResponseData(); - responseData.setCode(200); - responseData.setData("oyAAGDcgFAEAAcMAAQWfAXOJd1POnas6zxTmU7jQkVJinQ=="); - System.out.println(JSON.toJSON(h2sDataMap)); - return responseData; - } + } diff --git a/src/main/java/com/casic/dao/DeviceDataMapper.java b/src/main/java/com/casic/dao/DeviceDataMapper.java index e62d526..3a01d8c 100644 --- a/src/main/java/com/casic/dao/DeviceDataMapper.java +++ b/src/main/java/com/casic/dao/DeviceDataMapper.java @@ -28,9 +28,9 @@ List getDevcodeByType(@Param("devciceType") Integer devciceType); - List getRecentData(@Param("devciceType") Integer dataDay); + List getRecentData(@Param("dataDay") Integer dataDay); - List updateOnlineByDevs(@Param("dataSortDevcodeList") List dataSortDevcodeList); + int updateOnlineByDevs(@Param("dataSortList") List dataSortDevcodeList); } diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index 16ecc7a..eaeef1f 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -1,5 +1,8 @@ package com.casic.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,6 +15,7 @@ @TableName("data_h2s") public class DataH2s { + @TableId(value = "ID", type = IdType.AUTO) private Long id; private String devcode; diff --git a/src/main/java/com/casic/service/ThirdDataService.java b/src/main/java/com/casic/service/ThirdDataService.java index 31dc516..c056c1f 100644 --- a/src/main/java/com/casic/service/ThirdDataService.java +++ b/src/main/java/com/casic/service/ThirdDataService.java @@ -5,7 +5,7 @@ public interface ThirdDataService { - Object h2sData(Map h2sDataMap); + Object h2sData(Map h2sDataMap); } diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index 136912f..2b51783 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -19,6 +19,9 @@ import java.util.stream.Collector; import java.util.stream.Collectors; +/** + * @author cz + */ @Service @Slf4j @RequiredArgsConstructor @@ -93,10 +96,10 @@ @Transactional public void checkAndUpdateDeviceOnline() { //查询硫化氢设备 - List String = deviceDataMapper.getDevcodeByType(devciceType); + List devcodeList = deviceDataMapper.getDevcodeByType(devciceType); //统一查询所有设备的3天内数据的设备编号，然后设备编号转成map，进行 List dataList = deviceDataMapper.getRecentData(dataDay); - List dataSortDevcodeList = dataList; + List dataSortDevcodeList = devcodeList; if (dataList != null) { Map devOnlineMap = new HashMap<>(); for (String devcodeData : dataList) { @@ -106,7 +109,7 @@ e -> !devOnlineMap.containsKey(e)).collect(Collectors.toList()); } //统一更新 - if (CollectionUtils.isNotEmpty(dataList)) { + if (CollectionUtils.isNotEmpty(dataSortDevcodeList)) { deviceDataMapper.updateOnlineByDevs(dataSortDevcodeList); } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 9d28170..9b7d0d0 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -30,7 +30,7 @@ private final AlarmRecordMapper alarmRecordMapper; @Override - public Object h2sData(Map h2sDataMap) { + public Object h2sData(Map h2sDataMap) { try { if (h2sDataMap.containsKey(ICCID)) { //开机上报->存储映射管理->查询是否有下发配置-进行回应 @@ -65,7 +65,7 @@ * * @param h2sDataMap */ - private Map powerOnReport(Map h2sDataMap) { + private Map powerOnReport(Map h2sDataMap) { /** * 三码上报 */ @@ -90,7 +90,7 @@ return defaultDeliveryConfig(null); } - private Map dataSave(Map h2sDataMap) { + private Map dataSave(Map h2sDataMap) { DataH2s dataH2s = initH2sData(h2sDataMap); this.baseMapper.clearOnline((String) h2sDataMap.get(DEVCODE)); if (ObjectUtils.isNotEmpty(dataH2s)) { @@ -103,7 +103,7 @@ return defaultDeliveryConfig(null); } - private DataH2s initH2sData(Map h2sDataMap) { + private DataH2s initH2sData(Map h2sDataMap) { DataH2s dataH2s = new DataH2s(); String devcode = (String) h2sDataMap.get(DEVCODE); String wellCode = this.baseMapper.getWellCode(devcode); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 9226c8f..3c91579 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -32,6 +32,10 @@ port: 6379 password: ew5T4K3#203lwh config-prefix: 'Casic:' + online: + cron: 0 0/1 * * * ? # 多长时间判断离线 + data-day: 3 #多少天为离线 + type: 14 #硫化氢 swagger: enable: true diff --git a/src/main/resources/mapper/DataH2sMapper.xml b/src/main/resources/mapper/DataH2sMapper.xml index 73ecb52..176609d 100644 --- a/src/main/resources/mapper/DataH2sMapper.xml +++ b/src/main/resources/mapper/DataH2sMapper.xml @@ -44,7 +44,7 @@ insert into bus_imei_iccid(devcode,imei,iccid) - value(#{devcode},#{imei},#{iccid}) + values (#{devcode},#{imei},#{iccid}) \ No newline at end of file diff --git a/src/main/resources/mapper/DeviceDataMapper.xml b/src/main/resources/mapper/DeviceDataMapper.xml index 80c84ed..69cd706 100644 --- a/src/main/resources/mapper/DeviceDataMapper.xml +++ b/src/main/resources/mapper/DeviceDataMapper.xml @@ -44,23 +44,24 @@ SELECT DEVCODE FROM BUS_DEVICE WHERE VALID=1 AND DEVICE_TYPE=#{devciceType} + AND ONLINE_STATE=1 - + \ No newline at end of file