diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java new file mode 100644 index 0000000..bab7903 --- /dev/null +++ b/src/main/java/com/casic/entity/DeviceSatatus.java @@ -0,0 +1,19 @@ +package com.casic.entity; + +import lombok.Data; + +/** + * 不使用了 + * + */ +@Data +public class DeviceSatatus { + private String deviceId; + private String cell; + private String cellTs; + private String onlineState; + private String onlineTs; + private String lastDataId; + private String lastDataJson; + private String lastDataTs; +} diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java new file mode 100644 index 0000000..bab7903 --- /dev/null +++ b/src/main/java/com/casic/entity/DeviceSatatus.java @@ -0,0 +1,19 @@ +package com.casic.entity; + +import lombok.Data; + +/** + * 不使用了 + * + */ +@Data +public class DeviceSatatus { + private String deviceId; + private String cell; + private String cellTs; + private String onlineState; + private String onlineTs; + private String lastDataId; + private String lastDataJson; + private String lastDataTs; +} diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index bb018df..e473f0c 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -29,8 +29,8 @@ ResponseData responseData = new ResponseData(); try { Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class); - DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("upd_data").get("value"), DataContentParam.class); - Long uptime = Long.valueOf(String.valueOf(updDataMap.get("upd_data").get("time"))); + DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class); + Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time"))); if (StringUtils.isEmpty(dataReportParam.getDeviceName())) { responseData.setCode(200); responseData.setMessage("没有设备编号"); diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java new file mode 100644 index 0000000..bab7903 --- /dev/null +++ b/src/main/java/com/casic/entity/DeviceSatatus.java @@ -0,0 +1,19 @@ +package com.casic.entity; + +import lombok.Data; + +/** + * 不使用了 + * + */ +@Data +public class DeviceSatatus { + private String deviceId; + private String cell; + private String cellTs; + private String onlineState; + private String onlineTs; + private String lastDataId; + private String lastDataJson; + private String lastDataTs; +} diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index bb018df..e473f0c 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -29,8 +29,8 @@ ResponseData responseData = new ResponseData(); try { Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class); - DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("upd_data").get("value"), DataContentParam.class); - Long uptime = Long.valueOf(String.valueOf(updDataMap.get("upd_data").get("time"))); + DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class); + Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time"))); if (StringUtils.isEmpty(dataReportParam.getDeviceName())) { responseData.setCode(200); responseData.setMessage("没有设备编号"); diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java index e5362c0..3f7630a 100644 --- a/src/main/java/com/casic/service/impl/NormalDataProcessor.java +++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java @@ -13,11 +13,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; -import javax.management.Query; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -35,23 +34,23 @@ private String minutes; @Value("${casic.device.gas-dector.enable-local}") private Boolean enableLocal; - @Resource private DataGasMapper dataGasMapper; @Autowired private AlarmJobDao alarmJobDao; @Resource private AlarmRecordsMapper alarmRecordsMapper; + private static Snowflake snowflake = new Snowflake(0, 2); public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) { Map gasMap = dataGasMapper.getWellCode(devcode); if (ObjectUtils.isEmpty(gasMap)) { log.info("没有该设备编号录入" + devcode); - if (enableLocal){ + if (enableLocal) { return; } } - Boolean updateFlag = null; + Boolean updateFlag = false; if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) { updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap); } @@ -108,7 +107,8 @@ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) { List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType); String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : ""; - Long deviceId = Long.valueOf(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("deviceId") : "-1"); + Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1; + final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType); dataReportParam.getRtd_val().stream().filter( dataReport -> { return dataReport != -1 && dataReport != 65535; @@ -118,13 +118,14 @@ for (Map alarmLevelMap : alarmLevelList) { if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) { AlarmRecords alarmRecord = new AlarmRecords(); + alarmRecord.setId(snowflake.nextId()); alarmRecord.setDeviceId(deviceId); alarmRecord.setDevcode(devcode); alarmRecord.setWellCode(wellCode); alarmRecord.setAlarmType("1"); // 业务报警 alarmRecord.setAlarmContent("燃气报警"); alarmRecord.setAlarmValue(String.valueOf(dataReport)); - alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); + alarmRecord.setAlarmTime(new Date()); alarmRecord.setStatus("1"); alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString())); alarmRecord.setAlarmMessage("燃气报警"); @@ -158,5 +159,6 @@ dataGasDector.setStrength(String.valueOf(data)); dataGasMapper.insert(dataGasDector); } + } diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java new file mode 100644 index 0000000..bab7903 --- /dev/null +++ b/src/main/java/com/casic/entity/DeviceSatatus.java @@ -0,0 +1,19 @@ +package com.casic.entity; + +import lombok.Data; + +/** + * 不使用了 + * + */ +@Data +public class DeviceSatatus { + private String deviceId; + private String cell; + private String cellTs; + private String onlineState; + private String onlineTs; + private String lastDataId; + private String lastDataJson; + private String lastDataTs; +} diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index bb018df..e473f0c 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -29,8 +29,8 @@ ResponseData responseData = new ResponseData(); try { Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class); - DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("upd_data").get("value"), DataContentParam.class); - Long uptime = Long.valueOf(String.valueOf(updDataMap.get("upd_data").get("time"))); + DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class); + Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time"))); if (StringUtils.isEmpty(dataReportParam.getDeviceName())) { responseData.setCode(200); responseData.setMessage("没有设备编号"); diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java index e5362c0..3f7630a 100644 --- a/src/main/java/com/casic/service/impl/NormalDataProcessor.java +++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java @@ -13,11 +13,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; -import javax.management.Query; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -35,23 +34,23 @@ private String minutes; @Value("${casic.device.gas-dector.enable-local}") private Boolean enableLocal; - @Resource private DataGasMapper dataGasMapper; @Autowired private AlarmJobDao alarmJobDao; @Resource private AlarmRecordsMapper alarmRecordsMapper; + private static Snowflake snowflake = new Snowflake(0, 2); public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) { Map gasMap = dataGasMapper.getWellCode(devcode); if (ObjectUtils.isEmpty(gasMap)) { log.info("没有该设备编号录入" + devcode); - if (enableLocal){ + if (enableLocal) { return; } } - Boolean updateFlag = null; + Boolean updateFlag = false; if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) { updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap); } @@ -108,7 +107,8 @@ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) { List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType); String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : ""; - Long deviceId = Long.valueOf(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("deviceId") : "-1"); + Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1; + final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType); dataReportParam.getRtd_val().stream().filter( dataReport -> { return dataReport != -1 && dataReport != 65535; @@ -118,13 +118,14 @@ for (Map alarmLevelMap : alarmLevelList) { if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) { AlarmRecords alarmRecord = new AlarmRecords(); + alarmRecord.setId(snowflake.nextId()); alarmRecord.setDeviceId(deviceId); alarmRecord.setDevcode(devcode); alarmRecord.setWellCode(wellCode); alarmRecord.setAlarmType("1"); // 业务报警 alarmRecord.setAlarmContent("燃气报警"); alarmRecord.setAlarmValue(String.valueOf(dataReport)); - alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); + alarmRecord.setAlarmTime(new Date()); alarmRecord.setStatus("1"); alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString())); alarmRecord.setAlarmMessage("燃气报警"); @@ -158,5 +159,6 @@ dataGasDector.setStrength(String.valueOf(data)); dataGasMapper.insert(dataGasDector); } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d17a81a..f8a06a6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11556 + port: 11320 ################### spring配置 ################### spring: datasource: @@ -13,7 +13,7 @@ pub-sub-domain: true logging: level.root: error - level.com.casic: error + level.com.casic: info file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/pom.xml b/pom.xml index 74d7bd1..bf4cf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.casic.sensor sensor-transfer 1.0-SNAPSHOT - war + jar UTF-8 @@ -36,6 +36,13 @@ + xyz.downgoon + snowflake + 1.0.0 + + + + org.springframework.boot spring-boot-starter-web 2.1.3.RELEASE @@ -118,6 +125,25 @@ + + + src/main/resources + + + /config/*/* + /config/*-*.yml + + true + + + src/main/resources + + **/*.xml + + true + + + \ No newline at end of file diff --git a/src/main/java/com/casic/CasicApplication.java b/src/main/java/com/casic/CasicApplication.java index c55e37d..0887f1f 100644 --- a/src/main/java/com/casic/CasicApplication.java +++ b/src/main/java/com/casic/CasicApplication.java @@ -3,8 +3,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; /** diff --git a/src/main/java/com/casic/controller/DeviceDataController.java b/src/main/java/com/casic/controller/DeviceDataController.java index 971b258..be0de6b 100644 --- a/src/main/java/com/casic/controller/DeviceDataController.java +++ b/src/main/java/com/casic/controller/DeviceDataController.java @@ -1,13 +1,19 @@ package com.casic.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.model.DataReportParam; import com.casic.model.ResponseData; import com.casic.service.DeviceDataService; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +@Slf4j @RequestMapping("/data") @RestController public class DeviceDataController { @@ -18,8 +24,15 @@ this.dataService = dataService; } +// @PostMapping("/gas/receiver") +// public String gasReceiver(@RequestBody Map map) { +// log.info("---------"+JSON.toJSONString(map)); +// return "200"; +// } + @PostMapping("/gas/receiver") public ResponseData gasReceiver(@RequestBody DataReportParam dataReportParam) { + log.info("---------"+JSON.toJSONString(dataReportParam)); return dataService.gasReceiver(dataReportParam); } diff --git a/src/main/java/com/casic/dao/DataGasMapper.java b/src/main/java/com/casic/dao/DataGasMapper.java index 02b97f4..33ce14a 100644 --- a/src/main/java/com/casic/dao/DataGasMapper.java +++ b/src/main/java/com/casic/dao/DataGasMapper.java @@ -13,7 +13,7 @@ @Mapper public interface DataGasMapper extends BaseMapper { - @Select("select bd.id as \"deviceId\" " + + @Select("select bd.id as \"deviceId\",bwi.WELL_CODE AS \"wellCode\" " + "from bus_device_well bdw " + "join (select id from bus_device where devcode=#{devcode}) bd ON bd.id=bdw.device_id " + "join bus_well_info bwi ON bwi.id=bdw.well_id ") @@ -33,10 +33,16 @@ @Select("SELECT devcode " + "FROM data_gas_dector " + "WHERE devcode=#{devcode} " + - "AND round(cast(date_part('epoch',now() - uptime)/60 as numeric ),1) < ${minutes}" + - "ORDER BY uptime DESC " + + "AND (EXTRACT(epoch FROM CAST(now() AS TIMESTAMPTZ))-EXTRACT(epoch FROM CAST(logtime AS TIMESTAMPTZ)))/60.0 < ${minutes} "+ + "ORDER BY logtime DESC " + "LIMIT 1") String getLastData(@Param("minutes") String minutes, @Param("devcode") String devcode); + @Select("SELECT alarm_content" + + "FROM BASE_alarm_content_type" + + "where device_type=#{deviceType}") + String getGasMsgContent(@Param("deviceType")Long deviceType); + + } diff --git a/src/main/java/com/casic/dao/impl/AlarmJobDao.java b/src/main/java/com/casic/dao/impl/AlarmJobDao.java index 2066e53..5131821 100644 --- a/src/main/java/com/casic/dao/impl/AlarmJobDao.java +++ b/src/main/java/com/casic/dao/impl/AlarmJobDao.java @@ -4,6 +4,7 @@ import com.casic.dao.AlarmJobMapper; import com.casic.entity.AlarmJob; import org.springframework.stereotype.Component; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -12,13 +13,17 @@ @Component public class AlarmJobDao { - public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd"); + + private static Snowflake snowflake = new Snowflake(0, 2); +// private static final Sn @Resource private AlarmJobMapper alarmJobMapper; public AlarmJob saveData(String devCode, String wellCode, String devTypeName, String jobType) { AlarmJob alarmJob = new AlarmJob(); + alarmJob.setId(snowflake.nextId()); alarmJob.setDevcode(devCode); alarmJob.setWellCode(wellCode); alarmJob.setJobStatus("0"); diff --git a/src/main/java/com/casic/entity/AlarmJob.java b/src/main/java/com/casic/entity/AlarmJob.java index 14affd9..8a0f764 100644 --- a/src/main/java/com/casic/entity/AlarmJob.java +++ b/src/main/java/com/casic/entity/AlarmJob.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 工单编号 diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java index bfedfb9..88b0b26 100644 --- a/src/main/java/com/casic/entity/AlarmRecords.java +++ b/src/main/java/com/casic/entity/AlarmRecords.java @@ -26,7 +26,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; /** * 设备ID diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java new file mode 100644 index 0000000..bab7903 --- /dev/null +++ b/src/main/java/com/casic/entity/DeviceSatatus.java @@ -0,0 +1,19 @@ +package com.casic.entity; + +import lombok.Data; + +/** + * 不使用了 + * + */ +@Data +public class DeviceSatatus { + private String deviceId; + private String cell; + private String cellTs; + private String onlineState; + private String onlineTs; + private String lastDataId; + private String lastDataJson; + private String lastDataTs; +} diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java index bb018df..e473f0c 100644 --- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java @@ -29,8 +29,8 @@ ResponseData responseData = new ResponseData(); try { Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class); - DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("upd_data").get("value"), DataContentParam.class); - Long uptime = Long.valueOf(String.valueOf(updDataMap.get("upd_data").get("time"))); + DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class); + Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time"))); if (StringUtils.isEmpty(dataReportParam.getDeviceName())) { responseData.setCode(200); responseData.setMessage("没有设备编号"); diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java index e5362c0..3f7630a 100644 --- a/src/main/java/com/casic/service/impl/NormalDataProcessor.java +++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java @@ -13,11 +13,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import xyz.downgoon.snowflake.Snowflake; import javax.annotation.Resource; -import javax.management.Query; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -35,23 +34,23 @@ private String minutes; @Value("${casic.device.gas-dector.enable-local}") private Boolean enableLocal; - @Resource private DataGasMapper dataGasMapper; @Autowired private AlarmJobDao alarmJobDao; @Resource private AlarmRecordsMapper alarmRecordsMapper; + private static Snowflake snowflake = new Snowflake(0, 2); public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) { Map gasMap = dataGasMapper.getWellCode(devcode); if (ObjectUtils.isEmpty(gasMap)) { log.info("没有该设备编号录入" + devcode); - if (enableLocal){ + if (enableLocal) { return; } } - Boolean updateFlag = null; + Boolean updateFlag = false; if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) { updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap); } @@ -108,7 +107,8 @@ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) { List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType); String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : ""; - Long deviceId = Long.valueOf(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("deviceId") : "-1"); + Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1; + final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType); dataReportParam.getRtd_val().stream().filter( dataReport -> { return dataReport != -1 && dataReport != 65535; @@ -118,13 +118,14 @@ for (Map alarmLevelMap : alarmLevelList) { if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) { AlarmRecords alarmRecord = new AlarmRecords(); + alarmRecord.setId(snowflake.nextId()); alarmRecord.setDeviceId(deviceId); alarmRecord.setDevcode(devcode); alarmRecord.setWellCode(wellCode); alarmRecord.setAlarmType("1"); // 业务报警 alarmRecord.setAlarmContent("燃气报警"); alarmRecord.setAlarmValue(String.valueOf(dataReport)); - alarmRecord.setAlarmTime(Calendar.getInstance().getTime()); + alarmRecord.setAlarmTime(new Date()); alarmRecord.setStatus("1"); alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString())); alarmRecord.setAlarmMessage("燃气报警"); @@ -158,5 +159,6 @@ dataGasDector.setStrength(String.valueOf(data)); dataGasMapper.insert(dataGasDector); } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d17a81a..f8a06a6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11556 + port: 11320 ################### spring配置 ################### spring: datasource: @@ -13,7 +13,7 @@ pub-sub-domain: true logging: level.root: error - level.com.casic: error + level.com.casic: info file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3b6e31f..ffc01e9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -23,7 +23,7 @@ device: gas-dector: type: 101 - minutes: 0 + minutes: 60 enable-local: false # type 可燃气体的设备类型 # minutes: 燃气外协设备上传数据的分钟数 \ No newline at end of file