src/main/java/com/chinaitop/depot/risk/controller/ViolationWarningAlarmController.java

@@ -47,7 +47,7 @@ public class ViolationWarningAlarmController {
             @ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query")
     })
-    public ResponseEntity<PageInfo<ViolationWarningAlarm>> listPage(Integer pageNum, Integer pageSize, Integer orgId, String startDate, String endDate){
+    public ResponseEntity<PageInfo<ViolationWarningAlarm>> listPage(Integer pageNum, Integer pageSize, Integer orgId,String violationType, String startDate, String endDate){
 
         if (orgId == null) {
             return ResponseEntity.failed("组织机构ID不能为空！");
@@ -62,6 +62,9 @@ public class ViolationWarningAlarmController {
         if (StringUtils.isNotBlank(endDate)) {
             queryMap.put("endDate", endDate);
         }
+        if (StringUtils.isNotBlank(violationType)) {
+            queryMap.put("violationType", violationType);
+        }
         queryMap.put("orgId", orgId);
         return ResponseEntity.ok(new PageInfo<>(violationWarningAlarmService.selectListPage(queryMap)));
     }
@@ -94,6 +97,11 @@ public class ViolationWarningAlarmController {
                 if (violationWarningAlarm.getId() == null) {
                     return ResponseEntity.failed("更新数据ID不能为空！");
                 }
+                if(StringUtils.isNotBlank(violationWarningAlarm.getDisposer())
+                  || StringUtils.isNotBlank(violationWarningAlarm.getDisposeContent())
+                  || StringUtils.isNotBlank(violationWarningAlarm.getDisposeTime())){
+                    violationWarningAlarm.setCurrentStatus(1);
+                }
                 violationWarningAlarmService.updateDate(violationWarningAlarm);
             }
         } catch (Exception e) {

src/main/java/com/chinaitop/depot/risk/mapper/ContentPreControlAlarmMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.risk.mapper.ContentPreControlAlarmMapper">
     <resultMap id="BaseResultMap" type="com.chinaitop.depot.risk.model.ContentPreControlAlarm">
-        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="car_number" property="carNumber" jdbcType="VARCHAR"/>
         <result column="alarm_type" property="alarmType" jdbcType="VARCHAR"/>
         <result column="alarm_content" property="alarmContent" jdbcType="VARCHAR"/>

src/main/java/com/chinaitop/depot/risk/mapper/ViolationWarningAlarmMapper.java

@@ -1,11 +1,22 @@
 package com.chinaitop.depot.risk.mapper;
 
+import com.chinaitop.depot.risk.model.RiskManagement;
 import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 
+
+import java.util.List;
+import java.util.Map;
 /**
  * 违规预警mapper
  * @author aihua
  */
 public interface ViolationWarningAlarmMapper {
+
     void insert(ViolationWarningAlarm violationWarningAlarm);
+
+    List<ViolationWarningAlarm> selectListPage(Map<String, Object> queryMap);
+
+    ViolationWarningAlarm selectById(Integer id);
+
+    void updateById(ViolationWarningAlarm riskManagement);
 }

src/main/java/com/chinaitop/depot/risk/mapper/ViolationWarningAlarmMapper.xml

@@ -2,25 +2,56 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.risk.mapper.ViolationWarningAlarmMapper">
     <resultMap id="BaseResultMap" type="com.chinaitop.depot.risk.model.ViolationWarningAlarm">
-        <id column="id" property="id" jdbcType="VARCHAR"/>
-        <result column="alarm_publish_time" property="alarmPublishTime" jdbcType="VARCHAR"/>
-        <result column="violation_subject_type" property="violationSubjectType" jdbcType="VARCHAR"/>
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="publish_time" property="alarmPublishTime" jdbcType="VARCHAR"/>
         <result column="offender" property="offender" jdbcType="VARCHAR"/>
-        <result column="involving_library_points" property="involvingLibraryPoints" jdbcType="VARCHAR"/>
+        <result column="library_point_name" property="involvingLibraryPoints" jdbcType="VARCHAR"/>
         <result column="violation_type" property="violationType" jdbcType="VARCHAR"/>
-        <result column="violation_detail" property="violationDetail" jdbcType="VARCHAR"/>
-        <result column="current_status" property="currentStatus" jdbcType="INTEGER"/>
+        <result column="detail" property="violationDetail" jdbcType="VARCHAR"/>
+        <result column="disposer" property="disposer" jdbcType="VARCHAR"/>
+        <result column="dispose_content" property="disposeContent" jdbcType="VARCHAR"/>
+        <result column="subject_type" property="violationSubjectType" jdbcType="VARCHAR"/>
+        <result column="status" property="currentStatus" jdbcType="INTEGER"/>
         <result column="org_id" property="orgId" jdbcType="INTEGER"/>
+        <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
     </resultMap>
 
+
+    <select id="selectListPage" resultType="com.chinaitop.depot.risk.model.ViolationWarningAlarm">
+        select
+        id,
+        publish_time as alarmPublishTime,
+        offender as offender,
+        library_point_name as involvingLibraryPoints,
+        violation_type as violationType,
+        detail as violationDetail,
+        disposer as disposer,
+        dispose_content as disposeContent,
+        subject_type as violationSubjectType,
+        status as currentStatus,
+        org_id as orgId,
+        create_time as createTime
+        from
+        storage_pre_violation
+        where
+        org_id = #{orgId}
+        <if test="startDate != null and endDate != null" >
+            and publish_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="violationType != null" >
+            and violation_type = #{violationType}
+        </if>
+    </select>
+
     <insert id="insert">
         <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
             select seq_business_agent_tank.nextVal from dual
         </selectKey>
         INSERT INTO storage_pre_violation
-        (id, publish_time, offender, library_point_name, "type", detail, disposer, dispose_content, subject_type,
+        (id, publish_time, offender, library_point_name, violation_type, detail, disposer,
+        dispose_content, subject_type,
         dispose_time, status, org_id, create_time)
-        VALUES (#{id,jdbcType=VARCHAR},
+        VALUES (#{id,jdbcType=INTEGER},
         #{alarmPublishTime,jdbcType=VARCHAR},
         #{offender,jdbcType=VARCHAR},
         #{involvingLibraryPoints,jdbcType=VARCHAR},
@@ -34,4 +65,60 @@
         #{orgId,jdbcType=INTEGER},
         #{createTime,jdbcType=VARCHAR})
     </insert>
+
+
+    <select id="selectById" resultMap="BaseResultMap">
+        select
+        id,
+        publish_time,
+        offender ,
+        library_point_name ,
+        violation_type ,
+        detail ,
+        disposer ,
+        dispose_content,
+        subject_type ,
+        status ,
+        org_id ,
+        create_time
+        from
+           storage_pre_violation
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+
+    <update id="updateById">
+        UPDATE storage_pre_violation
+        <set>
+            <if test="alarmPublishTime != null">
+                publish_time = #{alarmPublishTime,jdbcType=VARCHAR},
+            </if>
+            <if test="offender != null">
+                offender = #{offender,jdbcType=VARCHAR},
+            </if>
+            <if test="involvingLibraryPoints != null">
+                library_point_name = #{involvingLibraryPoints,jdbcType=VARCHAR},
+            </if>
+            <if test="violationType != null">
+                "type" = #{violationType,jdbcType=VARCHAR},
+            </if>
+            <if test="violationDetail != null">
+                detail = #{violationDetail,jdbcType=INTEGER},
+            </if>
+            <if test="disposer != null">
+                disposer = #{disposer,jdbcType=VARCHAR},
+            </if>
+            <if test="disposeContent != null">
+                dispose_content = #{disposeContent,jdbcType=VARCHAR},
+            </if>
+            <if test="violationSubjectType != null">
+                subject_type = #{violationSubjectType,jdbcType=VARCHAR},
+            </if>
+            <if test="currentStatus != null">
+                status = #{currentStatus,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
 </mapper>

src/main/java/com/chinaitop/depot/risk/model/ContentPreControlAlarm.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.risk.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 内容预控告警 model
@@ -10,8 +12,10 @@ import lombok.Data;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ContentPreControlAlarm {
-    private String id;
+    private Integer id;
     /**
      * 入库车牌号
      */

src/main/java/com/chinaitop/depot/risk/model/ViolationWarningAlarm.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.risk.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 违规预警
@@ -10,17 +12,19 @@ import lombok.Data;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ViolationWarningAlarm {
     /**
      * 主键ID
      */
-    private String id;
+    private Integer id;
     /**
      * 违规发布时间
      */
     private String alarmPublishTime;
     /**
-     * 违规主题类型
+     * 违规主题类型 当前默认是 单位
      */
     private String violationSubjectType;
     /**

src/main/java/com/chinaitop/depot/risk/service/impl/ViolationWarningAlarmServiceImpl.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.risk.service.impl;
 
+import com.chinaitop.depot.risk.mapper.ViolationWarningAlarmMapper;
 import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 import com.chinaitop.depot.risk.service.ViolationWarningAlarmService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -14,19 +16,22 @@ import java.util.Map;
  * @date 2022-04-19 17:46
  */
 @Service
+@RequiredArgsConstructor
 public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmService {
+
+    private final ViolationWarningAlarmMapper violationWarningAlarmMapper;
     @Override
     public List<ViolationWarningAlarm> selectListPage(Map<String, Object> queryMap) {
-        return null;
+        return  violationWarningAlarmMapper.selectListPage(queryMap);
     }
 
     @Override
     public ViolationWarningAlarm queryById(Integer id) {
-        return null;
+        return  violationWarningAlarmMapper.selectById(id);
     }
 
     @Override
     public void updateDate(ViolationWarningAlarm violationWarningAlarm) {
-
+        violationWarningAlarmMapper.updateById(violationWarningAlarm);
     }
 }