--增加感知事件统计查询增加审核状态字段

--增加审核状态详情增加审核人、审核时间、审核状态显示
--增加审核按钮操作
--增加审核人、审核时间和审核状态的导出展示

zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java

@@ -227,6 +227,14 @@ public class DCPerceivedEventsWarningController extends BaseController {
         return toAjax(perceivedEventsWarningService.updateWarning(dcWarning));
     }
 
+
+    //增加感知事件审核状态
+    @PostMapping("/updateWarningAuditFlag")
+    public AjaxResult updateWarningAuditFlag(@RequestBody DcWarning dcWarning){
+        dcWarning.setAuditor(getUsername());
+        return toAjax(perceivedEventsWarningService.updateWarningAuditFlag(dcWarning));
+    }
+
     //查询非机预警类型,按照时间与类型查询(传入时间类型type与时间warningTime)
     @PostMapping("/nonAutomaticWarningType")
     public AjaxResult nonAutomaticWarningType(@RequestBody DcWarning dcWarning){

zc-business/src/main/java/com/zc/business/domain/DcWarning.java

@@ -76,6 +76,40 @@ public class DcWarning extends BaseEntity
     @Excel(name = "车道",readConverterExp="0=应急,1=行1,2=行2,3=行3,4=行4")
     private String lane;
 
+    @Excel(name="审核人")
+    private String  auditor;
+
+    public String getAuditor() {
+        return auditor;
+    }
+
+    public void setAuditor(String auditor) {
+        this.auditor = auditor;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public Integer getAuditFlag() {
+        return auditFlag;
+    }
+
+    public void setAuditFlag(Integer auditFlag) {
+        this.auditFlag = auditFlag;
+    }
+
+    @Excel(name="审核时间")
+    private Date  auditTime;
+
+    @Excel(name="审核状态",readConverterExp = "1=正确,2=错误")
+    private Integer auditFlag;
+
+
     /** 所属辖区路段名称 */
 
     private  String sectionName;

zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java

@@ -72,6 +72,9 @@ public interface DcPerceivedEventsWarningMapper {
     List<HashMap<String,Object>> selectWarningEscalation(DcWarning dcWarning);
     //修改感知事件信息
     Integer updateWarning(DcWarning dcWarning);
+
+    //增加感知事件审核状态
+    Integer updateWarningAuditFlag(DcWarning dcWarning);
     //查询事件条数，以桩号和方向,时间作为条件
     String selectWarningMarkDay(DcWarning dcWarning);
     String selectWarningMarkMonth(DcWarning dcWarning);

zc-business/src/main/java/com/zc/business/service/IDCPerceivedEventsWarningService.java

@@ -54,6 +54,8 @@ public interface IDCPerceivedEventsWarningService {
     //修改感知事件信息
     Integer updateWarning(DcWarning dcWarning);
 
+    Integer updateWarningAuditFlag(DcWarning dcWarning);
+
     //查询非机预警事件按照类型区分时间查询
     List<HashMap<String,Object>> selectTypeNonAutomaticWarning(DcWarning dcWarning);
     //查询非机预警按照时间类型查询

zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java

@@ -266,6 +266,12 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
         dcWarning.setUpdateTime(DateUtils.getNowDate());
         return perceivedEventsWarningMapper.updateWarning(dcWarning);
     }
+
+
+    public Integer updateWarningAuditFlag(DcWarning dcWarning) {
+        dcWarning.setAuditTime(DateUtils.getNowDate());
+        return perceivedEventsWarningMapper.updateWarningAuditFlag(dcWarning);
+    }
     //查询非机预警事件按照类型区分时间查询
     @Override
     public List<HashMap<String, Object>> selectTypeNonAutomaticWarning(DcWarning dcWarning) {

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -15,7 +15,7 @@
     </select>
     <select id="selectWarningById" resultType="com.zc.business.domain.DcWarning">
         SELECT DISTINCT warning.`id`,warning.`stake_mark`, warning.`direction`,
-                        warning.duration,
+                        warning.duration,warning.`auditor`,warning.`audit_time`,warning.`audit_flag`,
                         user.user_name,warning.event_cause,warning.end_time,
                mark.longitude,mark.latitude,warning.lane,warning.vehicle_type vehicleType,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
@@ -45,6 +45,7 @@
             <if test="warningSubclass != null  and warningSubclass != ''"> and warning.warning_subclass = #{warningSubclass}</if>
             <if test="direction != null  and direction != ''"> and warning.direction = #{direction}</if>
             <if test="stakeMark != null  and stakeMark != ''"> and warning.stake_mark = #{stakeMark}</if>
+            <if test="auditFlag != null  and auditFlag != ''"> and warning.audit_flag = #{auditFlag}</if>
             <if test="startTime != null  and completeTime != null ">
              and warning.warning_time between #{startTime} and #{completeTime}</if>
             <if test="startStakeMark != null  and startStakeMark != ''">
@@ -361,6 +362,16 @@
         </trim>
         where id = #{id}
     </update>
+
+    <update id="updateWarningAuditFlag">
+        update dc_warning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
+            <if test="auditor != null">auditor = #{auditor},</if>
+            <if test="auditFlag != null">audit_flag = #{auditFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
     <select id="selectWarningMarkDay" resultType="java.lang.String">
         select count(1) from dc_warning where stake_mark=#{stakeMark}
          AND direction=#{direction} and DATE(warning_time)=DATE_FORMAT(#{warningTime},'%Y-%m-%d')

zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                warning.`id`,warning.`stake_mark`, warning.`direction`,warning.end_time,warning.event_cause,
                warning.lane,warning.vehicle_type,mark.longitude,mark.latitude,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
+               warning.`auditor`,warning.`audit_time`,warning.`audit_flag`,
                warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
                warning.`remark`, warning.`create_time`,warning.`update_time`,
                warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
@@ -103,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{warningSubclass}
             </if>
             <if test="direction != null  and direction != ''">and warning.direction = #{direction}</if>
+            <if test="auditFlag != null  and auditFlag != ''"> and warning.audit_flag = #{auditFlag}</if>
             <if test="stakeMark != null  and stakeMark != ''">and warning.stake_mark = #{stakeMark}</if>
             <if test="startTime != null  and completeTime != null ">
                 and warning.warning_time between #{startTime} and #{completeTime}