diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/service/impl/AepCommandSend.java b/src/main/java/com/casic/service/impl/AepCommandSend.java index c91f3ad..aa96f68 100644 --- a/src/main/java/com/casic/service/impl/AepCommandSend.java +++ b/src/main/java/com/casic/service/impl/AepCommandSend.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.casic.config.AEPParamConfig; +import com.casic.config.DeviceGroup; import com.casic.model.AlarmConfigParam; import com.casic.model.BusConfigParam; import com.casic.model.DataGasConfigParam; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; @Component @Slf4j @@ -22,10 +24,7 @@ @Autowired private AEPParamConfig aepParamConfig; - public void sendStatusNb(List dataGasConfigList) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); + public void sendStatusNb(List dataGasConfigList) { Map dataGasMap = new HashMap<>(); Map queryMap = new HashMap<>(); queryMap.put("query", 1); @@ -34,64 +33,104 @@ dataGasConfigList.forEach( dataGasConfigParam -> { dataGasConfigParam.setLevel(1); - dataGasConfigParam.setContent(dataGasMap); - dataGasConfigParam.setOperator("casic"); + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(dataGasConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + try { + dataGasConfigParam.setContent(dataGasMap); + dataGasConfigParam.setOperator("casic"); + dataGasConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); + request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); + System.out.println(client.CreateCommand(request)); + client.shutdown(); + } catch (Exception ex) { + log.error("状态下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(dataGasConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return; + } + } else { + return; + } } ); - for (DataGasConfigParam dataGasConfigParam : dataGasConfigList) { - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); //具体格式见前面请求body说明 - System.out.println(client.CreateCommand(request)); - } - client.shutdown(); } - public String sendConfig(BusConfigParam busConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "config"); - dataGasMap.put("params", busConfigParam.getQueryContent()); - busConfigParam.setContent(dataGasMap); - busConfigParam.setLevel(1); - busConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendConfig(BusConfigParam busConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(busConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "config"); + dataGasMap.put("params", busConfigParam.getQueryContent()); + busConfigParam.setContent(dataGasMap); + busConfigParam.setLevel(1); + busConfigParam.setOperator("casic"); + try { + busConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); + CreateCommandResponse msgResponse = client.CreateCommand(request); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备命令下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(busConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } } - public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "alarmconfig"); - dataGasMap.put("params", alarmConfigParam.getQueryContent()); - alarmConfigParam.setContent(dataGasMap); - alarmConfigParam.setLevel(1); - alarmConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(alarmConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "alarmconfig"); + dataGasMap.put("params", alarmConfigParam.getQueryContent()); + alarmConfigParam.setContent(dataGasMap); + alarmConfigParam.setLevel(1); + alarmConfigParam.setOperator("casic"); + try { + alarmConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 + CreateCommandResponse msgResponse = client.CreateCommand(request); + System.out.println(msgResponse); + client.shutdown(); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备报警下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(alarmConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } + } + + } \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/service/impl/AepCommandSend.java b/src/main/java/com/casic/service/impl/AepCommandSend.java index c91f3ad..aa96f68 100644 --- a/src/main/java/com/casic/service/impl/AepCommandSend.java +++ b/src/main/java/com/casic/service/impl/AepCommandSend.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.casic.config.AEPParamConfig; +import com.casic.config.DeviceGroup; import com.casic.model.AlarmConfigParam; import com.casic.model.BusConfigParam; import com.casic.model.DataGasConfigParam; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; @Component @Slf4j @@ -22,10 +24,7 @@ @Autowired private AEPParamConfig aepParamConfig; - public void sendStatusNb(List dataGasConfigList) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); + public void sendStatusNb(List dataGasConfigList) { Map dataGasMap = new HashMap<>(); Map queryMap = new HashMap<>(); queryMap.put("query", 1); @@ -34,64 +33,104 @@ dataGasConfigList.forEach( dataGasConfigParam -> { dataGasConfigParam.setLevel(1); - dataGasConfigParam.setContent(dataGasMap); - dataGasConfigParam.setOperator("casic"); + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(dataGasConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + try { + dataGasConfigParam.setContent(dataGasMap); + dataGasConfigParam.setOperator("casic"); + dataGasConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); + request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); + System.out.println(client.CreateCommand(request)); + client.shutdown(); + } catch (Exception ex) { + log.error("状态下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(dataGasConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return; + } + } else { + return; + } } ); - for (DataGasConfigParam dataGasConfigParam : dataGasConfigList) { - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); //具体格式见前面请求body说明 - System.out.println(client.CreateCommand(request)); - } - client.shutdown(); } - public String sendConfig(BusConfigParam busConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "config"); - dataGasMap.put("params", busConfigParam.getQueryContent()); - busConfigParam.setContent(dataGasMap); - busConfigParam.setLevel(1); - busConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendConfig(BusConfigParam busConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(busConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "config"); + dataGasMap.put("params", busConfigParam.getQueryContent()); + busConfigParam.setContent(dataGasMap); + busConfigParam.setLevel(1); + busConfigParam.setOperator("casic"); + try { + busConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); + CreateCommandResponse msgResponse = client.CreateCommand(request); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备命令下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(busConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } } - public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "alarmconfig"); - dataGasMap.put("params", alarmConfigParam.getQueryContent()); - alarmConfigParam.setContent(dataGasMap); - alarmConfigParam.setLevel(1); - alarmConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(alarmConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "alarmconfig"); + dataGasMap.put("params", alarmConfigParam.getQueryContent()); + alarmConfigParam.setContent(dataGasMap); + alarmConfigParam.setLevel(1); + alarmConfigParam.setOperator("casic"); + try { + alarmConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 + CreateCommandResponse msgResponse = client.CreateCommand(request); + System.out.println(msgResponse); + client.shutdown(); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备报警下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(alarmConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } + } + + } \ No newline at end of file diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java index 56c4c2f..5f279e4 100644 --- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java +++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java @@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import java.util.*; @@ -44,7 +43,6 @@ } else if (contentMap.containsKey("history")) { historyGasDataProvider(recvDataMap, contentMap); } - realTimeGasDataProvider(recvDataMap, contentMap); responseData.setCode(200); responseData.setMessage("保存成功"); } catch (Exception dex) { @@ -56,7 +54,7 @@ } private Boolean nbDeviceProvider(Map recvDataMap, Map contentMap) { - nbDeviceMapper.deleteDeviceByImei(String.valueOf(contentMap.get("imei"))); + nbDeviceMapper.deleteDeviceByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) .productId(String.valueOf(recvDataMap.get("productId"))) @@ -78,7 +76,7 @@ String deviceId = String.valueOf(recvDataMap.get("deviceId")); String productId = String.valueOf(recvDataMap.get("productId")); fisrtSaveDeviceAndSend(imei, productId, deviceId); - String devcode = nbDeviceMapper.getDevcodeByImei(imei); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId); LucencyGasData lucencyGasBuilder = LucencyGasData.builder() .tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId")))) .deviceId(String.valueOf(recvDataMap.get("deviceId"))) @@ -101,7 +99,7 @@ //历史数据暂不处理 private Boolean historyGasDataProvider(Map recvDataMap, Map contentMap) { List> historyDataList = (List>) JSONArray.parse(contentMap.get("history")); - String devcode = nbDeviceMapper.getDevcodeByImei(String.valueOf(recvDataMap.get("IMEI"))); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); String tenantId = String.valueOf(recvDataMap.get("tenantId")); String deviceId = String.valueOf(recvDataMap.get("deviceId")); String imei = String.valueOf(recvDataMap.get("IMEI")); @@ -114,10 +112,11 @@ } private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception { - Map deviceInfoMap = nbDeviceMapper.getDeviceByImei(imei); - if (ObjectUtils.isEmpty(deviceInfoMap)) { + String id = nbDeviceMapper.isDeviceId(deviceId); + if (StringUtils.isEmpty(id)) { NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) + .deviceId(deviceId) .productId(productId) .imei(imei).build(); nbDeviceMapper.insert(nbDevice); @@ -129,21 +128,17 @@ dataGasConfigList.add(dataGasConfigParam); aepCommandSend.sendStatusNb(dataGasConfigList); return false; - } else if (deviceInfoMap.containsKey("device_id") && StringUtils.isEmpty(deviceInfoMap.get("device_id"))) { - if (!StringUtils.isEmpty(deviceId)) { - nbDeviceMapper.setDeviceIdByImei(imei, deviceId); - } } return true; } private void configStatusDataProvider(Map recvDataMap, String status) { String deviceId = String.valueOf(recvDataMap.get("deviceId")); - String recentConf =nbDeviceMapper.getRecentByDevciceId(deviceId); + String recentConf = nbDeviceMapper.getRecentByDevciceId(deviceId); String configMsg = status.equals("1") ? "成功下发" : "下发失败(参数不在有效范围内)"; - if(recentConf.equals("1")){ + if (recentConf.equals("1")) { nbConfigMapper.configStatusData(configMsg, deviceId); - }else { + } else { nbAlarmConfigMapper.configStatusData(configMsg, deviceId); } diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/service/impl/AepCommandSend.java b/src/main/java/com/casic/service/impl/AepCommandSend.java index c91f3ad..aa96f68 100644 --- a/src/main/java/com/casic/service/impl/AepCommandSend.java +++ b/src/main/java/com/casic/service/impl/AepCommandSend.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.casic.config.AEPParamConfig; +import com.casic.config.DeviceGroup; import com.casic.model.AlarmConfigParam; import com.casic.model.BusConfigParam; import com.casic.model.DataGasConfigParam; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; @Component @Slf4j @@ -22,10 +24,7 @@ @Autowired private AEPParamConfig aepParamConfig; - public void sendStatusNb(List dataGasConfigList) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); + public void sendStatusNb(List dataGasConfigList) { Map dataGasMap = new HashMap<>(); Map queryMap = new HashMap<>(); queryMap.put("query", 1); @@ -34,64 +33,104 @@ dataGasConfigList.forEach( dataGasConfigParam -> { dataGasConfigParam.setLevel(1); - dataGasConfigParam.setContent(dataGasMap); - dataGasConfigParam.setOperator("casic"); + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(dataGasConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + try { + dataGasConfigParam.setContent(dataGasMap); + dataGasConfigParam.setOperator("casic"); + dataGasConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); + request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); + System.out.println(client.CreateCommand(request)); + client.shutdown(); + } catch (Exception ex) { + log.error("状态下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(dataGasConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return; + } + } else { + return; + } } ); - for (DataGasConfigParam dataGasConfigParam : dataGasConfigList) { - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); //具体格式见前面请求body说明 - System.out.println(client.CreateCommand(request)); - } - client.shutdown(); } - public String sendConfig(BusConfigParam busConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "config"); - dataGasMap.put("params", busConfigParam.getQueryContent()); - busConfigParam.setContent(dataGasMap); - busConfigParam.setLevel(1); - busConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendConfig(BusConfigParam busConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(busConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "config"); + dataGasMap.put("params", busConfigParam.getQueryContent()); + busConfigParam.setContent(dataGasMap); + busConfigParam.setLevel(1); + busConfigParam.setOperator("casic"); + try { + busConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); + CreateCommandResponse msgResponse = client.CreateCommand(request); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备命令下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(busConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } } - public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "alarmconfig"); - dataGasMap.put("params", alarmConfigParam.getQueryContent()); - alarmConfigParam.setContent(dataGasMap); - alarmConfigParam.setLevel(1); - alarmConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(alarmConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "alarmconfig"); + dataGasMap.put("params", alarmConfigParam.getQueryContent()); + alarmConfigParam.setContent(dataGasMap); + alarmConfigParam.setLevel(1); + alarmConfigParam.setOperator("casic"); + try { + alarmConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 + CreateCommandResponse msgResponse = client.CreateCommand(request); + System.out.println(msgResponse); + client.shutdown(); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备报警下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(alarmConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } + } + + } \ No newline at end of file diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java index 56c4c2f..5f279e4 100644 --- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java +++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java @@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import java.util.*; @@ -44,7 +43,6 @@ } else if (contentMap.containsKey("history")) { historyGasDataProvider(recvDataMap, contentMap); } - realTimeGasDataProvider(recvDataMap, contentMap); responseData.setCode(200); responseData.setMessage("保存成功"); } catch (Exception dex) { @@ -56,7 +54,7 @@ } private Boolean nbDeviceProvider(Map recvDataMap, Map contentMap) { - nbDeviceMapper.deleteDeviceByImei(String.valueOf(contentMap.get("imei"))); + nbDeviceMapper.deleteDeviceByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) .productId(String.valueOf(recvDataMap.get("productId"))) @@ -78,7 +76,7 @@ String deviceId = String.valueOf(recvDataMap.get("deviceId")); String productId = String.valueOf(recvDataMap.get("productId")); fisrtSaveDeviceAndSend(imei, productId, deviceId); - String devcode = nbDeviceMapper.getDevcodeByImei(imei); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId); LucencyGasData lucencyGasBuilder = LucencyGasData.builder() .tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId")))) .deviceId(String.valueOf(recvDataMap.get("deviceId"))) @@ -101,7 +99,7 @@ //历史数据暂不处理 private Boolean historyGasDataProvider(Map recvDataMap, Map contentMap) { List> historyDataList = (List>) JSONArray.parse(contentMap.get("history")); - String devcode = nbDeviceMapper.getDevcodeByImei(String.valueOf(recvDataMap.get("IMEI"))); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); String tenantId = String.valueOf(recvDataMap.get("tenantId")); String deviceId = String.valueOf(recvDataMap.get("deviceId")); String imei = String.valueOf(recvDataMap.get("IMEI")); @@ -114,10 +112,11 @@ } private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception { - Map deviceInfoMap = nbDeviceMapper.getDeviceByImei(imei); - if (ObjectUtils.isEmpty(deviceInfoMap)) { + String id = nbDeviceMapper.isDeviceId(deviceId); + if (StringUtils.isEmpty(id)) { NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) + .deviceId(deviceId) .productId(productId) .imei(imei).build(); nbDeviceMapper.insert(nbDevice); @@ -129,21 +128,17 @@ dataGasConfigList.add(dataGasConfigParam); aepCommandSend.sendStatusNb(dataGasConfigList); return false; - } else if (deviceInfoMap.containsKey("device_id") && StringUtils.isEmpty(deviceInfoMap.get("device_id"))) { - if (!StringUtils.isEmpty(deviceId)) { - nbDeviceMapper.setDeviceIdByImei(imei, deviceId); - } } return true; } private void configStatusDataProvider(Map recvDataMap, String status) { String deviceId = String.valueOf(recvDataMap.get("deviceId")); - String recentConf =nbDeviceMapper.getRecentByDevciceId(deviceId); + String recentConf = nbDeviceMapper.getRecentByDevciceId(deviceId); String configMsg = status.equals("1") ? "成功下发" : "下发失败(参数不在有效范围内)"; - if(recentConf.equals("1")){ + if (recentConf.equals("1")) { nbConfigMapper.configStatusData(configMsg, deviceId); - }else { + } else { nbAlarmConfigMapper.configStatusData(configMsg, deviceId); } diff --git a/src/main/java/com/casic/util/ExportExcelUtil.java b/src/main/java/com/casic/util/ExportExcelUtil.java index a993f14..a440d3b 100644 --- a/src/main/java/com/casic/util/ExportExcelUtil.java +++ b/src/main/java/com/casic/util/ExportExcelUtil.java @@ -12,7 +12,7 @@ import java.util.List; @Slf4j -public class ExportExcelUtil{ +public class ExportExcelUtil { protected void exportExcel(Class cls, List dataList, String sheetName) throws IOException { HttpServletResponse response = this.getHttpServletResponse(); diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/service/impl/AepCommandSend.java b/src/main/java/com/casic/service/impl/AepCommandSend.java index c91f3ad..aa96f68 100644 --- a/src/main/java/com/casic/service/impl/AepCommandSend.java +++ b/src/main/java/com/casic/service/impl/AepCommandSend.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.casic.config.AEPParamConfig; +import com.casic.config.DeviceGroup; import com.casic.model.AlarmConfigParam; import com.casic.model.BusConfigParam; import com.casic.model.DataGasConfigParam; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; @Component @Slf4j @@ -22,10 +24,7 @@ @Autowired private AEPParamConfig aepParamConfig; - public void sendStatusNb(List dataGasConfigList) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); + public void sendStatusNb(List dataGasConfigList) { Map dataGasMap = new HashMap<>(); Map queryMap = new HashMap<>(); queryMap.put("query", 1); @@ -34,64 +33,104 @@ dataGasConfigList.forEach( dataGasConfigParam -> { dataGasConfigParam.setLevel(1); - dataGasConfigParam.setContent(dataGasMap); - dataGasConfigParam.setOperator("casic"); + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(dataGasConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + try { + dataGasConfigParam.setContent(dataGasMap); + dataGasConfigParam.setOperator("casic"); + dataGasConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); + request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); + System.out.println(client.CreateCommand(request)); + client.shutdown(); + } catch (Exception ex) { + log.error("状态下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(dataGasConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return; + } + } else { + return; + } } ); - for (DataGasConfigParam dataGasConfigParam : dataGasConfigList) { - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); //具体格式见前面请求body说明 - System.out.println(client.CreateCommand(request)); - } - client.shutdown(); } - public String sendConfig(BusConfigParam busConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "config"); - dataGasMap.put("params", busConfigParam.getQueryContent()); - busConfigParam.setContent(dataGasMap); - busConfigParam.setLevel(1); - busConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendConfig(BusConfigParam busConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(busConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "config"); + dataGasMap.put("params", busConfigParam.getQueryContent()); + busConfigParam.setContent(dataGasMap); + busConfigParam.setLevel(1); + busConfigParam.setOperator("casic"); + try { + busConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); + CreateCommandResponse msgResponse = client.CreateCommand(request); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备命令下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(busConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } } - public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "alarmconfig"); - dataGasMap.put("params", alarmConfigParam.getQueryContent()); - alarmConfigParam.setContent(dataGasMap); - alarmConfigParam.setLevel(1); - alarmConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(alarmConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "alarmconfig"); + dataGasMap.put("params", alarmConfigParam.getQueryContent()); + alarmConfigParam.setContent(dataGasMap); + alarmConfigParam.setLevel(1); + alarmConfigParam.setOperator("casic"); + try { + alarmConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 + CreateCommandResponse msgResponse = client.CreateCommand(request); + System.out.println(msgResponse); + client.shutdown(); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备报警下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(alarmConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } + } + + } \ No newline at end of file diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java index 56c4c2f..5f279e4 100644 --- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java +++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java @@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import java.util.*; @@ -44,7 +43,6 @@ } else if (contentMap.containsKey("history")) { historyGasDataProvider(recvDataMap, contentMap); } - realTimeGasDataProvider(recvDataMap, contentMap); responseData.setCode(200); responseData.setMessage("保存成功"); } catch (Exception dex) { @@ -56,7 +54,7 @@ } private Boolean nbDeviceProvider(Map recvDataMap, Map contentMap) { - nbDeviceMapper.deleteDeviceByImei(String.valueOf(contentMap.get("imei"))); + nbDeviceMapper.deleteDeviceByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) .productId(String.valueOf(recvDataMap.get("productId"))) @@ -78,7 +76,7 @@ String deviceId = String.valueOf(recvDataMap.get("deviceId")); String productId = String.valueOf(recvDataMap.get("productId")); fisrtSaveDeviceAndSend(imei, productId, deviceId); - String devcode = nbDeviceMapper.getDevcodeByImei(imei); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId); LucencyGasData lucencyGasBuilder = LucencyGasData.builder() .tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId")))) .deviceId(String.valueOf(recvDataMap.get("deviceId"))) @@ -101,7 +99,7 @@ //历史数据暂不处理 private Boolean historyGasDataProvider(Map recvDataMap, Map contentMap) { List> historyDataList = (List>) JSONArray.parse(contentMap.get("history")); - String devcode = nbDeviceMapper.getDevcodeByImei(String.valueOf(recvDataMap.get("IMEI"))); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); String tenantId = String.valueOf(recvDataMap.get("tenantId")); String deviceId = String.valueOf(recvDataMap.get("deviceId")); String imei = String.valueOf(recvDataMap.get("IMEI")); @@ -114,10 +112,11 @@ } private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception { - Map deviceInfoMap = nbDeviceMapper.getDeviceByImei(imei); - if (ObjectUtils.isEmpty(deviceInfoMap)) { + String id = nbDeviceMapper.isDeviceId(deviceId); + if (StringUtils.isEmpty(id)) { NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) + .deviceId(deviceId) .productId(productId) .imei(imei).build(); nbDeviceMapper.insert(nbDevice); @@ -129,21 +128,17 @@ dataGasConfigList.add(dataGasConfigParam); aepCommandSend.sendStatusNb(dataGasConfigList); return false; - } else if (deviceInfoMap.containsKey("device_id") && StringUtils.isEmpty(deviceInfoMap.get("device_id"))) { - if (!StringUtils.isEmpty(deviceId)) { - nbDeviceMapper.setDeviceIdByImei(imei, deviceId); - } } return true; } private void configStatusDataProvider(Map recvDataMap, String status) { String deviceId = String.valueOf(recvDataMap.get("deviceId")); - String recentConf =nbDeviceMapper.getRecentByDevciceId(deviceId); + String recentConf = nbDeviceMapper.getRecentByDevciceId(deviceId); String configMsg = status.equals("1") ? "成功下发" : "下发失败(参数不在有效范围内)"; - if(recentConf.equals("1")){ + if (recentConf.equals("1")) { nbConfigMapper.configStatusData(configMsg, deviceId); - }else { + } else { nbAlarmConfigMapper.configStatusData(configMsg, deviceId); } diff --git a/src/main/java/com/casic/util/ExportExcelUtil.java b/src/main/java/com/casic/util/ExportExcelUtil.java index a993f14..a440d3b 100644 --- a/src/main/java/com/casic/util/ExportExcelUtil.java +++ b/src/main/java/com/casic/util/ExportExcelUtil.java @@ -12,7 +12,7 @@ import java.util.List; @Slf4j -public class ExportExcelUtil{ +public class ExportExcelUtil { protected void exportExcel(Class cls, List dataList, String sheetName) throws IOException { HttpServletResponse response = this.getHttpServletResponse(); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d973b77..17b687c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -9,7 +9,7 @@ password: Casic203! 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/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/AEPParamConfig.java b/src/main/java/com/casic/config/AEPParamConfig.java index 349d4b2..68696df 100644 --- a/src/main/java/com/casic/config/AEPParamConfig.java +++ b/src/main/java/com/casic/config/AEPParamConfig.java @@ -2,20 +2,20 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.List; + @Configuration +@ConfigurationProperties(prefix = "nb") @Data public class AEPParamConfig { - - @Value("${nb.app.key}") - private String appKey; - @Value("${nb.app.secret}") - private String appSecret; - @Value("${nb.gas.url}") private String aepUrl; - @Value("${nb.gas.product-id}") - private String productId; - @Value("${nb.gas.MasterKey}") - private String masterKey; + private List deviceGroups; + } + + + + diff --git a/src/main/java/com/casic/config/DeviceGroup.java b/src/main/java/com/casic/config/DeviceGroup.java new file mode 100644 index 0000000..8a8a3f6 --- /dev/null +++ b/src/main/java/com/casic/config/DeviceGroup.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * @author cz + */ +@Data +@Configuration +public class DeviceGroup { + private String productId; + private String masterKey; + private String aepSecret; + private String aepKey; + private Integer ttl; +} \ No newline at end of file diff --git a/src/main/java/com/casic/config/MybatisPlusConfig.java b/src/main/java/com/casic/config/MybatisPlusConfig.java index 58fd3b1..76e1f66 100644 --- a/src/main/java/com/casic/config/MybatisPlusConfig.java +++ b/src/main/java/com/casic/config/MybatisPlusConfig.java @@ -14,5 +14,6 @@ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } + } diff --git a/src/main/java/com/casic/controller/DataRecvController.java b/src/main/java/com/casic/controller/DataRecvController.java index 3655480..faaf929 100644 --- a/src/main/java/com/casic/controller/DataRecvController.java +++ b/src/main/java/com/casic/controller/DataRecvController.java @@ -28,4 +28,5 @@ log.error("--------" + JSONObject.toJSONString(recvDataMap)); return gasDataRecvService.saveRev(recvDataMap); } + //869662035288767 312022090709 } diff --git a/src/main/java/com/casic/dao/NbDeviceMapper.java b/src/main/java/com/casic/dao/NbDeviceMapper.java index 7d33eb3..6df6a0a 100644 --- a/src/main/java/com/casic/dao/NbDeviceMapper.java +++ b/src/main/java/com/casic/dao/NbDeviceMapper.java @@ -14,17 +14,17 @@ @Select("delete " + "from nb_device " + - "where imei=#{imei} ") - Integer deleteDeviceByImei(@Param("imei") String imei); + "where device_id=#{deviceId} ") + Integer deleteDeviceByDeviceId(@Param("deviceId") String deviceId); - @Select("select id,device_id " + + @Select("select id,device_id " + "from nb_device " + "where imei=#{imei} ") - Map getDeviceByImei(@Param("imei") String imei); + Map getDeviceByImei(@Param("imei") String imei); - @Update("update nb_device " + - "device_id=#{deviceId} " + - "where imei=#{imei} ") + @Update("update nb_device " + + "set device_id = #{deviceId} " + + "where imei =#{imei} ") Integer setDeviceIdByImei(@Param("imei") String imei, @Param("deviceId") String deviceId); @Select("select devcode " + @@ -32,14 +32,26 @@ "where imei=#{imei} ") String getDevcodeByImei(@Param("imei") String imei); + @Select("select devcode " + + "from nb_device " + + "where device_id=#{deviceId} " + + " limit 1 ") + String getDevcodeByDeviceId(@Param("deviceId") String deviceId); + + + @Select("select id " + + "from nb_device " + + "where device_id=#{deviceId}" + + " limit 1 ") + String isDeviceId(@Param("deviceId") String deviceId); @Update("update nb_device " + "set recent_conf=#{recentConf} " + "where device_id=#{deviceId} ") - Integer updateRecentByDevciceId (@Param("deviceId") String deviceId,@Param("recentConf") String recentConf); + Integer updateRecentByDevciceId(@Param("deviceId") String deviceId, @Param("recentConf") String recentConf); @Select("select recent_conf " + "from nb_device " + "where device_id=#{deviceId} ") - String getRecentByDevciceId (@Param("deviceId") String deviceId); + String getRecentByDevciceId(@Param("deviceId") String deviceId); } diff --git a/src/main/java/com/casic/model/AlarmConfigParam.java b/src/main/java/com/casic/model/AlarmConfigParam.java index dced69a..a1cc4db 100644 --- a/src/main/java/com/casic/model/AlarmConfigParam.java +++ b/src/main/java/com/casic/model/AlarmConfigParam.java @@ -25,4 +25,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/model/BusConfigParam.java b/src/main/java/com/casic/model/BusConfigParam.java index 44004b5..6df57b5 100644 --- a/src/main/java/com/casic/model/BusConfigParam.java +++ b/src/main/java/com/casic/model/BusConfigParam.java @@ -27,4 +27,6 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + @ApiModelProperty(notes = "设备组", dataType = "String") + private Integer ttl; } diff --git a/src/main/java/com/casic/model/DataGasConfigParam.java b/src/main/java/com/casic/model/DataGasConfigParam.java index 4e71c77..3d06d90 100644 --- a/src/main/java/com/casic/model/DataGasConfigParam.java +++ b/src/main/java/com/casic/model/DataGasConfigParam.java @@ -21,4 +21,5 @@ private Map content; @ApiModelProperty(notes = "设备组", dataType = "String") private String deviceGroupId; + private Integer ttl; } diff --git a/src/main/java/com/casic/service/impl/AepCommandSend.java b/src/main/java/com/casic/service/impl/AepCommandSend.java index c91f3ad..aa96f68 100644 --- a/src/main/java/com/casic/service/impl/AepCommandSend.java +++ b/src/main/java/com/casic/service/impl/AepCommandSend.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.casic.config.AEPParamConfig; +import com.casic.config.DeviceGroup; import com.casic.model.AlarmConfigParam; import com.casic.model.BusConfigParam; import com.casic.model.DataGasConfigParam; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; @Component @Slf4j @@ -22,10 +24,7 @@ @Autowired private AEPParamConfig aepParamConfig; - public void sendStatusNb(List dataGasConfigList) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); + public void sendStatusNb(List dataGasConfigList) { Map dataGasMap = new HashMap<>(); Map queryMap = new HashMap<>(); queryMap.put("query", 1); @@ -34,64 +33,104 @@ dataGasConfigList.forEach( dataGasConfigParam -> { dataGasConfigParam.setLevel(1); - dataGasConfigParam.setContent(dataGasMap); - dataGasConfigParam.setOperator("casic"); + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(dataGasConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + try { + dataGasConfigParam.setContent(dataGasMap); + dataGasConfigParam.setOperator("casic"); + dataGasConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); + request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); + System.out.println(client.CreateCommand(request)); + client.shutdown(); + } catch (Exception ex) { + log.error("状态下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(dataGasConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return; + } + } else { + return; + } } ); - for (DataGasConfigParam dataGasConfigParam : dataGasConfigList) { - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(dataGasConfigParam).getBytes()); //具体格式见前面请求body说明 - System.out.println(client.CreateCommand(request)); - } - client.shutdown(); } - public String sendConfig(BusConfigParam busConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "config"); - dataGasMap.put("params", busConfigParam.getQueryContent()); - busConfigParam.setContent(dataGasMap); - busConfigParam.setLevel(1); - busConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendConfig(BusConfigParam busConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(busConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "config"); + dataGasMap.put("params", busConfigParam.getQueryContent()); + busConfigParam.setContent(dataGasMap); + busConfigParam.setLevel(1); + busConfigParam.setOperator("casic"); + try { + busConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(busConfigParam).getBytes()); + CreateCommandResponse msgResponse = client.CreateCommand(request); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备命令下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(busConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } } - public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) throws Exception { - AepDeviceCommandClient client = AepDeviceCommandClient.newClient() - .appKey(aepParamConfig.getAppKey()).appSecret(aepParamConfig.getAppSecret()) - .build(); - Map dataGasMap = new HashMap<>(); - dataGasMap.put("serviceIdentifier", "alarmconfig"); - dataGasMap.put("params", alarmConfigParam.getQueryContent()); - alarmConfigParam.setContent(dataGasMap); - alarmConfigParam.setLevel(1); - alarmConfigParam.setOperator("casic"); - CreateCommandRequest request = new CreateCommandRequest(); - request.setParamMasterKey(aepParamConfig.getMasterKey()); // single value - request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 - CreateCommandResponse msgResponse = client.CreateCommand(request); - System.out.println(msgResponse); - client.shutdown(); - log.debug("-----" + msgResponse.getMessage()); - if (msgResponse.getStatusCode()==200) { - return "未下发"; + public String sendAlarmConfig(AlarmConfigParam alarmConfigParam) { + Optional deviceGroups = aepParamConfig.getDeviceGroups().stream() + .filter(deviceGroup -> deviceGroup.getProductId().equals(alarmConfigParam.getProductId())).findFirst(); + if (deviceGroups.isPresent()) { + DeviceGroup deviceGroup = deviceGroups.get(); + AepDeviceCommandClient client = AepDeviceCommandClient.newClient() + .appKey(deviceGroup.getAepKey()).appSecret(deviceGroup.getAepSecret()) + .build(); + Map dataGasMap = new HashMap<>(); + dataGasMap.put("serviceIdentifier", "alarmconfig"); + dataGasMap.put("params", alarmConfigParam.getQueryContent()); + alarmConfigParam.setContent(dataGasMap); + alarmConfigParam.setLevel(1); + alarmConfigParam.setOperator("casic"); + try { + alarmConfigParam.setTtl(deviceGroup.getTtl()); + CreateCommandRequest request = new CreateCommandRequest(); + request.setParamMasterKey(deviceGroup.getMasterKey()); // single value + request.setBody(JSONObject.toJSONString(alarmConfigParam).getBytes()); //具体格式见前面请求body说明 + CreateCommandResponse msgResponse = client.CreateCommand(request); + System.out.println(msgResponse); + client.shutdown(); + log.debug("-----" + msgResponse.getMessage()); + return msgResponse.getStatusCode() == 200 ? "未下发" : "下发异常"; + } catch (Exception ex) { + log.error("设备报警下发配置异常，下发配置内容{},aepKey{}，aepScret{},异常信息{}", + JSONObject.toJSONString(alarmConfigParam), deviceGroup.getAepKey(), deviceGroup.getAepSecret()); + return "下发异常"; + } finally { + client.shutdown(); + } } else { return "下发异常"; } + } + + } \ No newline at end of file diff --git a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java index 56c4c2f..5f279e4 100644 --- a/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java +++ b/src/main/java/com/casic/service/impl/GasDataRecvServiceImpl.java @@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import java.util.*; @@ -44,7 +43,6 @@ } else if (contentMap.containsKey("history")) { historyGasDataProvider(recvDataMap, contentMap); } - realTimeGasDataProvider(recvDataMap, contentMap); responseData.setCode(200); responseData.setMessage("保存成功"); } catch (Exception dex) { @@ -56,7 +54,7 @@ } private Boolean nbDeviceProvider(Map recvDataMap, Map contentMap) { - nbDeviceMapper.deleteDeviceByImei(String.valueOf(contentMap.get("imei"))); + nbDeviceMapper.deleteDeviceByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) .productId(String.valueOf(recvDataMap.get("productId"))) @@ -78,7 +76,7 @@ String deviceId = String.valueOf(recvDataMap.get("deviceId")); String productId = String.valueOf(recvDataMap.get("productId")); fisrtSaveDeviceAndSend(imei, productId, deviceId); - String devcode = nbDeviceMapper.getDevcodeByImei(imei); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(deviceId); LucencyGasData lucencyGasBuilder = LucencyGasData.builder() .tenantId(Long.valueOf(String.valueOf(recvDataMap.get("tenantId")))) .deviceId(String.valueOf(recvDataMap.get("deviceId"))) @@ -101,7 +99,7 @@ //历史数据暂不处理 private Boolean historyGasDataProvider(Map recvDataMap, Map contentMap) { List> historyDataList = (List>) JSONArray.parse(contentMap.get("history")); - String devcode = nbDeviceMapper.getDevcodeByImei(String.valueOf(recvDataMap.get("IMEI"))); + String devcode = nbDeviceMapper.getDevcodeByDeviceId(String.valueOf(recvDataMap.get("deviceId"))); String tenantId = String.valueOf(recvDataMap.get("tenantId")); String deviceId = String.valueOf(recvDataMap.get("deviceId")); String imei = String.valueOf(recvDataMap.get("IMEI")); @@ -114,10 +112,11 @@ } private Boolean fisrtSaveDeviceAndSend(String imei, String productId, String deviceId) throws Exception { - Map deviceInfoMap = nbDeviceMapper.getDeviceByImei(imei); - if (ObjectUtils.isEmpty(deviceInfoMap)) { + String id = nbDeviceMapper.isDeviceId(deviceId); + if (StringUtils.isEmpty(id)) { NbDevice nbDevice = NbDevice.builder() .logtime(new Date()) + .deviceId(deviceId) .productId(productId) .imei(imei).build(); nbDeviceMapper.insert(nbDevice); @@ -129,21 +128,17 @@ dataGasConfigList.add(dataGasConfigParam); aepCommandSend.sendStatusNb(dataGasConfigList); return false; - } else if (deviceInfoMap.containsKey("device_id") && StringUtils.isEmpty(deviceInfoMap.get("device_id"))) { - if (!StringUtils.isEmpty(deviceId)) { - nbDeviceMapper.setDeviceIdByImei(imei, deviceId); - } } return true; } private void configStatusDataProvider(Map recvDataMap, String status) { String deviceId = String.valueOf(recvDataMap.get("deviceId")); - String recentConf =nbDeviceMapper.getRecentByDevciceId(deviceId); + String recentConf = nbDeviceMapper.getRecentByDevciceId(deviceId); String configMsg = status.equals("1") ? "成功下发" : "下发失败(参数不在有效范围内)"; - if(recentConf.equals("1")){ + if (recentConf.equals("1")) { nbConfigMapper.configStatusData(configMsg, deviceId); - }else { + } else { nbAlarmConfigMapper.configStatusData(configMsg, deviceId); } diff --git a/src/main/java/com/casic/util/ExportExcelUtil.java b/src/main/java/com/casic/util/ExportExcelUtil.java index a993f14..a440d3b 100644 --- a/src/main/java/com/casic/util/ExportExcelUtil.java +++ b/src/main/java/com/casic/util/ExportExcelUtil.java @@ -12,7 +12,7 @@ import java.util.List; @Slf4j -public class ExportExcelUtil{ +public class ExportExcelUtil { protected void exportExcel(Class cls, List dataList, String sheetName) throws IOException { HttpServletResponse response = this.getHttpServletResponse(); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d973b77..17b687c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -9,7 +9,7 @@ password: Casic203! 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 4d42b21..cb200d7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,10 +17,21 @@ enable: true groupName: "批产演示" nb: - gas: - url: ag-api.ctwing.cn/aep_device_command/command - product-id: 15432101 - MasterKey: 46eb5fd9f7364b9abe41b26e369149f3 - app: - key: ke4zM3hld29 - secret: 35ykNutA1t + aep-url: + ag-api.ctwing.cn/aep_device_command/command + device-groups: + - product-id: 15479098 + MasterKey: cfb695a6ede049f28063aa8d40bad01a + ttl: 86400 + aep-key: SJRVantB7j6 + aep-secret: svpyFLm1JD + - product-id: 15475976 + MasterKey: be9d6a5240fa42869db51682ef6f33c8 + ttl: 86400 + aep-key: YQTX3kLIdJ4 + aep-secret: FN0n9BLyb2 + - product-id: 15432101 + MasterKey: 46eb5fd9f7364b9abe41b26e369149f3 + ttl: 86400 + aep-key: YQTX3kLIdJ4 + aep-secret: FN0n9BLyb2 \ No newline at end of file