日期格式

src/main/java/com/chinaitop/depot/device/controller/DFacilitiesController.java

@@ -4,8 +4,6 @@ import com.chinaitop.depot.device.model.*;
 import com.chinaitop.depot.device.service.DFacilitiesBasicsService;
 import com.chinaitop.depot.device.service.DFacilitiesMaintainService;
 import com.chinaitop.depot.device.service.DFacilitiesRepairService;
-import com.chinaitop.depot.device.service.DSblxxjyService;
-import com.chinaitop.depot.utils.GeneratingEncodUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +22,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author yu.ren
@@ -77,17 +73,13 @@ public class DFacilitiesController {
         return pageInfo;
     }
 
-    @RequestMapping(value = "/basics/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+
+    @RequestMapping(value="/basics/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
     @ApiOperation(value = "保存/编辑设施基础信息", notes = "设施基础信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "dFacilitiesBasicsJson", value = "设施基础信息数据", paramType = "form")
-    })
-    public Map<String, Object> saveBasics(@RequestBody String dFacilitiesBasicsJson) {
+   
+    public Map<String, Object> saveBasics(@RequestBody DFacilitiesBasics dFacilitiesBasics) {
         Map<String, Object> modelMap = new HashMap<>();
-        // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
         try {
-            DFacilitiesBasics dFacilitiesBasics = mapper.readValue(dFacilitiesBasicsJson, DFacilitiesBasics.class);
             if (dFacilitiesBasics.getId()==null) {
                 dFacilitiesBasics.setCreateTime(new Date()); // 创建时间
                 dFacilitiesBasicsService.save(dFacilitiesBasics); // 新增
@@ -208,7 +200,7 @@ public class DFacilitiesController {
     @RequestMapping(value = "/maintain/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "保存/编辑设施保养信息", notes = "设施保养信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dFacilitiesMaintainJson", value = "设施保养信息", paramType = "form")
+            @ApiImplicitParam(name = "dFacilitiesMaintainJson", value = "设施保养信息", paramType = "query")
     })
     public Map<String, Object> saveMaintain(String dFacilitiesMaintainJson) {
         Map<String, Object> modelMap = new HashMap<>();

src/main/java/com/chinaitop/depot/device/model/DFacilitiesBasics.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 public class DFacilitiesBasics {
     private Integer id;
 
@@ -31,30 +33,35 @@ public class DFacilitiesBasics {
      * 安装时间
      */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date azsj;
 
     /**
      * 调试时间
      */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date tssj;
 
     /**
      * 验收时间
      */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date yssj;
 
 
     private Integer orgId;
 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 报废日期
      */
     @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date bfrq;
 
     /**