Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -129,7 +129,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             Integer minutes;
             if (("patrolling").equals(record.getStatus())) {
                 minutes = DateUtils.calculateMin(record.getPatrolStartTime(), new Date());
-                String latestChangeDesc = "后端返回：巡查员最近地址变动是" + minutes + "分钟前";
+                String latestChangeDesc = "巡查员最近地址变动是" + minutes + "分钟前";
                 dto.setLatestChangeDesc(latestChangeDesc);
             } else {
                 minutes = record.getTotalTime() / 60;

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();

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

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -23,11 +24,11 @@ import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -71,10 +72,10 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	@Override
 	public StaffPatrolInitResultDTO init(TokenDto tokenDto, StaffPatrolInitFormDTO formDTO) {
 		StaffPatrolInitResultDTO result = new StaffPatrolInitResultDTO();
-		QueryWrapper<StaffPatrolRecordEntity> wrapper = new QueryWrapper<>();
-		wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), "GRID", formDTO.getGridId())
-				.eq("STAFF_ID", tokenDto.getUserId())
-				.orderByDesc("PATROL_START_TIME")
+		LambdaQueryWrapper<StaffPatrolRecordEntity> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), StaffPatrolRecordEntity::getGrid, formDTO.getGridId())
+				.eq(StaffPatrolRecordEntity::getStaffId, tokenDto.getUserId())
+				.orderByDesc(StaffPatrolRecordEntity::getPatrolStartTime)
 				.last("limit 1");
 		StaffPatrolRecordEntity entity = baseDao.selectOne(wrapper);
 		if (null == entity) {