海康门禁sdk对接

src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java

@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="DangerousEngineeringRecord实体类",description="DangerousEngineeringRecord")
 public class DangerousEngineeringRecord implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -130,7 +130,7 @@ public class DangerousEngineeringRecord implements Serializable {
     @ApiModelProperty(value="类别描述列表")
 	private List<DangerousEngineeringChooseTypeDescribe> typeDescribeList;
 
-    @TableField(exist = false)
+	@TableField(exist = false)
-    @ApiModelProperty(value="管控要点明细ID列表")
+	@ApiModelProperty(value = "管控要点明细ID列表")
-    private List<Integer> controlItemList;
+	private List<Long> controlItemList;
 }

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolHistoryMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.zhgd.xmgl.modules.rt.mapper.RtToolHistoryMapper">
     <select id="countRtTool" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo">
         select count(*) count,
-        ifnull(sum(if(entry_time >= current_date, 1, 0)), 0) entryCountToday,
+        ifnull(sum(if(tool_status = 1 and entry_time >= current_date, 1, 0)), 0) entryCountToday,
-        ifnull(sum(if(exit_time >= current_date, 1, 0)), 0) exitCountToday
+        ifnull(sum(if(tool_status = 2 and exit_time >= current_date, 1, 0)), 0) exitCountToday
         from rt_tool_history
         where project_sn = #{projectSn}
     </select>
@@ -15,7 +15,7 @@
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and entry_time >= date_sub(current_date,interval 8 day)
+            and entry_time >= date_sub(current_date,interval 8 day) and tool_status = 1
             group by day
         </if>
         )t1 left join (
@@ -23,7 +23,7 @@
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and exit_time >= date_sub(current_date,interval 8 day)
+            and exit_time >= date_sub(current_date,interval 8 day) and tool_status = 2
             group by day
         </if>
         )t2 on t1.day=t2.day
@@ -33,7 +33,7 @@
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and entry_time >= date_sub(current_date,interval 8 day)
+            and entry_time >= date_sub(current_date,interval 8 day) and tool_status = 1
             group by day
         </if>
         )t1 right join (
@@ -41,7 +41,7 @@
         from rt_tool_history
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and exit_time >= date_sub(current_date,interval 8 day)
+            and exit_time >= date_sub(current_date,interval 8 day) and tool_status = 2
             group by day
         </if>
         )t2 on t1.day=t2.day

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml

@@ -4,8 +4,8 @@
     <select id="countRtTool" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo">
         select count(*) count,
         ifnull(sum(if(tool_status=1,1,0)),0) presentCountToday,
-        ifnull(sum(if( entry_time>=current_date,1,0)),0) entryCountToday,
+        ifnull(sum(if(tool_status = 1 and entry_time>=current_date,1,0)),0) entryCountToday,
-        ifnull(sum(if( exit_time>=current_date,1,0)),0) exitCountToday
+        ifnull(sum(if(tool_status = 2 and exit_time>=current_date,1,0)),0) exitCountToday
         from rt_tool
         where project_sn=#{projectSn}
     </select>
@@ -16,7 +16,7 @@
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and entry_time >= date_sub(current_date,interval 8 day)
+            and entry_time >= date_sub(current_date,interval 8 day) and tool_status = 1
             group by day
         </if>
         )t1 left join (
@@ -24,7 +24,7 @@
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and exit_time >= date_sub(current_date,interval 8 day)
+            and exit_time >= date_sub(current_date,interval 8 day) and tool_status = 2
             group by day
         </if>
         )t2 on t1.day=t2.day
@@ -34,7 +34,7 @@
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and entry_time >= date_sub(current_date,interval 8 day)
+            and entry_time >= date_sub(current_date,interval 8 day) and tool_status = 1
             group by day
         </if>
         )t1 right join (
@@ -42,7 +42,7 @@
         from rt_tool
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
-            and exit_time >= date_sub(current_date,interval 8 day)
+            and exit_time >= date_sub(current_date,interval 8 day) and tool_status = 2
             group by day
         </if>
         )t2 on t1.day=t2.day