From d7b286457f84cf415b35f5ed21af137fde50611c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Jun 2021 16:03:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/user/impl/StaffPatrolDetailServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index 94050b403e..8daf720ea1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/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)); From 7fc4ffbe2ddf171edabacb593e8c5adfa78ed891 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 11 Jun 2021 16:11:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/StaffPatrolController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 4948e36d7a..4d510c5996 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 @@ -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 startPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) { StartPatrolResultDTO result = staffPatrolRecordService.startPatrol(tokenDto, formDTO); return new Result().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(); From 14b27f8940eb9c8d5fe18d99ff2c260643084eaa Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Jun 2021 16:28:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E7=94=A8lambda=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20=E5=88=9B=E5=BB=BAsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StaffPatrolRecordServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index 3150361c7a..eb7a8bb590 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/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 wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), "GRID", formDTO.getGridId()) - .eq("STAFF_ID", tokenDto.getUserId()) - .orderByDesc("PATROL_START_TIME") + LambdaQueryWrapper 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) { From 330e6cd4d05d685530b38696abb44a2c61ff2c0c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 11 Jun 2021 16:55:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index fdbb43843b..f2cf70efba 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/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;