From b79991a74398e616737eaad9b7a645b1c2026cb8 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 10 Mar 2022 10:51:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=96=B0=E5=A2=9E/=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcUserChangeRecordServiceImpl.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
index d9662fdc8b..caca478526 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/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);
     }
 
-}
\ No newline at end of file
+}

From 94640edc984d237cd11b1024e14f7ae03f947d58 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 10 Mar 2022 15:16:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=B7=A1=E6=9F=A5=20?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E3=80=81=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/StartPatrolFormDTO.java   | 7 +++++++
 .../java/com/epmet/controller/StaffPatrolController.java   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java
index 2c723e6177..e0c6ac7b9a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StartPatrolFormDTO.java
+++ b/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
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
index e8f37f0a2e..c9bcc9d905 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
+++ b/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);