feat：去掉多余字段

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

@@ -58,8 +58,6 @@ public class ContentPreControlAlarmController {
             queryMap.put("endDate", endDate);
         }
         queryMap.put("orgId", orgId);
-        List<ContentPreControlAlarm> list = contentPreControlAlarmService.selectListPage(queryMap);
-        PageInfo<ContentPreControlAlarm> pageInfo = new PageInfo<>(list);
-        return ResponseEntity.ok(pageInfo);
+        return ResponseEntity.ok(new PageInfo<>(contentPreControlAlarmService.selectListPage(queryMap)));
     }
 }

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

@@ -8,6 +8,7 @@
         <result column="alarm_content" property="alarmContent" jdbcType="VARCHAR"/>
         <result column="alarm_time" property="alarmTime" jdbcType="VARCHAR"/>
         <result column="org_id" property="orgId" jdbcType="INTEGER"/>
+        <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
     </resultMap>
 
     <insert id="insert">
@@ -26,5 +27,20 @@
     </insert>
 
     <select id="selectPage" resultMap="BaseResultMap">
+        SELECT id,
+               car_number,
+               alarm_type,
+               alarm_content,
+               alarm_time,
+               org_id,
+               create_time
+        FROM storage_pre_alarm
+        where org_id = #{orgId}
+        <if test="startDate != null and endDate != null" >
+            and alarm_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="startDate != null and endDate != null" >
+            and alarm_time &lt;= #{endDate}
+        </if>
     </select>
 </mapper>

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

@@ -34,5 +34,8 @@ public class ContentPreControlAlarm {
      */
     private Integer orgId;
 
+    /**
+     * 创建时间
+     */
     private String createTime;
 }

src/main/java/com/chinaitop/depot/risk/request/dto/ViolationWarningAlarmDto.java

@@ -17,10 +17,6 @@ public class ViolationWarningAlarmDto {
      */
     private String alarmPublishTime;
     /**
-     * 违规主题类型
-     */
-    private String violationSubjectType;
-    /**
      * 违规行为人
      */
     private String offender;

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

@@ -37,7 +37,7 @@ public class ContentPreControlAndViolationWarningAlarmServiceImpl implements Con
                 .build())).ifPresent(contentPreControlAlarmMapper::insert);
         Optional.ofNullable(alarmReq).flatMap(req -> Optional.ofNullable(req.getViolationWarningAlarm()).map(violationAlarm -> ViolationWarningAlarm.builder()
                 .alarmPublishTime(violationAlarm.getAlarmPublishTime())
-                .violationSubjectType(violationAlarm.getViolationSubjectType())
+                .violationSubjectType("单位")
                 .offender(violationAlarm.getOffender())
                 .violationType(violationAlarm.getViolationType())
                 .involvingLibraryPoints(violationAlarm.getInvolvingLibraryPoints())