From b3ec180bc478e25d8e939098e311eedcdf00a538 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 30 May 2023 15:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=9B=BE=E5=B1=82=E3=80=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A2=9E=E5=8A=A0=E7=89=87?= =?UTF-8?q?=E5=8C=BA=E6=B0=91=E8=AD=A6+=E7=BD=91=E6=A0=BC=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcPublicServiceAddEditFormDTO.java | 15 ++++++++ .../result/IcPublicServiceListResultDTO.java | 18 ++++++++++ ...enPublicServicePlaceListByCateRstDTO.java} | 2 +- ... LingShanScreenStatsByCategoryRstDTO.java} | 2 +- .../controller/IcPublicServiceController.java | 35 ++++++++++++++----- .../com/epmet/dao/IcPublicServiceDao.java | 4 +-- .../epmet/entity/IcPublicServiceEntity.java | 15 ++++++++ .../com/epmet/excel/IcPublicServiceExcel.java | 35 +++++++++++++++++++ .../epmet/service/IcPublicServiceService.java | 7 ++-- .../impl/IcPublicServiceServiceImpl.java | 27 ++++++++++++-- .../resources/mapper/IcPublicServiceDao.xml | 7 ++-- 11 files changed, 148 insertions(+), 19 deletions(-) rename epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/{ListByCategory.java => LingShanScreenPublicServicePlaceListByCateRstDTO.java} (91%) rename epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/{StatsByCategoryRstDTO.java => LingShanScreenStatsByCategoryRstDTO.java} (87%) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java index 226bb921f1..287c323ab4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java @@ -76,4 +76,19 @@ public class IcPublicServiceAddEditFormDTO implements Serializable { private String customerId; private String userId; + /** + * 片区sir名字[灵山] + */ + private String policeName; + + /** + * 片区sir电话[灵山] + */ + private String policePhone; + + /** + * 网格员id[灵山] + */ + private String griderId; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java index 3fcae16a22..a88d816155 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java @@ -75,4 +75,22 @@ public class IcPublicServiceListResultDTO implements Serializable { */ private String mobile; + /** + * 片区sir名字[灵山] + */ + private String policeName; + + /** + * 片区sir电话[灵山] + */ + private String policePhone; + + /** + * 网格员id[灵山] + */ + private String griderId; + + private String griderName; + + private String griderPhone; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java similarity index 91% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java index 7b82561df8..309c680647 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java @@ -3,7 +3,7 @@ package com.epmet.dto.result.lingshan; import lombok.Data; @Data -public class ListByCategory { +public class LingShanScreenPublicServicePlaceListByCateRstDTO { /** * 资源名称 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenStatsByCategoryRstDTO.java similarity index 87% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenStatsByCategoryRstDTO.java index b9efc77863..f31ec088ff 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenStatsByCategoryRstDTO.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class StatsByCategoryRstDTO { +public class LingShanScreenStatsByCategoryRstDTO { /** * 分类 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index 1d531eb45a..8f18b6d5c4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -11,11 +11,13 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -30,13 +32,15 @@ import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenPublicServicePlaceListByCateRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenStatsByCategoryRstDTO; import com.epmet.excel.IcPublicServiceExcel; import com.epmet.service.IcPublicServiceService; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; @@ -228,7 +232,7 @@ public class IcPublicServiceController implements ResultDataResolver { } /** - * @Description: 分类统计 + * @Description: 灵山大屏：分类统计 * @param orgType: * @param orgId: * @Return com.epmet.commons.tools.utils.Result> @@ -236,14 +240,29 @@ public class IcPublicServiceController implements ResultDataResolver { * @Date: 2023/5/30 9:20 AM */ @GetMapping("lingshan/screen/statsByCategory") - public Result> lingshanScreenStatsByCategory(@RequestParam("orgType") String orgType, - @RequestParam("orgId") String orgId) { + public Result> lingshanScreenStatsByCategory(@RequestParam("orgType") String orgType, + @RequestParam("orgId") String orgId) { - List l = icPublicServiceService.lingshanScreenStatsByCategory(orgType, orgId); - return new Result>().ok(l); + List l = icPublicServiceService.lingshanScreenStatsByCategory(orgType, orgId); + return new Result>().ok(l); } - // @GetMapping("lingshan/screen/listByCategory") - // public Result<> + /** + * @Description: 灵山大屏：查询组织下，某个类别的场所列表，带坐标，打点 + * @param orgType: + * @param orgId: + * @param category: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: wangxianzhang + * @Date: 2023/5/30 1:50 PM + */ + @GetMapping("lingshan/screen/listByCategory") + public Result> lingshanScreenListByCategory(@RequestParam("orgType") String orgType, + @RequestParam("orgId") String orgId, + @RequestParam("category") String category) { + + List rl = icPublicServiceService.lingshanScreenListByCategory(orgId, orgType, category); + return new Result>().ok(rl); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java index 4dd504a807..75e5dfbf64 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -3,7 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; -import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenStatsByCategoryRstDTO; import com.epmet.entity.IcPublicServiceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,5 +35,5 @@ public interface IcPublicServiceDao extends BaseDao { * @Author: wangxianzhang * @Date: 2023/5/30 9:44 AM */ - List lingshanScreenStatsByCategory(@Param("orgIdPath") String orgIdPath, @Param("customerId") String customerId); + List lingshanScreenStatsByCategory(@Param("orgIdPath") String orgIdPath, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java index 8241752b39..e39f97743d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -83,6 +83,21 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String mobile; + /** + * 片区sir名字[灵山] + */ + private String policeName; + + /** + * 片区sir电话[灵山] + */ + private String policePhone; + + /** + * 网格员id[灵山] + */ + private String griderId; + /** * 用于聚合统计 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 872b2fd61b..4c281c83b8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -1,5 +1,6 @@ package com.epmet.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; @@ -46,6 +47,40 @@ public class IcPublicServiceExcel { @ColumnWidth(20) private String mobile; + /** + * 片区sir名字[灵山] + */ + @ExcelProperty(value = "片区民警") + @ColumnWidth(20) + private String policeName; + + /** + * 片区sir电话[灵山] + */ + @ExcelProperty(value = "片区民警电话") + @ColumnWidth(20) + private String policePhone; + + /** + * 网格员电话：[灵山]。excel中不体现 + */ + @ExcelIgnore + private String griderId; + + /** + * 网格员[灵山] + */ + @ExcelProperty(value = "网格员") + @ColumnWidth(20) + private String griderName; + + /** + * 网格员电话[灵山] + */ + @ExcelProperty(value = "网格员电话") + @ColumnWidth(20) + private String griderPhone; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java index 85cbc0c535..1948bbb728 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java @@ -6,7 +6,8 @@ import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; -import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenPublicServicePlaceListByCateRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenStatsByCategoryRstDTO; import com.epmet.entity.IcPublicServiceEntity; import java.nio.file.Path; @@ -73,5 +74,7 @@ public interface IcPublicServiceService extends BaseService lingshanScreenStatsByCategory(String orgType, String orgId); + List lingshanScreenStatsByCategory(String orgType, String orgId); + + List lingshanScreenListByCategory(String orgId, String orgType, String category); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 38a2913c19..fc149d7d9c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -26,9 +26,9 @@ import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenPublicServicePlaceListByCateRstDTO; +import com.epmet.dto.result.lingshan.LingShanScreenStatsByCategoryRstDTO; import com.epmet.entity.IcPublicServiceEntity; -import com.epmet.entity.IcSuperiorResourceEntity; import com.epmet.excel.IcPublicServiceExcel; import com.epmet.excel.handler.IcPublicServiceExcelImportListener; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -100,6 +100,18 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl list = baseDao.selectPublicServiceList(formDTO); + + // 网格员信息填充 + list.stream().forEach(e -> { + if (org.apache.commons.lang.StringUtils.isNotBlank(e.getGriderId())) { + CustomerStaffInfoCacheResult griderInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), e.getGriderId()); + if (griderInfo != null) { + e.setGriderName(griderInfo.getRealName()); + e.setGriderPhone(griderInfo.getMobile()); + } + } + }); + PageInfo pageInfo = new PageInfo<>(list); //封装类别数据 @@ -312,7 +324,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl lingshanScreenStatsByCategory(String orgType, String orgId) { + public List lingshanScreenStatsByCategory(String orgType, String orgId) { // 先拿pids String orgIdPath; if (StringUtils.isAnyBlank(orgType, orgId)) { @@ -329,4 +341,13 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl lingshanScreenListByCategory(String orgId, String orgType, String category) { + + + + + return null; + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 7cb1c8cae6..a8a61bf0e6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -82,7 +82,10 @@ longitude longitude, latitude latitude, PRINCIPAL AS principal, - MOBILE AS mobile + MOBILE AS mobile, + POLICE_NAME, + POLICE_PHONE, + GRIDER_ID FROM ic_public_service WHERE @@ -107,7 +110,7 @@