Browse Source

印尼-巡视设备状态统计接口,巡检结果列表接⼝bug修改

master
王寅 8 months ago
parent
commit
252d2a8ab2
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java
  2. +2
    -2
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
  3. +2
    -2
      inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java

+ 2
- 2
inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java View File

@ -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();


+ 2
- 2
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml View File

@ -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
<where>
<if test="startTime != null ">and pr.time &gt;= #{startTime}</if>
<if test="endTime != null ">and pr.time &lt;= #{endTime}</if>
<if test="startTime != null ">and pr.time &gt;= CONCAT(#{startTime}, ' 00:00:00')</if>
<if test="endTime != null ">and pr.time &lt;= CONCAT(#{endTime}, ' 23:59:59')</if>
<if test="deviceId != null ">and pr.device_id = #{deviceId}</if>
<if test="taskPatrolledId != null ">and pr.task_patrolled_id = #{taskPatrolledId}</if>
<if test="componentId != null ">and bd.device_id = #{componentId}</if>


+ 2
- 2
inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java View File

@ -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);
}
}
}


Loading…
Cancel
Save