diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index edf2031..ae777cc 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -233,7 +233,7 @@ public class IvsCommonService { conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Accept-Charset", "utf-8"); conn.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); - conn.setRequestProperty("Cookie", Cookie); + conn.setRequestProperty("Cookie", "JSESSIONID=" + Cookie); conn.setDoOutput(true); conn.setDoInput(true); conn.connect(); @@ -298,7 +298,7 @@ public class IvsCommonService { connection.setRequestProperty("accept", "*/*"); connection.setRequestProperty("connection", "Keep-Alive"); connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - connection.setRequestProperty("Cookie", Cookie); + connection.setRequestProperty("Cookie", "JSESSIONID=" + Cookie); //添加自定义请求头 // 设置请求头 connection.connect(); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index a7a101c..e399633 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -1012,8 +1012,8 @@ LEFT JOIN basedata_patrolpoint bp ON pr.device_id = bp.patrol_point_id LEFT JOIN basedata_device bd ON bp.device_id = bd.device_id - and pr.time >= #{startTime} - and pr.time <= #{endTime} + and pr.time >= CONCAT(#{startTime}, ' 00:00:00') + and pr.time <= CONCAT(#{endTime}, ' 23:59:59') and pr.device_id = #{deviceId} and pr.task_patrolled_id = #{taskPatrolledId} and bd.device_id = #{componentId} diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java index fa05c8b..3bb9854 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java @@ -139,9 +139,9 @@ public class BasedataEqpBookChannelController extends BaseController { } if(channel.getChannelType().equals("ir")){ if(channel.getOnlineState().equals("1")){ - ir.setNormalCount(vl.getNormalCount() + 1); + ir.setNormalCount(ir.getNormalCount() + 1); } else { - ir.setAnomalyCount(vl.getAnomalyCount() + 1); + ir.setAnomalyCount(ir.getAnomalyCount() + 1); } } }