diff --git a/src/main/java/com/casic/common/CasicFrameBuildFactory.java b/src/main/java/com/casic/common/CasicFrameBuildFactory.java index 379648a..9b3c884 100644 --- a/src/main/java/com/casic/common/CasicFrameBuildFactory.java +++ b/src/main/java/com/casic/common/CasicFrameBuildFactory.java @@ -98,7 +98,8 @@ return new InfoFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new InfoFrameBRS(); } } @@ -114,7 +115,8 @@ return new DataFrameHTTP(); default: - return null; + // 默认与百瑞生一样的协议 + return new DataFrameBRS(); } } @@ -133,7 +135,8 @@ return new MethaneDataFrameHSYD(); default: - return null; + // 默认与百瑞生协议一样 + return new MethaneDataFrameBRS(); } } @@ -143,7 +146,8 @@ return new DataFrameNCX(); default: - return null; + // 默认按诺成新的协议执行 + return new DataFrameNCX(); } } @@ -156,7 +160,8 @@ return new EventFrameMHK(); default: - return null; + // 默认按百瑞生协议执行 + return new EventFrameBRS(); } } @@ -169,7 +174,8 @@ return new MethaneEventFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new MethaneEventFrameBRS(); } } @@ -179,7 +185,8 @@ return new EventFrameNCX(); default: - return null; + // 默认执行诺成新的协议 + return new EventFrameNCX(); } } } diff --git a/src/main/java/com/casic/common/CasicFrameBuildFactory.java b/src/main/java/com/casic/common/CasicFrameBuildFactory.java index 379648a..9b3c884 100644 --- a/src/main/java/com/casic/common/CasicFrameBuildFactory.java +++ b/src/main/java/com/casic/common/CasicFrameBuildFactory.java @@ -98,7 +98,8 @@ return new InfoFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new InfoFrameBRS(); } } @@ -114,7 +115,8 @@ return new DataFrameHTTP(); default: - return null; + // 默认与百瑞生一样的协议 + return new DataFrameBRS(); } } @@ -133,7 +135,8 @@ return new MethaneDataFrameHSYD(); default: - return null; + // 默认与百瑞生协议一样 + return new MethaneDataFrameBRS(); } } @@ -143,7 +146,8 @@ return new DataFrameNCX(); default: - return null; + // 默认按诺成新的协议执行 + return new DataFrameNCX(); } } @@ -156,7 +160,8 @@ return new EventFrameMHK(); default: - return null; + // 默认按百瑞生协议执行 + return new EventFrameBRS(); } } @@ -169,7 +174,8 @@ return new MethaneEventFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new MethaneEventFrameBRS(); } } @@ -179,7 +185,8 @@ return new EventFrameNCX(); default: - return null; + // 默认执行诺成新的协议 + return new EventFrameNCX(); } } } diff --git a/src/main/java/com/casic/methane/controller/MethaneDataController.java b/src/main/java/com/casic/methane/controller/MethaneDataController.java index c83533a..081734f 100644 --- a/src/main/java/com/casic/methane/controller/MethaneDataController.java +++ b/src/main/java/com/casic/methane/controller/MethaneDataController.java @@ -107,6 +107,8 @@ log.error("向设备下发参数配置异常:[message={}], {}", ex.getMessage(), configCmdStr); busConfigService.updateConfigState(device.getId(), "2"); } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } } } diff --git a/src/main/java/com/casic/common/CasicFrameBuildFactory.java b/src/main/java/com/casic/common/CasicFrameBuildFactory.java index 379648a..9b3c884 100644 --- a/src/main/java/com/casic/common/CasicFrameBuildFactory.java +++ b/src/main/java/com/casic/common/CasicFrameBuildFactory.java @@ -98,7 +98,8 @@ return new InfoFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new InfoFrameBRS(); } } @@ -114,7 +115,8 @@ return new DataFrameHTTP(); default: - return null; + // 默认与百瑞生一样的协议 + return new DataFrameBRS(); } } @@ -133,7 +135,8 @@ return new MethaneDataFrameHSYD(); default: - return null; + // 默认与百瑞生协议一样 + return new MethaneDataFrameBRS(); } } @@ -143,7 +146,8 @@ return new DataFrameNCX(); default: - return null; + // 默认按诺成新的协议执行 + return new DataFrameNCX(); } } @@ -156,7 +160,8 @@ return new EventFrameMHK(); default: - return null; + // 默认按百瑞生协议执行 + return new EventFrameBRS(); } } @@ -169,7 +174,8 @@ return new MethaneEventFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new MethaneEventFrameBRS(); } } @@ -179,7 +185,8 @@ return new EventFrameNCX(); default: - return null; + // 默认执行诺成新的协议 + return new EventFrameNCX(); } } } diff --git a/src/main/java/com/casic/methane/controller/MethaneDataController.java b/src/main/java/com/casic/methane/controller/MethaneDataController.java index c83533a..081734f 100644 --- a/src/main/java/com/casic/methane/controller/MethaneDataController.java +++ b/src/main/java/com/casic/methane/controller/MethaneDataController.java @@ -107,6 +107,8 @@ log.error("向设备下发参数配置异常:[message={}], {}", ex.getMessage(), configCmdStr); busConfigService.updateConfigState(device.getId(), "2"); } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } } } diff --git a/src/main/java/com/casic/senitnel/controller/SentinelDataController.java b/src/main/java/com/casic/senitnel/controller/SentinelDataController.java index 4f10a5f..01c1090 100644 --- a/src/main/java/com/casic/senitnel/controller/SentinelDataController.java +++ b/src/main/java/com/casic/senitnel/controller/SentinelDataController.java @@ -116,6 +116,8 @@ log.error("向设备下发参数配置异常:[message={}], {}", ex.getMessage(), configCmdStr); busConfigService.updateConfigState(device.getId(), "2"); } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } } } diff --git a/src/main/java/com/casic/common/CasicFrameBuildFactory.java b/src/main/java/com/casic/common/CasicFrameBuildFactory.java index 379648a..9b3c884 100644 --- a/src/main/java/com/casic/common/CasicFrameBuildFactory.java +++ b/src/main/java/com/casic/common/CasicFrameBuildFactory.java @@ -98,7 +98,8 @@ return new InfoFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new InfoFrameBRS(); } } @@ -114,7 +115,8 @@ return new DataFrameHTTP(); default: - return null; + // 默认与百瑞生一样的协议 + return new DataFrameBRS(); } } @@ -133,7 +135,8 @@ return new MethaneDataFrameHSYD(); default: - return null; + // 默认与百瑞生协议一样 + return new MethaneDataFrameBRS(); } } @@ -143,7 +146,8 @@ return new DataFrameNCX(); default: - return null; + // 默认按诺成新的协议执行 + return new DataFrameNCX(); } } @@ -156,7 +160,8 @@ return new EventFrameMHK(); default: - return null; + // 默认按百瑞生协议执行 + return new EventFrameBRS(); } } @@ -169,7 +174,8 @@ return new MethaneEventFrameHSYD(); default: - return null; + // 默认与百瑞生一样 + return new MethaneEventFrameBRS(); } } @@ -179,7 +185,8 @@ return new EventFrameNCX(); default: - return null; + // 默认执行诺成新的协议 + return new EventFrameNCX(); } } } diff --git a/src/main/java/com/casic/methane/controller/MethaneDataController.java b/src/main/java/com/casic/methane/controller/MethaneDataController.java index c83533a..081734f 100644 --- a/src/main/java/com/casic/methane/controller/MethaneDataController.java +++ b/src/main/java/com/casic/methane/controller/MethaneDataController.java @@ -107,6 +107,8 @@ log.error("向设备下发参数配置异常:[message={}], {}", ex.getMessage(), configCmdStr); busConfigService.updateConfigState(device.getId(), "2"); } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } } } diff --git a/src/main/java/com/casic/senitnel/controller/SentinelDataController.java b/src/main/java/com/casic/senitnel/controller/SentinelDataController.java index 4f10a5f..01c1090 100644 --- a/src/main/java/com/casic/senitnel/controller/SentinelDataController.java +++ b/src/main/java/com/casic/senitnel/controller/SentinelDataController.java @@ -116,6 +116,8 @@ log.error("向设备下发参数配置异常:[message={}], {}", ex.getMessage(), configCmdStr); busConfigService.updateConfigState(device.getId(), "2"); } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } } } diff --git a/src/main/java/com/casic/tube/controller/TubeDataController.java b/src/main/java/com/casic/tube/controller/TubeDataController.java index f1eb4e5..6421854 100644 --- a/src/main/java/com/casic/tube/controller/TubeDataController.java +++ b/src/main/java/com/casic/tube/controller/TubeDataController.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.casic.common.CasicFrame; -import com.casic.common.general.ConfigFrame; import com.casic.common.general.ConfigResponseFrame; import com.casic.dao.model.BusConfig; import com.casic.dao.model.BusDevice; @@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.Base64; import java.util.Map; @@ -110,6 +107,8 @@ busConfigService.updateConfigState(device.getId(), "2"); } } + } else { + log.debug("[{}]没有需要下发的配置", devCode); } }