Merge branch 'dev'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -15,17 +17,22 @@ import java.io.Serializable;
 public class StartPatrolFormDTO implements Serializable {
 
 	private static final long serialVersionUID = -2765639550834711582L;
+	public interface StartPatrol extends CustomerClientShowGroup {}
+
 	/**
 	 * 网格id
 	 */
+	@NotBlank(message = "网格Id不能为空",groups = StartPatrol.class)
 	private String gridId;
 	/**
 	 * 纬度
 	 */
+	@NotBlank(message = "位置维度不能为空",groups = StartPatrol.class)
 	private String latitude;
 	/**
 	 * 经度
 	 */
+	@NotBlank(message = "位置经度不能为空",groups = StartPatrol.class)
 	private String longitude;
 	/**
 	 * 速度，如果拿不到默认0

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -82,6 +82,7 @@ public class StaffPatrolController {
 	@PostMapping("startpatrol")
 	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOT_GOVERN_PATROL)
 	public Result<StartPatrolResultDTO> startPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, StartPatrolFormDTO.StartPatrol.class);
 		StartPatrolResultDTO result = staffPatrolRecordService.startPatrol(tokenDto, formDTO);
 		return new Result<StartPatrolResultDTO>().ok(result);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -134,6 +134,14 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 } else {
                     resultDto.setGridName(StrConstant.EPMETY_STR);
                 }
+                //类别变动添加 新增/减少后缀
+                if ("category".equals(resultDto.getType())){
+                    String tempSuffix = "减少";
+                    if (resultDto.getValue().equals(NumConstant.ONE)){
+                        tempSuffix = "增加";
+                    }
+                    resultDto.setTypeName(resultDto.getTypeName().concat(tempSuffix));
+                }
             });
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -265,4 +273,4 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         icUserChangeDetailedService.insertBatch(detailedList);
     }
 
-}
+}