Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-storage-tianjin

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

@@ -3,6 +3,7 @@ package com.chinaitop.depot.risk.controller;
 import com.chinaitop.depot.risk.model.ContentPreControlAlarm;
 import com.chinaitop.depot.risk.service.ContentPreControlAlarmService;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
@@ -52,11 +53,12 @@ public class ContentPreControlAlarmController {
         }
         Map<String, Object> queryMap = Maps.newHashMap();
         if (StringUtils.isNotBlank(startDate)) {
-            queryMap.put("startDate", startDate);
+            queryMap.put("startDate", ParameterUtil.string2datetime(startDate));
         }
         if (StringUtils.isNotBlank(endDate)) {
-            queryMap.put("endDate", endDate);
+            queryMap.put("endDate", ParameterUtil.string2datetime(endDate));
         }
+
         queryMap.put("orgId", orgId);
         return ResponseEntity.ok(new PageInfo<>(contentPreControlAlarmService.selectListPage(queryMap)));
     }

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

@@ -21,7 +21,7 @@
         #{carNumber,jdbcType=VARCHAR},
         #{alarmType,jdbcType=VARCHAR},
         #{alarmContent,jdbcType=VARCHAR},
-        #{alarmTime,jdbcType=VARCHAR},
+        #{alarmTime,jdbcType=TIMESTAMP},
         #{orgId,jdbcType=INTEGER},
         #{createTime,jdbcType=VARCHAR})
     </insert>
@@ -36,11 +36,12 @@
                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 test="startDate != null">
+            <![CDATA[ and alarm_time >= #{startDate} ]]>
         </if>
-        <if test="startDate != null and endDate != null" >
-            and alarm_time &lt;= #{endDate}
+        <if test="endDate != null">
+            <![CDATA[ and alarm_time <= #{endDate} ]]>
         </if>
+        order by alarm_time desc
     </select>
 </mapper>

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

@@ -1,9 +1,13 @@
 package com.chinaitop.depot.risk.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 内容预控告警 model
@@ -31,7 +35,9 @@ public class ContentPreControlAlarm {
     /**
      * 报警时间
      */
-    private String alarmTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date alarmTime;
 
     /**
      * 组织机构ID

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

@@ -32,7 +32,7 @@ public class ContentPreControlAndViolationWarningAlarmServiceImpl implements Con
                 .carNumber(contentAlarm.getCarNumber())
                 .alarmType(contentAlarm.getAlarmType())
                 .alarmContent(contentAlarm.getAlarmContent())
-                .alarmTime(contentAlarm.getAlarmTime())
+                .alarmTime(ParameterUtil.string2datetime(contentAlarm.getAlarmTime()))
                 .orgId(alarmReq.getOrgId())
                 .createTime(DateUtil.getNow())
                 .build())).ifPresent(contentPreControlAlarmMapper::insert);