微调

device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java

@@ -74,7 +74,7 @@ public class PqDevController extends BaseController {
     }
 
     @OperateInfo(operateType = OperateType.UPDATE)
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("修改被检设备")
     @ApiImplicitParam(name = "updateParam", value = "被检设备", required = true)
     public HttpResult<Object> update(@RequestBody @Validated PqDevParam.PqDevUpdateParam updateParam) {
@@ -89,7 +89,7 @@ public class PqDevController extends BaseController {
     }
 
     @OperateInfo(operateType = OperateType.DELETE)
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除被检设备")
     @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
     public HttpResult<Object> delete(@RequestBody List<String> ids) {

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java

@@ -79,7 +79,7 @@ public class DictDataController extends BaseController {
      * 修改字典数据
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("修改字典数据")
     @ApiImplicitParam(name = "updateParam", value = "字典数据", required = true)
     public HttpResult<Object> update(@RequestBody @Validated DictDataParam.DictDataUpdateParam updateParam) {
@@ -97,7 +97,7 @@ public class DictDataController extends BaseController {
      * 批量删除字典数据
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除字典数据")
     @ApiImplicitParam(name = "ids", value = "字典索引", required = true, dataTypeClass = List.class)
     public HttpResult<Object> delete(@RequestBody List<String> ids) {

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictPqController.java

@@ -19,10 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -65,7 +62,7 @@ public class DictPqController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("更新电能质量指标字典")
     @ApiImplicitParam(name = "updateParam", value = "更新参数", required = true)
     public HttpResult<Object> update(@RequestBody @Validated DictPqParam.DictPqUpdateParam updateParam) {
@@ -80,7 +77,7 @@ public class DictPqController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除电能质量指标字典")
     @ApiImplicitParam(name = "ids", value = "字典索引", required = true)
     public HttpResult<Object> delete(@RequestBody List<String> ids) {

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java

@@ -63,7 +63,7 @@ public class DictTreeController extends BaseController {
      * @param dicParam 修改参数
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("修改")
     @ApiImplicitParam(name = "dicParam", value = "数据", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated DictTreeParam.DictTreeUpdateParam dicParam) {
@@ -82,7 +82,7 @@ public class DictTreeController extends BaseController {
      * @param id id
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除")
     @ApiImplicitParam(name = "id", value = "id", required = true)
     public HttpResult<Boolean> delete(@RequestParam @Validated String id) {

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java

@@ -77,7 +77,7 @@ public class DictTypeController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation("修改字典类型")
     @ApiImplicitParam(name = "updateParam", value = "字典类型数据", required = true)
     public HttpResult<Object> update(@RequestBody @Validated DictTypeParam.DictTypeUpdateParam updateParam) {
@@ -92,7 +92,7 @@ public class DictTypeController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation("删除字典类型")
     @ApiImplicitParam(name = "ids", value = "字典索引", required = true)
     public HttpResult<Object> delete(@RequestBody List<String> ids) {

user/src/main/java/com/njcn/gather/user/user/pojo/po/SysUser.java

@@ -3,6 +3,11 @@ package com.njcn.gather.user.user.pojo.po;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.njcn.db.mybatisplus.bo.BaseEntity;
 import io.swagger.models.auth.In;
 import lombok.Data;
@@ -59,6 +64,9 @@ public class SysUser extends BaseEntity implements Serializable {
     /**
      * 最后一次登录时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime loginTime;
 
     /**
@@ -69,6 +77,9 @@ public class SysUser extends BaseEntity implements Serializable {
     /**
      * 用户密码错误锁定时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime lockTime;
 
     /**