Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java

@@ -115,6 +115,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
                     }
                 });
             }
+            // 网格名赋值
             finalGrids.forEach(g -> {
                 if (r.getGridId().equals(g.getGridId())){
                     r.setGridName(g.getGridName());
@@ -124,6 +125,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
         result.forEach(r -> {
             if (!r.getLlStatus()){
                 finalGrids.forEach(g -> {
+                    // 网格相同，并且中心点位不为空，并且中心点位不等于 '[]'
                     if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark()))){
                         r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE));
                         r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE));

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

@@ -1,6 +1,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -61,6 +63,7 @@ public class StaffPatrolController {
 	 * @date 2021/6/7 16:46
 	 */
 	@PostMapping("startpatrol")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOT_GOVERN_PATROL)
 	public Result<StartPatrolResultDTO> startPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) {
 		StartPatrolResultDTO result = staffPatrolRecordService.startPatrol(tokenDto, formDTO);
 		return new Result<StartPatrolResultDTO>().ok(result);
@@ -77,6 +80,7 @@ public class StaffPatrolController {
 	 * @date 2021/6/7 16:46
 	 */
 	@PostMapping("endpatrol")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOT_GOVERN_PATROL)
 	public Result endPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) {
 		staffPatrolRecordService.endPatrol(tokenDto, formDTO);
 		return new Result();