fix：日期格式转换

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.risk.model.RiskManagement;
 import com.chinaitop.depot.risk.service.RiskManagementService;
 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;
@@ -55,15 +56,13 @@ public class RiskManagementController {
         }
         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);
-        List<RiskManagement> list = riskManagementService.selectListPage(queryMap);
-        PageInfo<RiskManagement> pageInfo = new PageInfo<>(list);
-        return ResponseEntity.ok(pageInfo);
+        return ResponseEntity.ok(new PageInfo<>(riskManagementService.selectListPage(queryMap)));
     }
 
     @RequestMapping(value = "/saveData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)

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

@@ -5,6 +5,7 @@ import com.chinaitop.depot.risk.model.RiskManagement;
 import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 import com.chinaitop.depot.risk.service.ViolationWarningAlarmService;
 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;
@@ -57,10 +58,10 @@ public class ViolationWarningAlarmController {
         }
         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));
         }
         if (StringUtils.isNotBlank(violationType)) {
             queryMap.put("violationType", violationType);

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

@@ -22,11 +22,11 @@
             risk_management
         where
             org_id = #{orgId}
-        <if test="startDate != null and endDate != null" >
-            and create_time BETWEEN #{startDate} AND #{endDate}
+        <if test="startDate != null" >
+            <![CDATA[ and create_time >= #{startDate} ]]>
         </if>
-        <if test="startDate != null and endDate != null" >
-            and create_time &lt;= #{endDate}
+        <if test="endDate != null" >
+            <![CDATA[ and create_time <= #{endDate} ]]>
         </if>
     </select>
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.chinaitop.depot.risk.mapper.ViolationWarningAlarmMapper">
     <resultMap id="BaseResultMap" type="com.chinaitop.depot.risk.model.ViolationWarningAlarm">
         <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="publish_time" property="alarmPublishTime" jdbcType="VARCHAR"/>
+        <result column="publish_time" property="alarmPublishTime" jdbcType="TIMESTAMP"/>
         <result column="offender" property="offender" jdbcType="VARCHAR"/>
         <result column="library_point_name" property="involvingLibraryPoints" jdbcType="VARCHAR"/>
         <result column="violation_type" property="violationType" jdbcType="VARCHAR"/>
@@ -37,8 +37,11 @@
         storage_pre_violation
         where
         org_id = #{orgId}
-        <if test="startDate != null and endDate != null" >
-            and publish_time BETWEEN #{startDate} AND #{endDate}
+        <if test="startDate != null">
+           <![CDATA[ and publish_time >= #{startDate} ]]>
+        </if>
+        <if test="endDate != null">
+           <![CDATA[ and publish_time <= #{endDate} ]]>
         </if>
         <if test="violationType != null" >
             and violation_type = #{violationType}
@@ -54,7 +57,7 @@
         dispose_content, subject_type,
         dispose_time, status, org_id, create_time)
         VALUES (#{id,jdbcType=INTEGER},
-        #{alarmPublishTime,jdbcType=VARCHAR},
+        #{alarmPublishTime,jdbcType=TIMESTAMP},
         #{offender,jdbcType=VARCHAR},
         #{involvingLibraryPoints,jdbcType=VARCHAR},
         #{violationType,jdbcType=VARCHAR},

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.risk.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -82,10 +83,12 @@ public class RiskManagement {
     /**
      * 创建时间
      */
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     /**
      * 修改时间
      */
-    private String modifyTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
 }

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

@@ -1,10 +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 java.util.Date;
+
 /**
  * 违规预警
  * @author aihua
@@ -22,7 +25,8 @@ public class ViolationWarningAlarm {
     /**
      * 违规发布时间
      */
-    private String alarmPublishTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date alarmPublishTime;
     /**
      * 违规主题类型 当前默认是 单位
      */

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

@@ -7,6 +7,7 @@ import com.chinaitop.depot.risk.model.ViolationWarningAlarm;
 import com.chinaitop.depot.risk.request.ContentPreControlAndViolationWarningAlarmReq;
 import com.chinaitop.depot.risk.service.ContentPreControlAndViolationWarningAlarmService;
 import com.chinaitop.depot.utils.DateUtil;
+import com.chinaitop.depot.utils.ParameterUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -36,7 +37,7 @@ public class ContentPreControlAndViolationWarningAlarmServiceImpl implements Con
                 .createTime(DateUtil.getNow())
                 .build())).ifPresent(contentPreControlAlarmMapper::insert);
         Optional.ofNullable(alarmReq).flatMap(req -> Optional.ofNullable(req.getViolationWarningAlarm()).map(violationAlarm -> ViolationWarningAlarm.builder()
-                .alarmPublishTime(violationAlarm.getAlarmPublishTime())
+                .alarmPublishTime(ParameterUtil.string2datetime(violationAlarm.getAlarmPublishTime()))
                 .violationSubjectType("单位")
                 .offender(violationAlarm.getOffender())
                 .violationType(violationAlarm.getViolationType())

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

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -39,7 +40,7 @@ public class RiskManagementServiceImpl implements RiskManagementService {
      */
     @Override
     public void saveData(RiskManagement riskManagement) {
-        riskManagement.setCreateTime(DateUtil.getNow());
+        riskManagement.setCreateTime(new Date());
         riskManagementMapper.insert(riskManagement);
     }
 
@@ -49,7 +50,7 @@ public class RiskManagementServiceImpl implements RiskManagementService {
      */
     @Override
     public void updateDate(RiskManagement riskManagement) {
-        riskManagement.setModifyTime(DateUtil.getNow());
+        riskManagement.setModifyTime(new Date());
         riskManagementMapper.updateById(riskManagement);
     }