diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index e9d8d41470..0fb85349bf 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.28 ports: - "8082:8082" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3661fc8c37..8c073dd8c3 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.17 + 0.3.28 com.epmet epmet-admin @@ -246,7 +246,7 @@ - false + true true diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 1556650965..d327a24e3e 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.70 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.96 ports: - "8081:8081" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 5f67b41712..dbc60cf787 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.72 + 0.3.96 com.epmet epmet-cloud @@ -352,7 +352,7 @@ - false + true wxcb6ce2ed0c5ae54c diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java index c5db9c6718..81c74a4c38 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java @@ -93,4 +93,20 @@ public class CustomerStaffInfoCacheResult implements Serializable { */ private List deptList; + /** + * 组织级别 + */ + private String level; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index fc40fcae64..478e7d4376 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -16,6 +16,9 @@ public enum DictTypeEnum { SCALE("scale", "人员规模", 6), PARTY_UNIT_TYPE("party_unit_type", "联建单位分类", 7), GENDER("gender", "性别", 8), + USER_DEMAND_STATUS("user_demand_status", "居民需求状态",8), + USER_DEMAND_REPORT_TYPE("user_demand_report_type","居民需求上报类型",9), + USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10) ; private final String code; diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index ebcdc7eafc..789eaec898 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.69 ports: - "8080:8080" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d180c7cab9..1169c9ca84 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.43 + 0.3.69 com.epmet epmet-cloud @@ -323,11 +323,11 @@ lb://gov-issue-server - + lb://gov-project-server - - http://localhost:8103 + lb://common-service-server + lb://resi-home-server @@ -347,8 +347,8 @@ lb://epmet-openapi-scan - lb://epmet-third-server - + + http://localhost:8110 lb://epmet-heart-server @@ -508,7 +508,7 @@ - false + true diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java index a03406f0d0..3269ebcb26 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java @@ -93,4 +93,24 @@ public class CustomerStaffResultDTO implements Serializable { */ private String twoOrgName; + /** + * 【社区】名称0409 + */ + private String community; + + /** + * 组织级别 + */ + private String level; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java index 496a2c87cc..7c343c5ccc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java @@ -142,4 +142,19 @@ public class CustomerAgencyDTO implements Serializable { * 社区 */ private String community; + + /** + * 坐标 + */ + private String coordinates; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java new file mode 100644 index 0000000000..975e22596b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dataaggre.dto.govproject.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】事件总数查询-接口入参 + * @Auth sun + */ +@NoArgsConstructor +@Data +public class ProjectTotalFormDTO implements Serializable { + private static final long serialVersionUID = -8515172319313536407L; + //组织Id + @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) + private String agencyId; + //日期yyyymmdd + @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class}) + private String dateId; + //状态:待处理 pending，结案closed + @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class}) + private String status; + + public interface Total extends CustomerClientShowGroup { + } + public interface Monthincr extends CustomerClientShowGroup { + } + public interface Statuslist extends CustomerClientShowGroup { + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java new file mode 100644 index 0000000000..8947eb971b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】进12月新增项目折线图-接口返参 + * @Auth sun + */ +@Data +public class ProjectMonthIncrResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //横坐标值 + private String value; + //横坐标 + private Integer type; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java new file mode 100644 index 0000000000..c8c895e549 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】事件总数查询-接口返参 + * @Auth sun + */ +@Data +public class ProjectStatusListResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //项目Id + private String projectId; + //来源：议题issue 项目立项:agency 事件:resi_event + private Integer origin; + //状态:待处理 pending，结案closed + private Integer status; + //经度 + private Integer longitude; + //纬度 + private Integer dimension; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java new file mode 100644 index 0000000000..541a742582 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.govproject.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 赋能平台【项目处理分析】事件总数查询-接口返参 + * @Auth sun + */ +@Data +public class ProjectTotalResultDTO implements Serializable { + private static final long serialVersionUID = 6188316867855643263L; + + //组织Id + private String agencyId; + //日期yyyymmdd + private String dateId; + //项目总数 + private Integer projectTotal; + //较昨日数 + private Integer dateIncr; + //较上月数 + private Integer monthIncr; + //未结案项目数 + private Integer pendingTotal; + //为结案项目占比 xx% + private String pendingRatio; + //已结案项目数 + private Integer closedTotal; + //已结案项目占比 + private String closedRatio; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 2906b958ce..915df72317 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.78 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 64f67470f9..06f591c6c0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,6 +2,7 @@ + 0.3.78 data-aggregator com.epmet @@ -571,7 +572,7 @@ - false + true true diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java index 18aa5a924c..503caedfb4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java @@ -8,8 +8,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; +import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO; import com.epmet.dataaggre.service.govproject.GovProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -56,4 +59,35 @@ public class GovProjectController { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(govProjectService.queryProjectDistribution(formDTO)); } + + /** + * @Description 赋能平台【项目处理分析】事件总数查询 + * @author sun + */ + @PostMapping("projecttotal") + public Result projectTotal(@RequestBody ProjectTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Total.class); + return new Result().ok(govProjectService.projectTotal(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】进12月新增项目折线图 + * @author sun + */ + @PostMapping("projectmonthincr") + public Result> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class); + return new Result>().ok(govProjectService.projectMonthIncr(formDTO)); + } + + /** + * @Description 赋能平台【项目处理分析】按状态查询项目列表 + * @author sun + */ + @PostMapping("projectstatuslist") + public Result> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class); + return new Result>().ok(govProjectService.projectStatusList(formDTO)); + } + } 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 6315daf303..50221188f9 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 @@ -602,6 +602,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setAgencyId(agencyDTO.getId()); result.setAgencyName(agencyDTO.getOrganizationName()); result.setAgencyPIds(agencyDTO.getPids()); + result.setLevel(agencyDTO.getLevel()); + result.setLongitude(agencyDTO.getLongitude()); + result.setLatitude(agencyDTO.getLatitude()); StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId); String fromOrgType = OrgTypeEnum.AGENCY.getCode(); if (fromOrgTypeDto != null){ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 35b0096790..a09c9257db 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -4,9 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.*; import java.util.List; @@ -51,4 +50,22 @@ public interface GovProjectService { * @date 2021/8/3 15:27 */ int countRedDot(String userId); + + /** + * @Description 赋能平台【项目处理分析】事件总数查询 + * @author sun + */ + ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】进12月新增项目折线图 + * @author sun + */ + List projectMonthIncr(ProjectTotalFormDTO formDTO); + + /** + * @Description 赋能平台【项目处理分析】按状态查询项目列表 + * @author sun + */ + List projectStatusList(ProjectTotalFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 2063b3f83d..a0401eb9b8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -14,10 +14,8 @@ import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO; -import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO; -import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO; -import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.service.govissue.GovIssueService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -247,4 +245,31 @@ public class GovProjectServiceImpl implements GovProjectService { return projectDao.countRedDot(userId); } + /** + * @Description 赋能平台【项目处理分析】事件总数查询 + * @author sun + */ + @Override + public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】进12月新增项目折线图 + * @author sun + */ + @Override + public List projectMonthIncr(ProjectTotalFormDTO formDTO) { + return null; + } + + /** + * @Description 赋能平台【项目处理分析】按状态查询项目列表 + * @author sun + */ + @Override + public List projectStatusList(ProjectTotalFormDTO formDTO) { + return null; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml index 55c4d7789c..4016ac6385 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml @@ -26,7 +26,23 @@ ca.organization_name, ca.level, ca.area_code, - ca.parent_area_code + ca.parent_area_code, + ( CASE WHEN ca.longitude is THEN + ( SELECT longitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE ca.longitude + END + ) longitude, + ( CASE WHEN ca.latitude is null THEN + ( SELECT latitude FROM customer_agency + WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id) + ORDER BY pid ASC LIMIT 1 + ) + ELSE ca.latitude + END + ) latitude FROM customer_staff_agency csa INNER JOIN customer_agency ca ON csa.agency_id = ca.id diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index c07cfe618a..0f4b2974ec 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.59 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.195 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 25a8220b54..84e5f4d96f 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.59 + 0.3.195 data-report-server @@ -346,7 +346,7 @@ - false + true true diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 73b56ef7a0..047a16e87b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -335,7 +335,7 @@ public interface DataStatisticalOpenFeignClient { /** * 事件上报 * @Param formDTO - * @Return {@link Result>} + * @Return {@link Result>} * @Author zhaoqifeng * @Date 2021/10/15 16:50 */ diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 6e0f1082aa..3cd9ff7c01 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.300 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0fc10e94cb..ded855e3fe 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.81 + 0.3.300 data-statistical com.epmet @@ -636,7 +636,7 @@ false - false + true false diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java index 49d462eaa0..8d86caed9c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java @@ -95,12 +95,26 @@ public class FactOriginExtractController { @PostMapping("project") public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) { - List customerIds = dimCustomerService.selectCustomerIdPage(1, 100); - customerIds.forEach(customerId -> { - ExtractOriginFormDTO dto = new ExtractOriginFormDTO(); - dto.setCustomerId(customerId); - projectExtractService.saveOriginProjectDaily(dto); - }); + if (StringUtils.isNotBlank(extractOriginFormDTO.getCustomerId())) { + List daysBetween; + if (StringUtils.isBlank(extractOriginFormDTO.getDateId())) { + daysBetween = DateUtils.getDaysBetween(extractOriginFormDTO.getStartDate(), extractOriginFormDTO.getEndDate()); + daysBetween.forEach(dateId -> { + extractOriginFormDTO.setDateId(dateId); + projectExtractService.saveOriginProjectDaily(extractOriginFormDTO); + }); + } else{ + projectExtractService.saveOriginProjectDaily(extractOriginFormDTO); + } + + } else { + List customerIds = dimCustomerService.selectCustomerIdPage(1, 100); + customerIds.forEach(customerId -> { + ExtractOriginFormDTO dto = new ExtractOriginFormDTO(); + dto.setCustomerId(customerId); + projectExtractService.saveOriginProjectDaily(dto); + }); + } return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java index 7d4c7e9c71..85dad1166f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java @@ -1,7 +1,9 @@ package com.epmet.controller.external; +import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.SystemMessageType; import com.epmet.dto.screen.*; import com.epmet.dto.screen.form.CategoryDictFormDTO; import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO; @@ -13,6 +15,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + /** * @Description 事件/项目采集接口入口 * @ClassName ScreenProjectDataCollController @@ -135,6 +140,15 @@ public class ScreenProjectDataCollController { param.setCustomerId(customerId); ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class); projectDataService.collect(param); + + //发送MQ消息，上报事件 + param.getDataList().forEach(item -> { + List projectList = new ArrayList<>(); + projectList.add(item.getProjectId()); + DisputeProcessMQMsg msg = new DisputeProcessMQMsg(param.getCustomerId(), projectList, SystemMessageType.PROJECT_ADD); + projectDataService.sendProjectChangeMq(msg); + }); + return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java index 649391be59..f35bfe05ff 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java @@ -5,9 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dto.extract.form.ExtractOriginFormDTO; -import com.epmet.dto.group.form.GroupTotalFormDTO; import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; -import com.epmet.dto.stats.topic.form.TopicStatusFormDTO; import com.epmet.service.StatsGroupService; import com.epmet.service.StatsTopicService; import com.epmet.service.evaluationindex.extract.todata.*; @@ -94,6 +92,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } private void submitJob(ExtractOriginFormDTO param) { + CountDownLatch countDownLatch = new CountDownLatch(NumConstant.FIVE); boolean isRange = StringUtils.isBlank(param.getDateId()); List daysBetween = null; if (isRange) { @@ -101,139 +100,159 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } List finalDaysBetween = daysBetween; threadPool.submit(() -> { - CustomerIdAndDateIdFormDTO formDTO = new CustomerIdAndDateIdFormDTO(); - formDTO.setCustomerId(param.getCustomerId()); - if (!isRange) { - try { - formDTO.setDateId(param.getDateId()); - dimCustomerPartymemberService.statsPartyMember(formDTO); - } catch (Exception e) { - log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(formDTO), e); - } - } else { - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - formDTO.setDateId(dateDimId); + try { + CustomerIdAndDateIdFormDTO formDTO = new CustomerIdAndDateIdFormDTO(); + formDTO.setCustomerId(param.getCustomerId()); + if (!isRange) { + try { + formDTO.setDateId(param.getDateId()); dimCustomerPartymemberService.statsPartyMember(formDTO); + } catch (Exception e) { + log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(formDTO), e); + } + } else { + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + formDTO.setDateId(dateDimId); + dimCustomerPartymemberService.statsPartyMember(formDTO); + } + } catch (Exception e) { + log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(param), e); } - } catch (Exception e) { - log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(param), e); } + } finally { + countDownLatch.countDown(); } }); threadPool.submit(() -> { - ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); - if (!isRange) { - try { - groupExtractService.extractGroupData(paramNew); - } catch (Exception e) { - log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); - } - } else { - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - paramNew.setDateId(dateDimId); + try { + ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); + if (!isRange) { + try { groupExtractService.extractGroupData(paramNew); + } catch (Exception e) { + log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } + } else { + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + paramNew.setDateId(dateDimId); + groupExtractService.extractGroupData(paramNew); + } + } catch (Exception e) { + log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - } catch (Exception e) { - log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } + } finally { + countDownLatch.countDown(); } }); threadPool.submit(() -> { - log.debug("extractAll start param:{}", JSON.toJSONString(param)); - ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); - if (!isRange) { - try { - factOriginTopicMainDailyService.topicCleaning(paramNew); - } catch (Exception e) { - log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); - } - } else { - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - paramNew.setDateId(dateDimId); - log.info("extractAll cal param:{}", JSON.toJSONString(paramNew)); + try { + log.debug("extractAll start param:{}", JSON.toJSONString(param)); + ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); + if (!isRange) { + try { factOriginTopicMainDailyService.topicCleaning(paramNew); + } catch (Exception e) { + log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } + } else { + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + paramNew.setDateId(dateDimId); + log.info("extractAll cal param:{}", JSON.toJSONString(paramNew)); + factOriginTopicMainDailyService.topicCleaning(paramNew); + } + } catch (Exception e) { + log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - } catch (Exception e) { - log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } + log.debug("extractAll end param:{}", JSON.toJSONString(paramNew)); + } finally { + countDownLatch.countDown(); } - log.debug("extractAll end param:{}", JSON.toJSONString(paramNew)); }); threadPool.submit(() -> { - ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); - if (!isRange) { - try { - issueExtractService.issueExtractMain(paramNew); - } catch (Exception e) { - log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e); - } - try { - issueExtractService.issueExtractLog(paramNew); - } catch (Exception e) { - log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e); - } - } else { - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - paramNew.setDateId(dateDimId); + try { + ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); + if (!isRange) { + try { issueExtractService.issueExtractMain(paramNew); + } catch (Exception e) { + log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - } catch (Exception e) { - log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e); - } - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - paramNew.setDateId(dateDimId); + try { issueExtractService.issueExtractLog(paramNew); + } catch (Exception e) { + log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } + } else { + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + paramNew.setDateId(dateDimId); + issueExtractService.issueExtractMain(paramNew); + } + } catch (Exception e) { + log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + paramNew.setDateId(dateDimId); + issueExtractService.issueExtractLog(paramNew); + } + } catch (Exception e) { + log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - } catch (Exception e) { - log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e); } + } finally { + countDownLatch.countDown(); } }); //小组活动 threadPool.submit(() -> { - ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); - if (!isRange) { - //截止到当前dateId - try { - factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); - } catch (Exception e) { - log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); - } - try { - factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); - } catch (Exception e) { - log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); - } - } else { - //参数指定日期内，比如startDate=20210501,endDate=20210513;依次计算截止到20210501的数据.....截止到20210513的数据 - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - extractOriginFormDTO.setDateId(dateDimId); + try { + ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); + if (!isRange) { + //截止到当前dateId + try { factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); + } catch (Exception e) { + log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); } - } catch (Exception e) { - log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); - } - try { - for (int i = 0; i < finalDaysBetween.size(); i++) { - String dateDimId = finalDaysBetween.get(i); - extractOriginFormDTO.setDateId(dateDimId); + try { factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); + } catch (Exception e) { + log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); + } + } else { + //参数指定日期内，比如startDate=20210501,endDate=20210513;依次计算截止到20210501的数据.....截止到20210513的数据 + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + extractOriginFormDTO.setDateId(dateDimId); + factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); + } + } catch (Exception e) { + log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); + } + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + extractOriginFormDTO.setDateId(dateDimId); + factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId()); + } + } catch (Exception e) { + log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); } - } catch (Exception e) { - log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e); } + } finally { + countDownLatch.countDown(); } }); @@ -297,7 +316,18 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } });*/ - submitProjectRelationData(param, finalDaysBetween); + Future future = submitProjectRelationData(param, finalDaysBetween); + try { + future.get(); + } catch (Exception e) { + log.error("submitProjectRelationData exception:{}",e); + } + try { + countDownLatch.await(); + log.info("extractAll submitJob execute end,param:{}",JSON.toJSONString(param)); + } catch (InterruptedException e) { + log.error("extractAll daily InterruptedException:{}", e); + } } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java index c9e42a3a49..72888c5420 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java @@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DataSourceConstant; @@ -166,7 +165,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl logDailyEntityList) { //批量插入 @@ -175,7 +174,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl * @param topicOriginInfoList @@ -195,8 +194,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl agencyIds = result.stream().map(r -> r.getAgencyId()).distinct().collect(Collectors.toList()); + List agencyIds = result.stream().map(IssueMainDailyFormDTO::getAgencyId).distinct().collect(Collectors.toList()); List agencyInfoList = dimAgencyDao.selectAgencyInfo(agencyIds); if (CollectionUtils.isEmpty(agencyInfoList)){ throw new RenException(ExtractConstant.PARENT_AGENCY_ID_LIST); @@ -138,7 +138,9 @@ public class IssueExtractServiceImpl implements IssueExtractService { } }); }); - delAndInsertMain(customerId,dateId,result); + //过滤掉pids为空的数据 + List collect = result.stream().filter(o -> StringUtils.isNotBlank(o.getPids())).collect(Collectors.toList()); + delAndInsertMain(customerId,dateId,collect); return true; } @@ -244,7 +246,9 @@ public class IssueExtractServiceImpl implements IssueExtractService { } }); }); - delAndInsertLog(customerId,dateId,result); + //去除pids 为空的数据 + List collect = result.stream().filter(o -> StringUtils.isNotBlank(o.getPids())).collect(Collectors.toList()); + delAndInsertLog(customerId,dateId,collect); return true; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index f4f616a722..e1c74d8f30 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -319,21 +319,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { entity.setOrgType(OrgTypeConstant.AGENCY); entity.setOrgId(process.getAgencyId()); if (!process.getPids().contains(StrConstant.COLON)) { - entity.setPids(""); entity.setPid(NumConstant.ZERO_STR); } else { String[] orgArray = process.getPids().split(StrConstant.COLON); if (orgArray.length > NumConstant.ONE) { entity.setPid(orgArray[orgArray.length - NumConstant.TWO]); - String path = process.getPids().replaceAll(process.getAgencyId(), ""); - if (path.endsWith(StrConstant.COLON)) { - path = path.substring(NumConstant.ZERO, path.length() - NumConstant.ONE); - } - entity.setPids(path); } else { log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids()); entity.setPid(NumConstant.ZERO_STR); - entity.setPids(""); } } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/OrgRankStatisticsService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/OrgRankStatisticsService.java new file mode 100644 index 0000000000..6bd70ff16c --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/OrgRankStatisticsService.java @@ -0,0 +1,189 @@ +package com.epmet.service.evaluationindex.extract.toscreen; + +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; + +import java.util.Map; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/7 10:43 + */ +public interface OrgRankStatisticsService { + /** + * 网格被吹哨项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectCount(String customerId, String monthId, String dateId); + + /** + * 部门被吹哨项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getDeptProjectCount(String customerId, String monthId, String dateId); + + /** + * 组织被吹哨项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectCount(String customerId, String monthId, String dateId); + + + /** + * 网格被吹哨项目中已结案项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectClosedCount(String customerId, String monthId, String dateId); + + /** + * 部门被吹哨项目中已结案项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getDeptProjectClosedCount(String customerId, String monthId, String dateId); + + /** + * 组织被吹哨项目中已结案项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectClosedCount(String customerId, String monthId, String dateId); + + /** + * 网格被吹哨项目中自己办结项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectResolvedCount(String customerId, String monthId, String dateId); + + /** + * 部门被吹哨项目中自己办结项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getDeptProjectResolvedCount(String customerId, String monthId, String dateId); + + /** + * 组织被吹哨项目中自己办结项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectResolvedCount(String customerId, String monthId, String dateId); + + /** + * 网格自治项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectSelfCount(String customerId, String monthId, String dateId); + + /** + * 部门自治项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getDeptProjectSelfCount(String customerId, String monthId, String dateId); + + /** + * 组织自治项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectSelfCount(String customerId, String monthId, String dateId); + + /** + * 网格产生的项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectTotal(String customerId, String monthId, String dateId); + + /** + * 组织产生的项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectTotal(String customerId, String monthId, String dateId); + + /** + * 网格产生的项目数中结案的项目数 + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getGridProjectClosedTotal(String customerId, String monthId, String dateId); + + /** + * 组织产生的项目数中结案的项目数（含下级组织网格部门） + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + Map getAgencyProjectClosedTotal(String customerId, String monthId, String dateId); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankStatisticsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankStatisticsServiceImpl.java new file mode 100644 index 0000000000..730d3d9ab4 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankStatisticsServiceImpl.java @@ -0,0 +1,306 @@ +package com.epmet.service.evaluationindex.extract.toscreen.impl; + +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; +import com.epmet.service.evaluationindex.extract.toscreen.OrgRankStatisticsService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/12/7 10:43 + */ +@Service +@Slf4j +public class OrgRankStatisticsServiceImpl implements OrgRankStatisticsService { + + /** + * 网格被吹哨项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map < String, OrgStatisticsResultDTO >} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 部门被吹哨项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getDeptProjectCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织被吹哨项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 网格被吹哨项目中已结案项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectClosedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 部门被吹哨项目中已结案项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getDeptProjectClosedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织被吹哨项目中已结案项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectClosedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 网格被吹哨项目中自己办结项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectResolvedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 部门被吹哨项目中自己办结项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getDeptProjectResolvedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织被吹哨项目中自己办结项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectResolvedCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 网格自治项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectSelfCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 部门自治项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getDeptProjectSelfCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织自治项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectSelfCount(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 网格产生的项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectTotal(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织产生的项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectTotal(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 网格产生的项目数中结案的项目数 + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getGridProjectClosedTotal(String customerId, String monthId, String dateId) { + return null; + } + + /** + * 组织产生的项目数中结案的项目数（含下级组织网格部门） + * + * @param customerId + * @param monthId + * @param dateId + * @Param customerId + * @Param monthId + * @Param dateId + * @Return {@link Map< String, OrgStatisticsResultDTO>} + * @Author zhaoqifeng + * @Date 2021/12/7 10:52 + */ + @Override + public Map getAgencyProjectClosedTotal(String customerId, String monthId, String dateId) { + return null; + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java index ed5860169e..33fffebc37 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java @@ -18,7 +18,6 @@ package com.epmet.service.evaluationindex.screen.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 83bb35a03d..21a7c06860 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -40,6 +41,9 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toCollection; + /** * @dscription 省网格化平台数据上报--数据查询 * @author sun @@ -141,23 +145,28 @@ public class DataReportingServiceImpl implements DataReportingService { Map epmetCodeMap = new HashMap<>(); Result parentCustomer = operCrmOpenFeignClient.getExternalAndParentCustomerId(formDTO.getCustomerId()); if (StringUtils.isNotBlank(parentCustomer.getData())) { - customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData()); + epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData()); } Map codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());; //项目ID不为空时，因为只有一条，可以直接处理 + Map finalEpmetCodeMap = epmetCodeMap; if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) { list = projectList.stream().map(project -> { - EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap); + EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap); if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) { ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId()); dto.setOrgId(project.getOrgId()); - dto.setOrgCode(agency.getCode()); - dto.setOrgName(agency.getAgencyName()); + if (null != agency) { + dto.setOrgCode(agency.getCode()); + dto.setOrgName(agency.getAgencyName()); + } } else { ScreenCustomerGridDTO grid = screenCustomerGridService.getGridById(project.getOrgId()); dto.setOrgId(project.getOrgId()); - dto.setOrgCode(grid.getCode()); - dto.setOrgName(grid.getGridName()); + if (null != grid) { + dto.setOrgCode(grid.getCode()); + dto.setOrgName(grid.getGridName()); + } } return dto; }).collect(Collectors.toList()); @@ -166,22 +175,26 @@ public class DataReportingServiceImpl implements DataReportingService { Map agencyMap = screenCustomerAgencyService.getAgencyList(formDTO.getCustomerId()); Map gridMap = screenCustomerGridService.getGridList(formDTO.getCustomerId()); list = projectList.stream().map(project -> { - EventInfoResultDTO dto = getEventInfoResultDTO(project, epmetCodeMap, codeMap); + EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap); if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) { ScreenCustomerAgencyEntity agency = agencyMap.get(project.getOrgId()); dto.setOrgId(project.getOrgId()); - dto.setOrgCode(agency.getCode()); - dto.setOrgName(agency.getAgencyName()); + if (null != agency) { + dto.setOrgCode(agency.getCode()); + dto.setOrgName(agency.getAgencyName()); + } } else { ScreenCustomerGridDTO grid = gridMap.get(project.getOrgId()); dto.setOrgId(project.getOrgId()); - dto.setOrgCode(grid.getCode()); - dto.setOrgName(grid.getGridName()); + if (null != grid) { + dto.setOrgCode(grid.getCode()); + dto.setOrgName(grid.getGridName()); + } } return dto; }).collect(Collectors.toList()); } - return list.stream().filter(item -> StringUtils.isNotBlank(item.getEventCategory())).collect(Collectors.toList()); + return list.stream().collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(EventInfoResultDTO::getId))), ArrayList::new)); } private EventInfoResultDTO getEventInfoResultDTO(ScreenProjectDataDTO project, Map epmetCodeMap, Map codeMap) { @@ -198,8 +211,28 @@ public class DataReportingServiceImpl implements DataReportingService { "46c55cb862d6d5e6d05d2ab61a1cc07e".equals(project.getCustomerId())) { CustomerProjectCategoryDictEntity categoryEntity = codeMap.get(categoryCode); if (null != categoryEntity) { - categoryCode = categoryEntity.getEpmetCategoryCode(); - parentCode = epmetCodeMap.get(categoryEntity.getEpmetCategoryCode()).getParentCategoryCode(); + String code = categoryEntity.getEpmetCategoryCode(); + if (StringUtils.isBlank(code)) { + //没有对应平阴的分类code，那么一级分类和二级分类都为空 + categoryCode = null; + parentCode = null; + } else { + //如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类 + CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code); + if (NumConstant.ONE == epmetCode.getLevel()) { + parentCode = code; + //如果项目为一级分类 则二级分类默认给第一个 + epmetCode = epmetCodeMap.get(code.concat("01")); + if (epmetCode == null){ + log.warn(" 分类下没有子分类，无法拼接2级分类 code:{}",code); + } else { + categoryCode = epmetCode.getCategoryCode(); + } + } else { + categoryCode = code; + parentCode = epmetCode.getParentCategoryCode(); + } + } } else { categoryCode = null; parentCode = null; @@ -218,16 +251,18 @@ public class DataReportingServiceImpl implements DataReportingService { if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) { //如果是孔村的项目办结层级需要降一级 if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) { - switch (project.getFinishOrgLevel()) { - case OrgTypeConstant.DISTRICT: - dto.setCompleteLevel("04"); - break; - case OrgTypeConstant.STREET: - case OrgTypeConstant.COMMUNITY: - dto.setCompleteLevel("06"); - break; - default: - break; + if (StringUtils.isNotBlank(project.getFinishOrgLevel())) { + switch (project.getFinishOrgLevel()) { + case OrgTypeConstant.DISTRICT: + dto.setCompleteLevel("3"); + break; + case OrgTypeConstant.STREET: + case OrgTypeConstant.COMMUNITY: + dto.setCompleteLevel("4"); + break; + default: + break; + } } } else { dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel())); @@ -237,10 +272,12 @@ public class DataReportingServiceImpl implements DataReportingService { String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON); int size = orgIds.length; ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(orgIds[size - 1]); - dto.setCompleteLevel(getCompleteLevel(agency.getLevel())); + if (null != agency) { + dto.setCompleteLevel(getCompleteLevel(agency.getLevel())); + } } else { //办结组织是网格时，办结层级为网格 - dto.setCompleteLevel("07"); + dto.setCompleteLevel("5"); } } dto.setStatus(getProjectStatus(project.getProjectStatusCode())); @@ -253,15 +290,15 @@ public class DataReportingServiceImpl implements DataReportingService { private String getCompleteLevel(String level) { switch (level) { case OrgTypeConstant.PROVINCE: - return "01"; + return "0"; case OrgTypeConstant.CITY: - return "02"; + return "1"; case OrgTypeConstant.DISTRICT: - return "03"; + return "2"; case OrgTypeConstant.STREET: - return "04"; + return "3"; case OrgTypeConstant.COMMUNITY: - return "06"; + return "4"; default: return null; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java index cec5da65e6..940a77d134 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java @@ -173,6 +173,7 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl StringUtils.isNotBlank(item.getAgencyId())).collect(Collectors.toList()); delAndInsertParty(partyMemberList,customerId,dateId); }); }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql index b5e87ed6f5..9414daa14d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql @@ -1,5 +1,5 @@ -alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; -alter table fact_index_community_sub_score - add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; -alter table fact_index_agency_sub_score - add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; \ No newline at end of file +# alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; +# alter table fact_index_community_sub_score +# add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; +# alter table fact_index_agency_sub_score +# add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql index a450ab5eec..60b70ed908 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql @@ -1,47 +1,47 @@ --- epmet_data_statistical 库执行以下脚本 -CREATE TABLE `fact_group_act_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd', - `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', - `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', - `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', - `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', - `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', - `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', - `LEVEL` int(11) NOT NULL COMMENT '分类等级', - `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据', - `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据', - `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析'; - - -CREATE TABLE `fact_group_act_monthly` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM', - `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', - `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', - `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', - `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', - `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', - `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', - `LEVEL` int(11) NOT NULL COMMENT '分类等级', - `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数', - `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数', - `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析'; \ No newline at end of file +# -- epmet_data_statistical 库执行以下脚本 +# CREATE TABLE `fact_group_act_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd', +# `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', +# `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', +# `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', +# `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', +# `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', +# `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', +# `LEVEL` int(11) NOT NULL COMMENT '分类等级', +# `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据', +# `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据', +# `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析'; +# +# +# CREATE TABLE `fact_group_act_monthly` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', +# `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM', +# `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', +# `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', +# `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', +# `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', +# `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', +# `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', +# `LEVEL` int(11) NOT NULL COMMENT '分类等级', +# `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数', +# `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数', +# `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql index e83d7f5313..481a0eb97f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql @@ -1,110 +1,110 @@ --- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计 - -CREATE TABLE `fact_agency_govern_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', - `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id', - `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）', - `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id', - `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id', - `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', - `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', - `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数', - `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数', - `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数', - `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数', - `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数', - `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数', - `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，', - `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，', - `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数', - `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数', - `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数', - `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数', - `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数', - `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计'; - -CREATE TABLE `fact_grid_govern_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', - `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', - `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', - `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id', - `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', - `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', - `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数', - `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数', - `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数', - `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数', - `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数', - `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数', - `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，', - `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，', - `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数', - `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数', - `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数', - `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数', - `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0', - `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0', - `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14', - `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数', - `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数', - `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计'; - -# 小组成员添加是否是党员 -ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily` - ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`; - -# 项目主表添加结案项目是否满意 -ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` - ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`; - -# 添加治理能力按日统计表 -CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` ( - `ID` varchar(64) NOT NULL COMMENT 'ID 主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', - `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id', - `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd', - `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id', - `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id', - `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称', - `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率', - `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率', - `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率', - `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-治理能力排行数据(按日统计)'; \ No newline at end of file +# -- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计 +# +# CREATE TABLE `fact_agency_govern_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', +# `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id', +# `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）', +# `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id', +# `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id', +# `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', +# `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', +# `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数', +# `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数', +# `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数', +# `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数', +# `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数', +# `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数', +# `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，', +# `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，', +# `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数', +# `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数', +# `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数', +# `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数', +# `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数', +# `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数', +# `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致', +# `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计'; +# +# CREATE TABLE `fact_grid_govern_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', +# `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', +# `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', +# `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id', +# `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', +# `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', +# `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数', +# `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数', +# `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数', +# `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数', +# `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数', +# `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数', +# `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，', +# `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，', +# `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数', +# `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数', +# `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数', +# `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数', +# `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0', +# `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0', +# `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14', +# `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数', +# `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数', +# `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数', +# `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致', +# `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计'; +# +# # 小组成员添加是否是党员 +# ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily` +# ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`; +# +# # 项目主表添加结案项目是否满意 +# ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` +# ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`; +# +# # 添加治理能力按日统计表 +# CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` ( +# `ID` varchar(64) NOT NULL COMMENT 'ID 主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', +# `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id', +# `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd', +# `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid', +# `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id', +# `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id', +# `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称', +# `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率', +# `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率', +# `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率', +# `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL COMMENT '乐观锁', +# `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-治理能力排行数据(按日统计)'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql index 367af0a9b7..36b0235e8a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql @@ -1 +1 @@ -ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`; \ No newline at end of file +# ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql index 15cca09546..fcd6893485 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql @@ -1,113 +1,113 @@ -CREATE TABLE `index_explain` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `TITLE` varchar(32) NOT NULL COMMENT '名称', - `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code', - `MEANING` varchar(256) NOT NULL COMMENT '含义', - `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）', - `PID` varchar(16) NOT NULL COMMENT '父ID', - `SORT` int(11) NOT NULL COMMENT '排序', - `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；', - `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标说明文案'; - -#插入指标结束 -BEGIN; -INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -COMMIT; - -#更新含义 -update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs'; -update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs'; -update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs'; -update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs'; -update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts'; -update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms'; -update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans'; -update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl'; -update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml'; -update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl'; -update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl'; -update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm'; -update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm'; -update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms'; -update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms'; -update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql'; -update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs'; -update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd'; -update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml'; -update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml'; -update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz'; -update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs'; -update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd'; -update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl'; -update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl'; -update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd'; -update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd'; -update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb'; -update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz'; - +# CREATE TABLE `index_explain` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `TITLE` varchar(32) NOT NULL COMMENT '名称', +# `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code', +# `MEANING` varchar(256) NOT NULL COMMENT '含义', +# `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）', +# `PID` varchar(16) NOT NULL COMMENT '父ID', +# `SORT` int(11) NOT NULL COMMENT '排序', +# `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；', +# `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub', +# `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标说明文案'; +# +# #插入指标结束 +# BEGIN; +# INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# COMMIT; +# +# #更新含义 +# update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms'; +# update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans'; +# update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl'; +# update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml'; +# update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl'; +# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl'; +# update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm'; +# update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm'; +# update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms'; +# update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms'; +# update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs'; +# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml'; +# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml'; +# update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs'; +# update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl'; +# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl'; +# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd'; +# update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz'; +# diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql index 1bbb8b6e4c..deb2572649 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql @@ -1,22 +1,22 @@ -#修改党员相关 三会一课权重 -UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong'; -UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi'; -UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong'; -UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs'; - -UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl'; -UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs'; -UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc'; - -#开发和测试的 对应的客户已经修改执行完了 -#修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山 -UPDATE index_group_detail SET WEIGHT = 0.1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong'; -UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi'; -UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong'; -UPDATE index_group_detail SET WEIGHT = 1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs'; - -UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl'; -UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs'; -UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc'; +# #修改党员相关 三会一课权重 +# UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong'; +# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi'; +# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong'; +# UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs'; +# +# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl'; +# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs'; +# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc'; +# +# #开发和测试的 对应的客户已经修改执行完了 +# #修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山 +# UPDATE index_group_detail SET WEIGHT = 0.1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong'; +# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi'; +# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong'; +# UPDATE index_group_detail SET WEIGHT = 1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs'; +# +# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl'; +# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs'; +# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql index 5d470eaec9..fecb05a6c4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql @@ -1,4 +1,4 @@ --- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL - --- epmet_evaluation_index 、 epmet_data_statistical_display 库执行以下： -ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL; \ No newline at end of file +# -- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL +# +# -- epmet_evaluation_index 、 epmet_data_statistical_display 库执行以下： +# ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 64682b5dd4..94ed20f557 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -539,58 +539,72 @@ a.count AS "sum", IFNULL( b.count, 0 ) AS "count" FROM - ( SELECT - GRID_ID, - COUNT( ID ) AS "count" - FROM - fact_origin_project_main_daily - WHERE - CUSTOMER_ID = #{customerId} - AND MONTH_ID = #{monthId} - AND GRID_ID != '' - GROUP BY GRID_ID ) a - LEFT JOIN - ( SELECT + ( + SELECT GRID_ID, COUNT( ID ) AS "count" - FROM fact_origin_project_main_daily + FROM + fact_origin_project_main_daily WHERE - PROJECT_STATUS = 'closed' - AND CUSTOMER_ID = #{customerId} + CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND GRID_ID != '' - GROUP BY GRID_ID ) b - ON a.GRID_ID = b.GRID_ID + GROUP BY + GRID_ID ) a + LEFT JOIN ( + SELECT + a.GRID_ID, + COUNT( a.ID ) AS "count" + FROM + fact_origin_project_main_daily a + INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID + AND b.CUSTOMER_ID = #{customerId} + AND b.ACTION_CODE = 'close' + AND b.MONTH_ID = #{monthId} + WHERE + a.PROJECT_STATUS = 'closed' + AND a.CUSTOMER_ID = #{customerId} + AND a.MONTH_ID = #{monthId} + AND a.GRID_ID != '' + GROUP BY + GRID_ID) b ON a.GRID_ID = b.GRID_ID diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 07226b1c40..79a1c7b8eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -197,110 +197,158 @@ diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx index cb442ccfe9..1b8299fbab 100644 Binary files a/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx and b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx differ diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml index 088bfeb2dd..c6d7c0d65c 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.0 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1 ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index b1218dbe2c..fa8fd80209 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -278,7 +278,7 @@ false - false + true true diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index bbf8441c97..bdbb5be1ee 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.41 ports: - "8103:8103" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 4e27c15d03..f3de138c12 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.26 + 0.3.41 com.epmet epmet-common-service @@ -261,7 +261,7 @@ false - false + true true diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java index becc72c341..149249599b 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -44,6 +45,7 @@ public class ExternalCustomerController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("add") public Result add(@RequestBody ExternalCustomerFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.AddExternalCustomerGroup.class); @@ -57,6 +59,7 @@ public class ExternalCustomerController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("update") public Result update(@RequestBody ExternalCustomerFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.UpdateExternalCustomerGroup.class); diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml index 7ba47e2fc3..caa3059dad 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index bebc41ab98..e0d4e979b0 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.13 + 0.0.20 com.epmet @@ -340,7 +340,7 @@ false - false + true true diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandDetailFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandDetailFormDTO.java new file mode 100644 index 0000000000..25ec764f3f --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form.demand; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class DemandDetailFormDTO implements Serializable { + private static final long serialVersionUID = 514538389753713095L; + public interface AddUserInternalGroup { + } + + @NotBlank(message = "demandRecId不能为空", groups = AddUserInternalGroup.class) + private String demandRecId; + + + @NotBlank(message = "tokenDto获取客户id不能为空", groups = IcResiUserDemandFromDTO.AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java index de813e286f..51d334d874 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java @@ -11,10 +11,29 @@ public class IcResiUserDemandFromDTO implements Serializable { public interface AddUserInternalGroup { } + + /** + * 居民信息录入的居民的id + */ @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) private String userId; + + /** + * icresiuser/persondata接口返参中有此值 + */ + private String epmetUserId; + @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) private Integer pageSize; + + /** + * 研判分析界面，查看同类型的需求可以用此接口，只需传入分类编码 + */ + private String firstCategoryCode; + + @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class) + private String customerId; + } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java index d1eac19bff..feb5c70b84 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java @@ -22,7 +22,8 @@ public class DemandRecResultDTO implements Serializable { private String categoryCode; private String parentCode; private String categoryName; - + private String firstCategoryCode; + private String firstCategoryName; //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java index 079ed8ce0d..e4792920b3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java @@ -1,10 +1,33 @@ package com.epmet.dto.result.demand; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class IcResiUserReportDemandRes implements Serializable { private static final long serialVersionUID = 7043350476644105434L; + + private String demandRecId; + + @JsonIgnore + private String categoryCode; + + @JsonIgnore + private String parentCode; + + private String categoryName; + + private String content; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date wantServiceTime; + + @JsonIgnore + private String status; + + private String statusName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index c31a8c85a3..e2cec97f9c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.57 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.64 ports: - "8111:8111" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 648896a0c9..3aeab54847 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.57 + 0.0.64 com.epmet epmet-heart @@ -269,7 +269,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java index 268e936521..e4aa2f1660 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -42,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("actcustomized") public class ActCustomizedController { - + @Autowired private ActCustomizedService actCustomizedService; @@ -68,6 +69,7 @@ public class ActCustomizedController { * @description 保存自定义配置 * @Date 2020/7/20 17:25 **/ + @NoRepeatSubmit @RequirePermission(requirePermission = RequirePermissionEnum.MORE_HEART_CUSTOMIZED_SAVE) @PostMapping("save") public Result saveConfigs(@RequestBody SaveActCustomizedFormDTO formDTO){ @@ -89,4 +91,4 @@ public class ActCustomizedController { CustomerHeartConfigsResultDTO resultDTO = actCustomizedService.getCustomerHeartConfigs(formDTO); return new Result().ok(resultDTO); } -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 27b340c61c..9ce587e7b3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -184,13 +184,33 @@ public class IcUserDemandRecController { /** - * 数据分析-个人档案，居民需求列表 - * @param fromDTO + * 数据分析-个人档案，居民需求列表table + * + * @param formDTO * @return */ @PostMapping("mydemand") - public Result> queryMyDemand(@RequestBody IcResiUserDemandFromDTO fromDTO){ - ValidatorUtils.validateEntity(fromDTO,IcResiUserDemandFromDTO.AddUserInternalGroup.class); - return null; + public Result> queryMyDemand(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserDemandFromDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,IcResiUserDemandFromDTO.AddUserInternalGroup.class); + return new Result>().ok(icUserDemandRecService.queryMyDemand(formDTO)); } + + /** + * 数据分析-个人档案、居民需求列表-查看需求详情 + * + * @param formDTO + * @return + */ + @PostMapping("demandDetail") + public Result queryDemandDetail(@LoginUser TokenDto tokenDto, @RequestBody DemandDetailFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,DemandDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(icUserDemandRecService.queryDemandDetail(formDTO)); + } + + + + + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java index cf2625d680..ed09bfd858 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java @@ -65,4 +65,5 @@ public interface IcResiDemandDictDao extends BaseDao { List selectSecondCodes(@Param("customerId") String customerId, @Param("cateogryCodes") List categoryCodes); + String selectNameByCode(@Param("customerId")String customerId, @Param("categoryCode") String categoryCode); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java index 12bc2f68b4..a06f831778 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java @@ -18,10 +18,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.demand.IcResiUserDemandFromDTO; import com.epmet.dto.form.demand.UserDemandPageFormDTO; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.entity.IcUserDemandRecEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +39,21 @@ public interface IcUserDemandRecDao extends BaseDao { List pageSelect(UserDemandPageFormDTO formDTO); + + /** + * 数据分析-个人档案，居民需求列表table + * + * @param formDTO + * @return + */ + List selectUserDemand(IcResiUserDemandFromDTO formDTO); + + /** + * 数据分析-个人档案，居民需求详情 + * + * @param customerId + * @param demandRecId + * @return + */ + DemandRecResultDTO selectDemandRecDetail(@Param("customerId") String customerId, @Param("demandRecId") String demandRecId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java index 3836539181..ce9c4741a7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java @@ -109,4 +109,13 @@ public interface IcResiDemandDictService extends BaseService listByCodes(String customerId, List categoryCodes); + + /** + * 查询当前分类的名称 + * + * @param customerId + * @param categoryCode + * @return + */ + String getCategoryName(String customerId, String categoryCode); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index a0b3799d4e..e3b719615e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.entity.IcUserDemandRecEntity; import java.util.List; @@ -127,4 +128,20 @@ public interface IcUserDemandRecService extends BaseService queryMyDemand(IcResiUserDemandFromDTO formDTO); + + /** + * 数据分析-个人档案、居民需求列表-查看需求详情 + * + * @param formDTO + * @return + */ + DemandRecResultDTO queryDemandDetail(DemandDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java index 4fd9a2b193..520e367177 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -227,5 +228,18 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl page(Map params) { @@ -238,6 +244,17 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl> reportTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); + Map reportTypeMap=reportTypeRes.success()&& MapUtils.isNotEmpty(reportTypeRes.getData())?reportTypeRes.getData():new HashMap<>(); + + Result> statusRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map statusMap=statusRes.success()&& MapUtils.isNotEmpty(statusRes.getData())?statusRes.getData():new HashMap<>(); + + Result> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); + Map serviceTypeMap=serviceTypeRes.success()&& MapUtils.isNotEmpty(serviceTypeRes.getData())?serviceTypeRes.getData():new HashMap<>(); + for(DemandRecResultDTO res:list){ if (null != gridInfoMap && gridInfoMap.containsKey(res.getGridId())) { res.setGridName(gridInfoMap.get(res.getGridId()).getGridName()); @@ -246,12 +263,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); @@ -437,4 +457,100 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl queryMyDemand(IcResiUserDemandFromDTO formDTO) { + /*//1、查询当前居民在小程序里是否有用户id + ResiUserFormDTO resiUserFormDTO=new ResiUserFormDTO(); + resiUserFormDTO.setCustomerId(formDTO.getCustomerId()); + resiUserFormDTO.setIcResiUserId(formDTO.getUserId()); + Result userRes=epmetUserOpenFeignClient.findUser(resiUserFormDTO); + if(!userRes.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"/epmetuser/user/finduser接口异常","查找居民端小程序用户信息异常"); + } + formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/ + //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来 + + //2、小程序内自己上报+赋能平台待录入的 + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO)); + List list = pageInfo.getList(); + if (CollectionUtils.isNotEmpty(list)) { + // 1、状态字典 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + //2、查询分类名称 + List categoryCodes = list.stream().map(IcResiUserReportDemandRes::getCategoryCode).collect(Collectors.toList()); + List dictList = demandDictService.listByCodes(formDTO.getCustomerId(), categoryCodes); + Map dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); + + for (IcResiUserReportDemandRes resDto : list) { + resDto.setStatusName(statusMap.containsKey(resDto.getStatus()) ? statusMap.get(resDto.getStatus()) : StrConstant.EPMETY_STR); + if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) { + resDto.setCategoryName(dictMap.get(resDto.getCategoryCode())); + } + } + } + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 数据分析-个人档案、居民需求列表-查看需求详情 + * + * @param formDTO + * @return + */ + @Override + public DemandRecResultDTO queryDemandDetail(DemandDetailFormDTO formDTO) { + DemandRecResultDTO res = baseDao.selectDemandRecDetail(formDTO.getCustomerId(), formDTO.getDemandRecId()); + if (null != res) { + CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); + customerGridFormDTO.setGridId(res.getGridId()); + Result gridInfoRes = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO); + res.setGridName(gridInfoRes.success() && null != gridInfoRes.getData() ? gridInfoRes.getData().getGridNamePath() : StrConstant.EPMETY_STR); + + res.setCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getCategoryCode())); + res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),res.getFirstCategoryCode())); + if (UserDemandConstant.VOLUNTEER.equals(res.getServiceType())) { + // 如果服务方是志愿者，需要查询小程序端的志愿者姓名 + List userIdList = Arrays.asList(res.getServerId()); + Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常"); + } + res.setServiceName(userInfoRes.getData().get(NumConstant.ZERO).getRealName()); + } + //查询字典表 + Result> reportTypeRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode()); + Map reportTypeMap = reportTypeRes.success() && MapUtils.isNotEmpty(reportTypeRes.getData()) ? reportTypeRes.getData() : new HashMap<>(); + + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + + Result> serviceTypeRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode()); + Map serviceTypeMap = serviceTypeRes.success() && MapUtils.isNotEmpty(serviceTypeRes.getData()) ? serviceTypeRes.getData() : new HashMap<>(); + + //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help + res.setReportTypeName(reportTypeMap.containsKey(res.getReportType()) ? reportTypeMap.get(res.getReportType()) : StrConstant.EPMETY_STR); + + //待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished + res.setStatusName(statusMap.containsKey(res.getStatus()) ? statusMap.get(res.getStatus()) : StrConstant.EPMETY_STR); + + //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； + res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR); + } + return res; + } + + + + + + + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml index 6b49401adf..0e6293002d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml @@ -223,4 +223,17 @@ + + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 72ac018284..8aed916dee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -70,7 +70,12 @@ s.SERVICE_END_TIME as serviceEndTime, IFNULL(s.FINISH_DESC,'') as finishDesc, '' AS serviceShowName, - s.id as serviceId + s.id as serviceId, + ( + case when r.PARENT_CODE !='0' then r.PARENT_CODE + ELSE R.CATEGORY_CODE + END + ) as firstCategoryCode FROM ic_user_demand_rec r left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' ) @@ -116,4 +121,82 @@ order by r.WANT_SERVICE_TIME desc,r.CREATED_TIME asc + + + + \ No newline at end of file diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index eb51914b5a..13962e8e3a 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.43 ports: - "8084:8084" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 769cfab32a..4ebf4f1fd3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.43 com.epmet epmet-job @@ -251,7 +251,7 @@ - false + true true diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 23750b4168..b2d13dc34c 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.53 ports: - "8085:8085" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 87d40ea5fb..622c443eb5 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.53 com.epmet epmet-message @@ -332,7 +332,7 @@ - false + true true diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index c58715456a..88849c5796 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.38 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index e8b08e97cc..5883128ed8 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.38 com.epmet epmet-oss @@ -260,7 +260,7 @@ false - false + true true diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java new file mode 100644 index 0000000000..d4a8fb1f89 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class IcResiPointPageFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) + private String epmetUserId; + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) + private Integer pageSize; + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java new file mode 100644 index 0000000000..68b73f61ae --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ResiPointPageResDTO implements Serializable { + private String title; + private String id; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date dateTime; + + /** + * +100 -25 + * */ + private String point; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java index b293ae4478..408c96a5c6 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description 居民端积分总排行、周排行、月排行接口返参DTO @@ -15,6 +14,10 @@ import java.util.List; public class ResiPointRankListResultDTO implements Serializable { private static final long serialVersionUID = 685408245193506541L; + /** + * 用户Id + */ + private String userId; /** * 当前用户昵称 * */ diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index fb22688a83..7203606525 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.60 ports: - "8112:8112" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 1a4f6eb6f9..89c84eb878 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.44 + 0.0.60 epmet-point com.epmet @@ -284,7 +284,7 @@ false - false + true true diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 795f557449..0b19244e0a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -115,6 +116,18 @@ public class ResiPointController { return new Result>().ok(pointActionLogService.getMyPointRecord(pageUserParam)); } + /** + * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录 + * + * @param formDTO + * @return + */ + @PostMapping("pageuserpoint") + public Result> pageUserPoint(@RequestBody IcResiPointPageFormDTO formDTO ){ + ValidatorUtils.validateEntity(formDTO,IcResiPointPageFormDTO.AddUserInternalGroup.class); + return new Result>().ok(pointActionLogService.pageUserPoint(formDTO)); + } + /** * @Description 查找指定用户的积分兑换记录 * @param dto diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java index 59437dcff3..c69673d314 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java @@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.entity.PointVerificationStatisticalDailyEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; -import com.epmet.entity.UserPointTotalEntity; import com.epmet.service.PointVerificationStatisticalDailyService; import com.epmet.service.UserPointStatisticalDailyService; import com.epmet.service.UserPointTotalService; @@ -62,10 +61,5 @@ public class TestController { pointVerificationStatisticalDailyService.testUnixKey(entity); return new Result(); } - @PostMapping("testtotal") - public Result testTotal(@RequestBody UserPointTotalEntity entity){ - userPointTotalService.testInsertOrUpdate(entity); - return new Result(); - } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java index 1db465d453..ae9cb21307 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java @@ -18,8 +18,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.UserPointActionLogEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -69,4 +71,6 @@ public interface UserPointActionLogDao extends BaseDao @Param("userId")String userId, @Param("type")String type, @Param("dateId")String dateId); + + List selectPageResiPoin(IcResiPointPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index 314b9b46db..b156816c80 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -22,9 +22,11 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.UserPointActionLogEntity; import dto.form.SendPointFormDTO; @@ -143,4 +145,12 @@ public interface UserPointActionLogService extends BaseService */ List queryMyPointTaskList(MyPointTaskFormDTO formDTO); + + /** + * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录 + * + * @param formDTO + * @return + */ + PageData pageUserPoint(IcResiPointPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java index e0faee76d1..8c9977dce8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java @@ -18,17 +18,13 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.UserPointTotalDTO; import com.epmet.dto.form.CommonUserFormDTO; -import com.epmet.dto.form.ResiCommonUserIdFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.ResiPointDetailResultDTO; import com.epmet.dto.result.ResiPointRankListResultDTO; import com.epmet.entity.UserPointTotalEntity; import java.util.List; -import java.util.Map; /** * 用户积分总计 @@ -38,66 +34,6 @@ import java.util.Map; */ public interface UserPointTotalService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-07-20 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-07-20 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return UserPointTotalDTO - * @author generator - * @date 2020-07-20 - */ - UserPointTotalDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-07-20 - */ - void save(UserPointTotalDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-07-20 - */ - void update(UserPointTotalDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-07-20 - */ - void delete(String[] ids); - /** * @Description 获取指定居民的积分信息 * @param param @@ -125,8 +61,6 @@ public interface UserPointTotalService extends BaseService **/ void insertOrUpdate(UserPointTotalEntity entity); - void testInsertOrUpdate(UserPointTotalEntity entity); - /** * @Description 获取指定居民的积分信息 - 使用客户Id匹配，兼容多客户情况 * @param customerUserParam @@ -135,4 +69,4 @@ public interface UserPointTotalService extends BaseService * @date 2020.07.22 15:58 **/ ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam); -} \ No newline at end of file +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 50b854964d..c27498a82b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -36,10 +36,12 @@ import com.epmet.dto.BizPointUserTotalDetailDTO; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.result.MyPointTaskResultDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; +import com.epmet.dto.result.ResiPointPageResDTO; import com.epmet.entity.PointRuleEntity; import com.epmet.entity.UserPointActionLogEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; @@ -50,6 +52,7 @@ import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; import com.epmet.utils.RuleCycleEnum; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import dto.form.SendPointFormDTO; import lombok.extern.slf4j.Slf4j; @@ -559,4 +562,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pageUserPoint(IcResiPointPageFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getEpmetUserId())){ + return new PageData(new ArrayList<>(),NumConstant.ZERO); + } + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectPageResiPoin(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index e7b476d99d..16400b1eaa 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -148,7 +149,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList()); //查询用户昵称 - Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); - boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); - - for (int i = NumConstant.ZERO; i < rankList.size(); i++) { - ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class); + Result> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + Map userInfoMap = new HashMap<>(); + if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){ + userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1,o2)->o1)); + } + for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) { + ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class); ResiPointRankingResultDTO target = new ResiPointRankingResultDTO(); - target.setRanking(rankList.get(i).getRank()); - target.setPoint(rankList.get(i).getTotalPoint()); - if(userRequestCallback) { - target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname()); - target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl()); + target.setRanking(resiPointRankResultDTO.getRank()); + target.setPoint(resiPointRankResultDTO.getTotalPoint()); + target.setNickname(StrConstant.EPMETY_STR); + target.setHeadImgUrl(StrConstant.EPMETY_STR); + UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId()); + if (infoResultDTO != null) { + target.setNickname(infoResultDTO.getNickname()); + target.setHeadImgUrl(infoResultDTO.getHeadImgUrl()); } resultObj.setRankList(target); result.add(resultObj); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 07243fd0ab..7ba7c79b4e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -17,34 +17,27 @@ package com.epmet.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserPointTotalDao; -import com.epmet.dto.UserPointTotalDTO; import com.epmet.dto.form.CommonUserFormDTO; -import com.epmet.dto.form.ResiCommonUserIdFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.UserPointTotalService; -import com.epmet.utils.DimIdGenerator; -import com.epmet.utils.ModuleConstant; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -57,62 +50,9 @@ import java.util.stream.Collectors; @Slf4j public class UserPointTotalServiceImpl extends BaseServiceImpl implements UserPointTotalService { - @Autowired EpmetUserOpenFeignClient epmetUserOpenFeignClient; - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, UserPointTotalDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, UserPointTotalDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public UserPointTotalDTO get(String id) { - UserPointTotalEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, UserPointTotalDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(UserPointTotalDTO dto) { - UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(UserPointTotalDTO dto) { - UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - /** * @Description 获取指定居民的积分信息 * @param param @@ -145,8 +85,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl userIdParam = new LinkedList<>(); userIdParam.add(pointRankFormDTO.getUserId()); - Result> myResiInfoResult = - epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam); + Result> myResiInfoResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam); if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){ if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) { //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码 @@ -204,19 +143,23 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList()); //查询用户昵称 - Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); - boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); - - for (int i = NumConstant.ZERO; i < rankList.size(); i++) { - ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class); + Result> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + Map userInfoMap = new HashMap<>(); + if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){ + userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1, o2)->o1)); + } + for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) { + ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class); ResiPointRankingResultDTO target = new ResiPointRankingResultDTO(); - target.setRanking(rankList.get(i).getRank()); - target.setPoint(rankList.get(i).getTotalPoint()); - if(userRequestCallback) { - target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname()); - target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl()); + target.setRanking(resiPointRankResultDTO.getRank()); + target.setPoint(resiPointRankResultDTO.getTotalPoint()); + target.setNickname(StrConstant.EPMETY_STR); + target.setHeadImgUrl(StrConstant.EPMETY_STR); + UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId()); + if (infoResultDTO != null) { + target.setNickname(infoResultDTO.getNickname()); + target.setHeadImgUrl(infoResultDTO.getHeadImgUrl()); } resultObj.setRankList(target); result.add(resultObj); @@ -234,21 +177,6 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl + + + + UPDATE issue_project_category_dict SET diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index 2bb561026b..9e3c87d67b 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47 ports: - "8098:8098" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b8206f3b95..c643659b07 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.36 + 0.3.47 com.epmet gov-mine @@ -233,7 +233,7 @@ false - false + true diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java index c34d3c5870..1949f6d8a8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java @@ -31,11 +31,12 @@ import java.io.Serializable; public class CustomerGridFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** * 网格Id */ - @NotBlank(message = "网格ID不能为空") + @NotBlank(message = "网格ID不能为空", groups = {Grid.class}) private String gridId; + public interface Grid{} + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index a42028726b..256ac7b0e6 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.132 ports: - "8092:8092" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 7b2a84d8dd..0177e4b4cd 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.97 + 0.3.132 com.epmet gov-org @@ -323,7 +323,7 @@ false - false + true true diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 2780e25b56..0b58b4d6f0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -103,6 +103,7 @@ public class CustomerGridController { */ @PostMapping("getcustomergridbygridid") public Result getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO) { + ValidatorUtils.validateEntity(customerGridFormDTO, CustomerGridFormDTO.Grid.class); return customerGridService.getCustomerGridByGridId(customerGridFormDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java index c950793f86..2a5997aa34 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java @@ -17,6 +17,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -50,7 +51,7 @@ import java.util.Map; @RestController @RequestMapping("customerpartybranch") public class CustomerPartyBranchController { - + @Autowired private CustomerPartyBranchService customerPartyBranchService; @@ -66,6 +67,7 @@ public class CustomerPartyBranchController { return new Result().ok(data); } + @NoRepeatSubmit @PostMapping("save") public Result save(@RequestBody CustomerPartyBranchDTO dto){ //效验数据 @@ -142,4 +144,4 @@ public class CustomerPartyBranchController { public Result> getBranchOption(@RequestBody CustomerPartyBranchDTO formDTO){ return new Result>().ok(customerPartyBranchService.getBranchOption(formDTO.getGridId())); } -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java new file mode 100644 index 0000000000..8d18c2a7ea --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Data +public class PageUserReportEventFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) + private String epmetUserId; + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) + private Integer pageSize; + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java new file mode 100644 index 0000000000..745febe364 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/7 9:55 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisFormDTO implements Serializable { + + private static final long serialVersionUID = 4911448213428751186L; + + public interface ProjectDistributionAnalysisForm{} + + @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) + private String date; + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java new file mode 100644 index 0000000000..a32b7125ea --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/12/7 9:40 上午 + * @DESC + */ +@Data +public class CategoryListDTO implements Serializable { + + private static final long serialVersionUID = 2782140672250580404L; + + /** + * 分类编码 + */ + private String categoryCode; + + /** + * 分类名字 + */ + private String categoryName; + + /** + * 个数 + */ + private Integer count; + + public CategoryListDTO() { + this.categoryCode = ""; + this.categoryName = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java new file mode 100644 index 0000000000..2f86cdef7d --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java @@ -0,0 +1,9 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PageUserReportEventResDTO implements Serializable { +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java new file mode 100644 index 0000000000..b31ca841b5 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2021/12/7 11:18 上午 + * @DESC + */ +@Data +public class ProjectCategoryByDateDTO implements Serializable { + + private static final long serialVersionUID = -6620068264792270703L; + + /** + * 项目创建时间 + */ + private Date createdTime; + + /** + * 分类编码 + */ + private String categoryCode; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java new file mode 100644 index 0000000000..0e991a98e0 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/7 9:38 上午 + * @DESC + */ +@Data +public class ProjectDistributionAnalysisLeftResultDTO implements Serializable { + + private static final long serialVersionUID = -5694808164804517466L; + + /** + * 时间段 + */ + private String time; + + /** + * 分类集合 + */ + private List categoryList; +} diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index d472c2ac26..e7d2bcac22 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.83 ports: - "8102:8102" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index f49d89d16a..c04583b7d5 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.48 + 0.3.83 gov-project com.epmet @@ -287,7 +287,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java index ff9417e6ca..9d86baccde 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java @@ -18,8 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; @@ -53,7 +52,7 @@ import java.util.Map; @RestController @RequestMapping("projectcategory") public class ProjectCategoryController { - + @Autowired private ProjectCategoryService projectCategoryService; @@ -118,6 +117,7 @@ public class ProjectCategoryController { * @Description 项目：保存/修改分类 * @Author sun **/ + @NoRepeatSubmit @PostMapping("save") public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody ProjectSaveCategoryFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -136,4 +136,4 @@ public class ProjectCategoryController { return new Result>().ok(projectCategoryService.getProjectCategoryList(formDTO)); } -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 46de571a19..085cc4c333 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -17,7 +17,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -31,6 +33,7 @@ import com.epmet.dto.result.*; import com.epmet.excel.ProjectExcel; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import com.epmet.service.ProjectService; +import jdk.nashorn.internal.parser.Token; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -271,4 +274,17 @@ public class ProjectController { return new Result>().ok(projectService.getUnResolvedListByGrid(formDTO)); } + /** + * @Description 【社区治理】项目分布分析-左边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/7 10:02 上午 + */ + @PostMapping("projectdistributionanalysisleft") + public Result> projectDistributionAnalysisLeft(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class); + return new Result>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java index 870c50be7d..84d965f2d0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java @@ -18,15 +18,15 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ProjectTagsDTO; import com.epmet.dto.form.ProjectTagHookFormDTO; import com.epmet.excel.ProjectTagsExcel; @@ -48,7 +48,7 @@ import java.util.Map; @RestController @RequestMapping("projecttags") public class ProjectTagsController { - + @Autowired private ProjectTagsService projectTagsService; @@ -64,14 +64,7 @@ public class ProjectTagsController { return new Result().ok(data); } - /** - * @Description 保存项目与标签的关联并更新标签热度 - * @param dto - * @param token - * @return com.epmet.commons.tools.utils.Result - * @author wangc - * @date 2021.03.20 02:34 - */ + @NoRepeatSubmit @PostMapping("save") public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){ dto.setCustomerId(token.getCustomerId()); @@ -104,4 +97,4 @@ public class ProjectTagsController { ExcelUtils.exportExcelToTarget(response, null, list, ProjectTagsExcel.class); } -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 1b69e0b039..09dcb021f8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -213,4 +214,18 @@ public class ResiEventController { Result queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId) { return new Result().ok(resiEventService.queryResiEventManageRedDot(agencyId)); } + + /** + * 数据分析-个人档案-上报事件列表 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author yinzuomei + * @date 2021/8/3 14:27 + */ + @PostMapping("pageuserreported") + public Result> pageUserReported(@RequestBody PageUserReportEventFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiEventService.pageUserReported(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 0040584f81..4f65e09ab8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -217,4 +217,14 @@ public interface ProjectDao extends BaseDao { EventProjectInfoDTO selectEventProjectInfo(@Param("projectId")String projectId); List selectByOriginId(String originId); + + /** + * @Description 根据日期查询项目分类 + * @param date + * @param orgId + * @author zxc + * @date 2021/12/7 2:43 下午 + */ + List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java new file mode 100644 index 0000000000..233f4d5feb --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java @@ -0,0 +1,20 @@ +package com.epmet.service; + +import com.epmet.entity.ProjectEntity; +import com.epmet.entity.ProjectProcessEntity; +import com.epmet.entity.ProjectStaffEntity; + +import java.util.List; + +/** + * 上链service接口 + */ +public interface BlockChainUploadService { + + /** + * 数据上链 + * @param processEntity 处理进展entity + * @param assignedStaffEntities 指派给的工作人员entity + */ + void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId); +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 1f0fd17a0d..7a780592e1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -19,6 +19,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -331,4 +332,14 @@ public interface ProjectService extends BaseService { List getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO); List getByOriginId(String eventId); + + /** + * @Description 【社区治理】项目分布分析-左边 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/12/7 10:02 上午 + */ + List projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index 38d4916acc..cabf11aeb7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,6 +1,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -129,4 +130,6 @@ public interface ResiEventService extends BaseService { * @date 2021/8/6 13:57 */ ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId); + + PageData pageUserReported(PageUserReportEventFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java new file mode 100644 index 0000000000..0d745d23cc --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java @@ -0,0 +1,147 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.dao.ProjectStaffDao; +import com.epmet.dto.form.*; +import com.epmet.entity.ProjectEntity; +import com.epmet.entity.ProjectProcessEntity; +import com.epmet.entity.ProjectStaffEntity; +import com.epmet.feign.EpmetThirdOpenFeignClient; +import com.epmet.service.BlockChainUploadService; +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 java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 区块链上链service实现 + */ +@Service +public class BlockChainUploadServiceImpl implements BlockChainUploadService { + + @Autowired + private EpmetThirdOpenFeignClient thirdOpenFeignClient; + + @Autowired + private ProjectStaffDao projectStaffDao; + + /** + * 数据上链 + * @param processEntity 处理进展entity + * @param assignedStaffEntities 指派给的工作人员entity + */ + public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List assignedStaffEntities, String projectStaffId) { + + // 1.项目主信息 + BlockChainProjectFormDTO project = null; + + if (projectEntity != null) { + project = new BlockChainProjectFormDTO(); + project.setAgencyId(projectEntity.getAgencyId()); + project.setProjectId(projectEntity.getId()); + project.setCustomerId(projectEntity.getCustomerId()); + project.setCreatedBy(projectEntity.getCreatedBy()); + project.setCreatedTime(projectEntity.getCreatedTime()); + project.setCloseStatus(projectEntity.getClosedStatus()); + project.setLocateAddress(projectEntity.getLocateAddress()); + project.setLocateDimension(projectEntity.getLocateDimension()); + project.setLocateLongitude(projectEntity.getLocateLongitude()); + project.setOrgIdPath(projectEntity.getOrgIdPath()); + project.setOrigin(projectEntity.getOrigin()); + project.setOriginId(projectEntity.getOriginId()); + project.setStatus(projectEntity.getStatus()); + project.setTitle(projectEntity.getTitle()); + } + + // 2.项目处理进展 + BlockChainProjectProcessFormDTO process = new BlockChainProjectProcessFormDTO(); + process.setProcessId(processEntity.getId()); + process.setCreatedBy(processEntity.getCreatedBy()); + process.setCreatedTime(processEntity.getCreatedTime()); + process.setCostWorkDays(processEntity.getCostWorkdays()); + process.setAgencyId(processEntity.getAgencyId()); + process.setCustomerId(processEntity.getCustomerId()); + process.setDepartmentId(processEntity.getDepartmentId()); + process.setDepartmentName(processEntity.getDepartmentName()); + process.setEndTime(processEntity.getEndTime()); + process.setGridId(processEntity.getGridId()); + process.setInternalRemark(processEntity.getInternalRemark()); + process.setIsSend(processEntity.getIsSend()); + process.setOperation(processEntity.getOperation()); + process.setOperationName(processEntity.getOperationName()); + process.setOrgIdPath(processEntity.getOrgIdPath()); + process.setProjectId(processEntity.getProjectId()); + process.setPublicReply(processEntity.getPublicReply()); + process.setStaffId(processEntity.getStaffId()); + + if (assignedStaffEntities == null) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(ProjectStaffEntity::getProcessId, process.getProjectId()); + assignedStaffEntities = projectStaffDao.selectList(query); + } + + if (CollectionUtils.isEmpty(assignedStaffEntities)) { + assignedStaffEntities = new ArrayList<>(); + } + + // 3.指派人员列表 + List assignedStaffs = assignedStaffEntities.stream().map(e -> { + BlockChainProjectProcessAssignedStaffFormDTO assignedStaff = new BlockChainProjectProcessAssignedStaffFormDTO(); + assignedStaff.setStaffId(e.getStaffId()); + assignedStaff.setCreatedBy(e.getCreatedBy()); + assignedStaff.setCustomerId(e.getCustomerId()); + assignedStaff.setCreatedTime(e.getCreatedTime()); + assignedStaff.setProcessId(e.getProcessId()); + assignedStaff.setDepartmentId(e.getDepartmentId()); + assignedStaff.setDepartmentName(e.getDepartmentName()); + assignedStaff.setGridId(e.getGridId()); + assignedStaff.setId(e.getId()); + assignedStaff.setIsHandle(e.getIsHandle()); + assignedStaff.setOrgId(e.getOrgId()); + assignedStaff.setOrgIdPath(e.getOrgIdPath()); + assignedStaff.setProjectId(e.getProjectId()); + return assignedStaff; + }).collect(Collectors.toList()); + + // 4.当前处理人 + BlockChainProjectProcessAssignedStaffFormDTO handledStaff = null; + if (StringUtils.isNotBlank(projectStaffId)) { + ProjectStaffEntity handledStaffEntity = projectStaffDao.selectById(projectStaffId); + + handledStaff = new BlockChainProjectProcessAssignedStaffFormDTO(); + handledStaff.setStaffId(handledStaffEntity.getStaffId()); + handledStaff.setCreatedBy(handledStaffEntity.getCreatedBy()); + handledStaff.setCustomerId(handledStaffEntity.getCustomerId()); + handledStaff.setCreatedTime(handledStaffEntity.getCreatedTime()); + handledStaff.setProcessId(handledStaffEntity.getProcessId()); + handledStaff.setDepartmentId(handledStaffEntity.getDepartmentId()); + handledStaff.setDepartmentName(handledStaffEntity.getDepartmentName()); + handledStaff.setGridId(handledStaffEntity.getGridId()); + handledStaff.setId(handledStaffEntity.getId()); + handledStaff.setIsHandle(handledStaffEntity.getIsHandle()); + handledStaff.setOrgId(handledStaffEntity.getOrgId()); + handledStaff.setOrgIdPath(handledStaffEntity.getOrgIdPath()); + handledStaff.setProjectId(handledStaffEntity.getProjectId()); + } + + if (project == null) { + // 处理 + BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO(); + processForm.setProcess(process); + processForm.setAssignedStaffs(assignedStaffs); + processForm.setHandledStaff(handledStaff); + thirdOpenFeignClient.blockChainProcessProject(processForm); + } else { + // 立项 + BlockChainCreateProjectFormDTO createForm = new BlockChainCreateProjectFormDTO(); + createForm.setProject(project); + createForm.setProcess(process); + createForm.setAssignedStaffs(assignedStaffs); + thirdOpenFeignClient.blockChainCreateProject(createForm); + } + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index b082fa1813..e7932e3303 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -63,6 +64,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.ProjectProcessRedis; import com.epmet.send.SendMqMsgUtil; +import com.epmet.service.BlockChainUploadService; import com.epmet.service.ProjectProcessService; import com.epmet.service.ProjectService; import com.epmet.service.ProjectStaffService; @@ -125,6 +127,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl page(Map params) { @@ -412,6 +416,13 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl(), null); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** @@ -2140,6 +2186,14 @@ public class ProjectServiceImpl extends BaseServiceImpl(), null); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** @@ -2789,4 +2850,131 @@ public class ProjectServiceImpl extends BaseServiceImpl projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + Result> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto); + if (!listResult.success()){ + throw new EpmetException("查询1级分类列表失败..."); + } + List projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); + if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ + return new ArrayList<>(); + } + return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData()); + } + + /** + * @Description 区间项目分类数量处理 + * @param categories + * @param date + * @param listResult + * @author zxc + * @date 2021/12/8 9:45 上午 + */ + public List disposeTimeInterval(List categories, String date,List listResult){ + List intervalTimeList = getIntervalTimeList("00:00", "24:00", 240); + List result = new ArrayList<>(); + Map> groupByCode = categories.stream().collect(Collectors.groupingBy(ProjectCategoryByDateDTO::getCategoryCode)); + for (int i = 0; i < intervalTimeList.size(); i++) { + ProjectDistributionAnalysisLeftResultDTO dto = new ProjectDistributionAnalysisLeftResultDTO(); + dto.setTime(intervalTimeList.get(i)); + dto.setCategoryList(ConvertUtils.sourceToTarget(listResult,CategoryListDTO.class)); + String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00"); + long end = DateUtils.stringToDate(DateUtils.DATE_TIME_PATTERN, concat).getTime(); + if (i == NumConstant.ZERO){ + dto.getCategoryList().forEach(cate -> { + AtomicReference count = new AtomicReference<>(cate.getCount()); + groupByCode.forEach((k,v) -> { + if (cate.getCategoryCode().equals(k)){ + v.forEach(l -> { + if (l.getCreatedTime().getTime() < end){ + cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); + } + }); + } + }); + }); + }else if (i == intervalTimeList.size() - NumConstant.ONE){ + break; + }else { + String startStr = date.concat(" ").concat(intervalTimeList.get(i - NumConstant.ONE)).concat(":00"); + long start = DateUtils.stringToDate(DateUtils.DATE_TIME_PATTERN, startStr).getTime(); + dto.getCategoryList().forEach(cate -> { + AtomicReference count = new AtomicReference<>(cate.getCount()); + groupByCode.forEach((k,v) -> { + if (cate.getCategoryCode().equals(k)){ + v.forEach(l -> { + if (l.getCreatedTime().getTime() < end && l.getCreatedTime().getTime() >= start){ + cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); + } + }); + } + }); + }); + } + result.add(dto); + } + return result; + } + + /** + * @Description 获取固定时间段之间固定时间的集合 + * @param start 开始时间 + * @param end 结束时间 + * @param interval 间隔时间 + * @author zxc + * @date 2021/11/22 3:48 下午 + */ + public List getIntervalTimeList(String start,String end,Integer interval) { + Date startDate = convertStringToDate("HH:mm", start); + Date endDate = convertStringToDate("HH:mm", end); + List list = new ArrayList<>(); + while (startDate.getTime() <= endDate.getTime()) { + list.add(convertDateToString("HH:mm", startDate)); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startDate); + calendar.add(Calendar.MINUTE, interval); + if (calendar.getTime().getTime() > endDate.getTime()) { + if (!startDate.equals(endDate)) { + list.add(convertDateToString("HH:mm", endDate)); + } + startDate = calendar.getTime(); + } else { + startDate = calendar.getTime(); + } + + } + list.remove(list.size() - NumConstant.ONE); + list.add(list.size(),"24:00"); + list.remove(NumConstant.ZERO); + return list; + } + + + public Date convertStringToDate(String format, String dateStr) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + try { + Date date = simpleDateFormat.parse(dateStr); + return date; + } catch (ParseException e) { + e.printStackTrace(); + } + return null; + } + + public String convertDateToString(String format, Date date) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + return simpleDateFormat.format(date); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index e8e79882f7..111d2bf8e0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; @@ -91,6 +92,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceS private LoginUserUtil loginUserUtil; @Autowired private ResiEventService resiEventService; + @Autowired + private BlockChainUploadService blockChainUploadService; @Override public List getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) { @@ -529,6 +532,13 @@ public class ProjectTraceServiceImpl implements ProjectTraceS log.error("项目实时统计消息发送失败"); } + // 数据上链 + try { + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } } /** @@ -845,6 +855,15 @@ public class ProjectTraceServiceImpl implements ProjectTraceS resiEventService.shiftProject(eventShiftProjectDTO); EventToProjectResultDTO resultDTO=new EventToProjectResultDTO(); resultDTO.setProjectId(projectEntity.getId()); + + // 数据上链 + try { + blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null); + } catch (Exception e) { + String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); + log.error("【项目流转】上链失败，错误信息:{}", errorMsg); + } + return resultDTO; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 3adca24761..1a8ae98cde 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -639,5 +640,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl pageUserReported(PageUserReportEventFormDTO formDTO) { + //todo + return null; + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index ab6c65c8a7..bb6e79aaf6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -397,4 +397,18 @@ where p.DEL_FLAG = '0' AND p.ORIGIN_ID = #{originId} + + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index 3dff43db41..d5a6908cd6 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78 ports: - "8105:8105" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 0403af0463..305075f3a6 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.69 + 0.3.78 gov-voice com.epmet @@ -250,7 +250,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java index b1e8824223..7d5a92fc9b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -47,7 +48,7 @@ import java.util.List; @RestController @RequestMapping("guidecategory") public class GuideCategoryController { - + @Autowired private GuideCategoryService guideCategoryService; @@ -68,10 +69,10 @@ public class GuideCategoryController { /** * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示 - * - * @param tokenDto - * @return com.epmet.commons.tools.utils.Result> - * @author yinzuomei + * + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result> + * @author yinzuomei * @date 2021/9/8 2:47 下午 */ @PostMapping("getcategory") @@ -143,6 +144,7 @@ public class GuideCategoryController { * @author yinzuomei * @date 2021/9/8 5:11 下午 */ + @NoRepeatSubmit @PostMapping("save") public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); @@ -160,6 +162,7 @@ public class GuideCategoryController { * @author yinzuomei * @date 2021/9/8 5:37 下午 */ + @NoRepeatSubmit @PostMapping("update") public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); @@ -168,4 +171,4 @@ public class GuideCategoryController { } -} \ No newline at end of file +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java index 88d8115216..8fe57c6f76 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -113,6 +114,7 @@ public class GuideController { * @Author zhaoqifeng * @Date 2021/9/7 14:13 */ + @NoRepeatSubmit @PostMapping("add") public Result guideAdd(@LoginUser TokenDto tokenDto, @RequestBody GuideAddFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); @@ -177,4 +179,4 @@ public class GuideController { } -} \ No newline at end of file +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java index 017338b433..a24b0c5b9e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java @@ -19,6 +19,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -58,6 +59,7 @@ public class SpecialSubjectController { * @description 添加专题 * @Date 2021/7/15 15:31 **/ + @NoRepeatSubmit @RequirePermission(requirePermission = RequirePermissionEnum.WORK_SPECIAL_PROJECT_ADD) @PostMapping("add") public Result addSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) { @@ -125,4 +127,4 @@ public class SpecialSubjectController { public Result> preview(@RequestBody PreviewFormDTO formDTO) { return new Result>().ok(specialSubjectService.preview(formDTO)); } -} \ No newline at end of file +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index feedbad307..75981232fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,9 +2,9 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.13 ports: - - "8107:8107" + - "8117:8117" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 6a40fad5b3..79a89eac66 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,6 +2,7 @@ + 0.3.13 open-data-worker com.epmet diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java index 3fa339bc0b..dc02f0498a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java @@ -4,11 +4,13 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; +import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.opendata.mq.listener.OpenDataOrgChangeEventListener; import com.epmet.opendata.mq.listener.OpenDataPatrolChangeEventListener; import com.epmet.opendata.mq.listener.OpenDataProjectChangeEventListener; import com.epmet.opendata.mq.listener.OpenDataStaffChangeEventListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -19,35 +21,39 @@ import org.springframework.stereotype.Component; @Component public class RocketMQConsumerRegister extends MQAbstractRegister { + @Autowired + private DistributedLock distributedLock; + @Override public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { + // 客户初始化监听器注册 register(consumerProperties, ConsomerGroupConstants.OPEN_DATA_ORG_CHANGE_EVENT_LISTENER_GROUP, MessageModel.CLUSTERING, TopicConstants.ORG, "*", - new OpenDataOrgChangeEventListener()); + new OpenDataOrgChangeEventListener(distributedLock)); register(consumerProperties, ConsomerGroupConstants.OPEN_DATA_STAFF_CHANGE_EVENT_LISTENER_GROUP, MessageModel.CLUSTERING, TopicConstants.STAFF, "*", - new OpenDataStaffChangeEventListener()); + new OpenDataStaffChangeEventListener(distributedLock)); register(consumerProperties, ConsomerGroupConstants.OPEN_DATA_PATROL_CHANGE_EVENT_LISTENER_GROUP, MessageModel.CLUSTERING, TopicConstants.PATROL, "*", - new OpenDataPatrolChangeEventListener()); + new OpenDataPatrolChangeEventListener(distributedLock)); register(consumerProperties, ConsomerGroupConstants.OPEN_DATA_PROJECT_CHANGE_EVENT_LISTENER_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT, "*", - new OpenDataProjectChangeEventListener()); + new OpenDataProjectChangeEventListener(distributedLock)); // ...其他监听器类似 } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java index eb24a72949..5549c4c892 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java @@ -35,6 +35,13 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent private RedisUtils redisUtils; + private DistributedLock distributedLock; + + public OpenDataOrgChangeEventListener(DistributedLock distributedLock) { + this.distributedLock = distributedLock; + } + + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { @@ -62,10 +69,8 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent logger.info("【开放数据事件监听器】-组织信息变更-收到消息内容:{},操作:{}", msg, tags); OrgOrStaffMQMsg obj = JSON.parseObject(msg, OrgOrStaffMQMsg.class); - DistributedLock distributedLock = null; RLock lock = null; try { - distributedLock = SpringContextUtils.getBean(DistributedLock.class); lock = distributedLock.getLock(String.format("lock:open_data_org:%s", obj.getOrgId()), 30L, 30L, TimeUnit.SECONDS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index 6207c6fa74..45acb46283 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -37,6 +37,12 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr private RedisUtils redisUtils; + private DistributedLock distributedLock; + + public OpenDataPatrolChangeEventListener(DistributedLock distributedLock) { + this.distributedLock = distributedLock; + } + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { @@ -67,10 +73,8 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr log.warn("consumeMessage msg body is blank"); return; } - DistributedLock distributedLock = null; RLock lock = null; try { - distributedLock = SpringContextUtils.getBean(DistributedLock.class); lock = distributedLock.getLock(String.format("lock:open_data_patrol:%s", msgObj.getPatrolId()), 30L, 30L, TimeUnit.SECONDS); UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java index c2af1cffe7..6c5f127cb9 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java @@ -38,6 +38,12 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur private RedisUtils redisUtils; + private DistributedLock distributedLock; + + public OpenDataProjectChangeEventListener(DistributedLock distributedLock) { + this.distributedLock = distributedLock; + } + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { @@ -68,10 +74,8 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur DisputeProcessMQMsg obj = JSON.parseObject(msg, DisputeProcessMQMsg.class); EventInfoFormDTO formDTO = ConvertUtils.sourceToTarget(obj, EventInfoFormDTO.class); - DistributedLock distributedLock = null; RLock lock = null; try { - distributedLock = SpringContextUtils.getBean(DistributedLock.class); lock = distributedLock.getLock(String.format("lock:open_data_project:%s", obj.getProjectId()), 30L, 30L, TimeUnit.SECONDS); SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(formDTO); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java index 76eadec951..09db1147bd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java @@ -38,6 +38,12 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre private RedisUtils redisUtils; + private DistributedLock distributedLock; + + public OpenDataStaffChangeEventListener(DistributedLock distributedLock) { + this.distributedLock = distributedLock; + } + @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { @@ -67,10 +73,8 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre logger.info("【开放数据事件监听器】-工作人员信息变更-收到消息内容:{}, 操作:{}, blockedMsgLabel:{}", msg, tags, pendingMsgLabel); OrgOrStaffMQMsg obj = JSON.parseObject(msg, OrgOrStaffMQMsg.class); - DistributedLock distributedLock = null; RLock lock = null; try { - distributedLock = SpringContextUtils.getBean(DistributedLock.class); lock = distributedLock.getLock(String.format("lock:open_data_staff:%s", obj.getOrgId()), 30L, 30L, TimeUnit.SECONDS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java index 9a2c815fbd..2fa094af92 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java @@ -46,4 +46,4 @@ public interface ExDeptService extends BaseService { **/ void getGridBaseInfo(ExDeptFormDTO formDTO); -} \ No newline at end of file +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java index bb990943f3..cdbe5cbaad 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java @@ -31,7 +31,7 @@ import java.util.Map; */ public interface ExUserService extends BaseService { - Map getUserMap(); + Map getUserMap(String customerId); /** * @Author sun diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java index 75fe8a588f..63211e253f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.opendata.service.BaseDisputeProcessService; import com.epmet.opendata.service.ExDeptService; import com.epmet.opendata.service.ExUserService; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -74,7 +75,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl deptMap = exDeptService.getDeptMap(); - Map userMap = exUserService.getUserMap(); + Map userMap = exUserService.getUserMap(formDTO.getCustomerId()); List list = result.getData(); saveEvent(formDTO, deptMap, userMap, list); //分批次循环 @@ -100,13 +101,23 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl NumConstant.ONE_THOUSAND){ + eventDescription = eventDescription.substring(NumConstant.ZERO,NumConstant.ONE_THOUSAND); + } + entity.setEventDescription(eventDescription); entity.setLng(null == item.getLng()?null:item.getLng().toPlainString()); entity.setLat(null == item.getLat()?null:item.getLat().toPlainString()); entity.setCreateBy(null == userMap.get(item.getReporterId())?null:String.valueOf(userMap.get(item.getReporterId()))); entity.setCreateDate(item.getReportTime()); entity.setUpdateDate(new Date()); entity.setStatus(item.getStatus()); + //业务不确定 + if (("03").equals(item.getStatus())) { + entity.setSuccessfulOrNot("Y"); + } + entity.setEventNo(("py_").concat(item.getId())); entity.setFirstEventCategory(item.getParentEventCategory()); entity.setSource("01"); entity.setSecondEventCategory(item.getEventCategory()); @@ -119,4 +130,4 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl @Override public Map getDeptMap() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.isNotNull(ExDeptEntity::getGridCode); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(entityList)) { return Collections.emptyMap(); @@ -136,4 +135,4 @@ public class ExDeptServiceImpl extends BaseServiceImpl } -} \ No newline at end of file +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java index 9d5f78e86e..a9eca96dac 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java @@ -51,8 +51,9 @@ public class ExUserServiceImpl extends BaseServiceImpl private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; @Override - public Map getUserMap() { + public Map getUserMap(String customerId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ExUserEntity::getQxCustomerId, customerId); List list = baseDao.selectList(wrapper); if (CollectionUtils.isEmpty(list)) { return Collections.emptyMap(); @@ -82,6 +83,7 @@ public class ExUserServiceImpl extends BaseServiceImpl entity.setQxUserName(r.getNickName()); entity.setQxMobile(r.getPhonenumber()); entity.setQxCustomerId(formDTO.getCustomerId()); + entityList.add(entity); }); //3.更新数据，不能新增，市平台信息表中必填的 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 49db95eb6d..b158975c86 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -112,6 +112,11 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 10 + maxQueueSize: 500 + queueSizeRejectionThreshold: 500 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/init_db.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/init_db.sql similarity index 100% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/resources/init_db.sql rename to epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/init_db.sql diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml index fedbbf35a7..3d904577fd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml @@ -33,9 +33,9 @@ WHERE 1=1 - + (qx_user_id = #{item.qxUserId} ) - \ No newline at end of file + diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml index 94231275a1..2d0c1631c4 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.18 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24 ports: - "8093:8093" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 147992b041..8d3c8706e8 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.19 + 0.3.24 oper-access com.epmet @@ -235,7 +235,7 @@ false - false + true true diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml index 3282657fca..9cc48783a1 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.72 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87 ports: - "8090:8090" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index c058e133cb..f972dcffbf 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.72 + 0.3.87 com.epmet oper-crm @@ -261,7 +261,7 @@ --> 8090 - test + prod @@ -283,7 +283,7 @@ false - false + true true diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java index 032fab629a..ab4987388f 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -87,6 +88,7 @@ public class CustomerController { return new Result().ok(data); } + @NoRepeatSubmit @PostMapping("save") public Result save(@RequestBody CustomerDTO dto) { //效验数据 @@ -95,6 +97,7 @@ public class CustomerController { return new Result(); } + @NoRepeatSubmit @PutMapping("update") public Result update(@RequestBody CustomerDTO dto) { //效验数据 @@ -183,6 +186,7 @@ public class CustomerController { * @param form * @return */ + @NoRepeatSubmit @PostMapping("add") public Result> addCustomer(@RequestBody CustomerFormDTO form) { ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class); diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 3b31e4feac..a864a031c1 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -508,48 +508,48 @@ public class CustomerServiceImpl extends BaseServiceImplfalse - false + true true diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 8b618d43e3..90296e3d83 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.82 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.127 ports: - "8095:8095" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 117e26696c..c12490d510 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.82 + 0.3.127 com.epmet resi-group @@ -354,7 +354,7 @@ - false + true true diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index aa0679b83f..15488d6f33 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.33 ports: - "8091:8091" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 94b83622e0..0f2ec5ea4f 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.33 com.epmet resi-guide @@ -257,7 +257,7 @@ - false + true true diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index c631c116b4..6203abc44d 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.34 ports: - "8100:8100" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 299e457a6d..fda6c3856d 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.24 + 0.3.34 resi-hall com.epmet @@ -202,7 +202,7 @@ false - false + true true diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml index 50abf2bb7b..9a31b60a8d 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23 ports: - "8104:8104" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 23a2239cac..d5972d3f1e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.17 + 0.3.23 resi-home @@ -224,7 +224,7 @@ - false + true diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java index 75c60668c6..6ee30a91e4 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java @@ -40,4 +40,9 @@ public class InitInfoResultDTO implements Serializable { * 昵称 */ private String nickname; + + /** + * 身份证号 + */ + private String idNum; } diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java index c75bca8a46..5ffe04836b 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java @@ -52,4 +52,8 @@ public class MyResiUserInfoResultDTO implements Serializable { * */ private Integer todayObtainedPoint; + /** + * 是否录入身份证号，true ,false + * */ + private Boolean completeIdNum; } diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index def0b79e33..09cdf0cd4c 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.53 ports: - "8094:8094" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 9101e0841f..7fc7613eb4 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.45 + 0.3.53 com.epmet resi-mine @@ -240,7 +240,7 @@ - false + true diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index d3cf8a2a64..b2b3233af5 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java @@ -40,12 +40,14 @@ public class PersonalCenterServiceImpl implements PersonalCenterService { resultDTO.setDistrict(baseInfoResult.getData().getDistrict()); resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress()); resultDTO.setNickname(baseInfoResult.getData().getNickname()); + resultDTO.setIdNum(baseInfoResult.getData().getIdNum()); return resultDTO; } @Override public void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); Result result = epmetUserOpenFeignClient.editUserInfo(formDTO); if (!result.success()) { throw new RenException(result.getCode(), result.getMsg()); diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java index 447055431a..1cc431a9b3 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java @@ -10,7 +10,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; -import org.apache.poi.ss.formula.constant.ErrorConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index ce9ba1ebaa..d5272f463c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.82 ports: - "8096:8096" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index f52ffd6714..43e3789602 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.62 + 0.3.82 com.epmet resi-partymember @@ -266,7 +266,7 @@ - false + true true diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 502a520dc3..ae67b95ebf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -580,6 +580,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate()); userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding()); userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); + //注册居民需要录入身份证号 + userResiInfoDTO.setIdNum(partyMemberInfoDTO.getIdCard()); Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO); log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result)); if (!result.success()){ @@ -608,7 +610,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService /** - * 保存或者更新热心居民申请行为记录表 + * 保存或者更新党员认证行为记录表 * * @param visitId 主键 * @param fromDTO 参数 diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml index 6962aaca73..ed0013dad4 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12 ports: - "8106:8106" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 0fc30b2de3..a3dd4affa4 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.8 + 0.3.12 resi-voice com.epmet @@ -204,7 +204,7 @@ - false + true diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 69873777e7..02fcb1cecc 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.31 ports: - "8107:8107" network_mode: host # 不会创建新的网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 3c3f385f5e..0356318585 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.25 + 0.3.31 epmet-openapi-scan jar @@ -205,7 +205,7 @@ - false + true diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java index 3d81025a02..d8b5c10495 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java @@ -66,6 +66,11 @@ public class UserResiInfoDTO implements Serializable { */ private String name; + /** + * 身份证号,1206新增 + */ + private String idNum; + /** * 街道 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index 81bd8e9082..ef54d73a3a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -36,6 +37,12 @@ public class EditInfoFormDTO implements Serializable { */ @NotBlank(message = "名不能为空") private String name; + + //@NotBlank(message = "身份证号不能为空") + @Length(max=18,message = "身份证号不能超过18位") + //别的小程序不统一升级，没办法限制必填。 + private String idNum; + /** * 路牌号 */ @@ -54,4 +61,10 @@ public class EditInfoFormDTO implements Serializable { */ @NotBlank(message = "昵称不能为空") private String nickname; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空") + private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java index 75453a1d22..d64368a7b4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java @@ -22,7 +22,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.Date; /** @@ -57,6 +56,11 @@ public class InfoSubmitFromDTO implements Serializable { @Length(max=20,message = "名称不能超过20个字") private String name; + //@NotBlank(message = "身份证号不能为空") + //@Length(max=18,message = "身份证号不能超过18位") + //别的小程序不统一升级，没办法限制必填。 + private String idNum; + /** * 街道 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java index 52d96870a2..e2355d145a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java @@ -19,4 +19,8 @@ public class PersonDataFormDTO implements Serializable { @NotBlank(message = "userId不能为空",groups = PersonDataForm.class) private String userId; + + + @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class) + private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiUserFormDTO.java new file mode 100644 index 0000000000..e8b62f166a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiUserFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + */ +@Data +public class ResiUserFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + /** + * 身份证号 + */ + private String idNum; + + /** + * ic_resi_user.id + */ + private String icResiUserId; + + @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java index 5b26ee9150..a81e542024 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java @@ -22,6 +22,10 @@ public class MyResiUserInfoResultDTO implements Serializable { * 是否已注册居民，true ,false * */ private Boolean registerFlag; + /** + * 是否录入身份证号，true ,false + * */ + private Boolean completeIdNum; /** * 微信昵称，可为空“” * */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java index b46c665dfc..cb15d9440b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java @@ -38,4 +38,8 @@ public class MyselfMsgResultDTO implements Serializable { * */ private String gridId; + /** + * 身份证号 + * */ + private String idNum; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java index 6a89bb2037..3d1334d249 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java @@ -7,7 +7,6 @@ import lombok.Data; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * @Author zxc @@ -19,6 +18,16 @@ public class PersonDataResultDTO implements Serializable { private static final long serialVersionUID = 5210308218052783909L; + /** + * epemt_user.user.id + */ + private String epmetUserId; + + /** + * ic_resi_user.id + */ + private String icResiUserId; + /** * 工作单位 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java new file mode 100644 index 0000000000..3d0679b9d4 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.result; + +import com.epmet.dto.form.ResiUserFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class ResiUserResDTO implements Serializable { + private String idNum; + private String customerId; + private String epmetUserId; + private String icResiUserId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java index c861899ccb..f981a68f8b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java @@ -77,4 +77,20 @@ public class StaffBasicInfoResultDTO implements Serializable { */ private String agencyName; + /** + * 组织级别 + */ + private String level; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 54dc76299e..616c9034f3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -660,4 +660,13 @@ public interface EpmetUserOpenFeignClient { **/ @PostMapping(value = "epmetuser/customerstaff/getbyrealnames") Result> getByRealNames(@RequestBody GetByRealNamesFormDTO formDTO); + + /** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + * + * @param formDTO + * @return + */ + @PostMapping(value = "/epmetuser/user/findepmetuser") + Result findEpmetUser(@RequestBody ResiUserFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 68424b651f..54aca51d4a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -479,4 +479,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> getByRealNames(GetByRealNamesFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getByRealNames", formDTO); } + + /** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + * + * @param formDTO + * @return + */ + @Override + public Result findEpmetUser(ResiUserFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findEpmetUser", formDTO); + } } diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 6cbbbfe1c4..b252971a80 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.138 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.197 ports: - "8087:8087" network_mode: host # 不会创建新的网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index e6c7655e35..3bc3afa499 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.138 + 0.3.197 com.epmet epmet-user @@ -349,7 +349,7 @@ - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 503da1bd31..e25083f669 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -50,6 +50,7 @@ public class BadgeController { * @param formDTO * @return com.epmet.commons.tools.utils.Result */ + @NoRepeatSubmit @PostMapping("add") public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddBadgeFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); @@ -191,7 +192,7 @@ public class BadgeController { /** * @Description - * @return + * @return * @author wxz * @date 2021.08.02 10:27 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index f5720acd39..d6df9f57e0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -426,7 +426,9 @@ public class IcResiUserController { * @date 2021/11/3 9:21 上午 */ @PostMapping("persondata") - public Result personData(@RequestBody PersonDataFormDTO formDTO) { + public Result personData(@LoginUser TokenDto tokenDto,@RequestBody PersonDataFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,PersonDataFormDTO.PersonDataForm.class); return new Result().ok(icResiUserService.personData(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index f1cbcb114a..66d5d15d7a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -185,4 +185,17 @@ public class UserController { } return new Result().ok(userService.queryUserClient(userId)); } + + /** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + * + * + * @param formDTO + * @return + */ + @PostMapping("findepmetuser") + public Result findEpmetUser(@RequestBody ResiUserFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class); + return new Result().ok(userService.findEpmetUser(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index dfc0cdae15..ea5ca5b741 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -162,4 +162,8 @@ public interface IcResiUserDao extends BaseDao { List selectDemandUsers(@Param("agencyId") String agencyId, @Param("gridId")String gridId, @Param("name")String name); + + IcResiUserDTO selectIdByIdCard(@Param("customerId") String customerId, + @Param("idNum")String idNum, + @Param("icResiUserId")String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java index 6fdd2f931f..7cea610e90 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.result.ResiUserBaseInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserWechatResultDTO; @@ -80,4 +81,12 @@ public interface UserBaseInfoDao extends BaseDao { * @date 2020.07.30 19:16 **/ String selectIdByUserId(@Param("userId") String userId); + + UserBaseInfoDTO selectUserId(@Param("customerId") String customerId, + @Param("idNum")String idNum, + @Param("userId")String userId); + + Integer selectCountIdNum(@Param("idNum") String idNum, + @Param("customerId")String customerId, + @Param("excludeUserId")String excludeUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 59d42dfc6e..048b6d114b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -96,4 +96,17 @@ public interface UserResiInfoDao extends BaseDao { * @return void */ void updateByUserId(UserResiInfoEntity entity); + + /** + * 身份证 + * @param idNum + * @return + */ + Integer selectCountByIdNum(@Param("idNum") String idNum, + @Param("customerId") String customerId, + @Param("excludeUserId")String excludeUserId); + + UserResiInfoDTO selectByIdNum(@Param("customerId") String customerId, + @Param("idNum")String idNum, + @Param("userId")String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiInfoEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiInfoEntity.java index 7c4266e3c7..7df10f75a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiInfoEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserResiInfoEntity.java @@ -20,13 +20,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 用户居民端注册信息表 用户在居民端完善的个人信息 * @@ -60,6 +57,11 @@ public class UserResiInfoEntity extends BaseEpmetEntity { */ private String name; + /** + * 身份证号,1206新增 + */ + private String idNum; + /** * 街道 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 2b88399eab..9a0fcbed95 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; @@ -141,4 +142,13 @@ public interface IcResiUserService extends BaseService { List listFormItems(String customerId, String formCode); List queryDemandUsers(DemandUserFormDTO formDTO); + + /** + * 返回ic_resi_user.id + * + * @param customerId + * @param idNum + * @return + */ + IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 531213863d..456365e58c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -189,4 +189,8 @@ public interface UserBaseInfoService extends BaseService { * @date 2020.08.21 17:16 **/ ExtUserInfoResultDTO extUserInfo(CommonUserIdFormDTO param); + + UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId); + + Integer checkIdNum(String idNum, String customerId, String excludeUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 33e7b1c7ad..0790655742 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -104,4 +104,13 @@ public interface UserService extends BaseService { * @date 2021/9/10 8:50 上午 */ UserDTO queryUserClient(String userId); + + /** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + * + * + * @param formDTO + * @return + */ + ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 87ea5b411b..648c0e8245 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -717,6 +717,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().ok(resultDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 841f01ce34..ed20fb2374 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -21,7 +21,6 @@ import com.alibaba.fastjson.JSON; 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.rocketmq.messages.IcResiUserAddMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; @@ -47,7 +46,6 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; -import com.epmet.constant.SystemMessageType; import com.epmet.constant.UserConstant; import com.epmet.dao.IcResiUserDao; import com.epmet.dto.*; @@ -61,6 +59,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.service.IcResiUserService; +import com.epmet.service.UserService; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -101,6 +100,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); @@ -530,6 +531,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard()); if (!listResult.success()){ @@ -852,4 +863,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryDemandUsers(DemandUserFormDTO formDTO) { return baseDao.selectDemandUsers(formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getName()); } + + /** + * 返回ic_resi_user.id + * + * @param customerId + * @param idNum + * @return + */ + @Override + public IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId) { + if(StringUtils.isBlank(idNum)&&StringUtils.isBlank(icResiUserId)){ + return null; + } + return baseDao.selectIdByIdCard(customerId,idNum,icResiUserId); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 0f4d76d821..a8afc76953 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -442,4 +442,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + } + //判断user_base_info表是否存在相同的身份证号 + if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + } + } userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 registerRelationService.saveRegisterRelation(userResiInfoDTO); @@ -253,9 +264,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId()); if(null != wechat && !wechat.isEmpty()){ - baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl()); - baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString()); - baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname()); + UserWechatEntity wechatEntity = wechat.get(NumConstant.ZERO); + baseInfo.setHeadImgUrl(wechatEntity.getHeadImgUrl()); + if (wechatEntity.getSex() == null){ + //设置未知 + baseInfo.setGender(NumConstant.ZERO_STR); + }else{ + baseInfo.setGender(String.valueOf(wechatEntity.getSex())); + } + baseInfo.setNickname(wechatEntity.getNickname()); } userBaseInfoService.insertOrUpdate(baseInfo); } @@ -296,24 +313,31 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + } + //判断user_base_info表是否存在相同的身份证号 + if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + } + } + //居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 + registerRelationService.saveRegisterRelation(userResiInfoDTO); + //数据存入居民注册表 + saveUserResiInfo(userResiInfoDTO); /* //将用户于居民角色关联 saveUserResiInfo已包含 UserRoleDTO userRole = new UserRoleDTO(); userRole.setUserId(userResiInfoDTO.getUserId()); userRole.setRoleKey(UserConstant.ROLE_RESI); userRole.setApp(userResiInfoDTO.getApp()); userRoleService.saveUserRole(userRole);*/ - //更新该用户在该客户下的注册状态 - userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId()); - }else{ - log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO)); - throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(),EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg()); - } - + //更新该用户在该客户下的注册状态 + userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId()); return result; } @@ -376,6 +400,19 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl18){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号至多18位"); + } + //判断身份证号唯一，除了当前用户外没有人用过这个身份证号吧？？？ + if(baseDao.selectCountByIdNum(formDTO.getIdNum(),formDTO.getCustomerId(),formDTO.getUserId())>0){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + } + //判断user_base_info表是否存在相同的身份证号 + if (userBaseInfoService.checkIdNum(formDTO.getIdNum(), formDTO.getCustomerId(), formDTO.getUserId()) > 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + } + } //更新居民注册信息表 baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class)); //更新baseInfo diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 6c56b705a8..36e820b18d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -2,16 +2,19 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserConstant; -import com.epmet.dao.*; -import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.UserDTO; -import com.epmet.dto.UserResiInfoDTO; -import com.epmet.dto.UserWechatDTO; +import com.epmet.dao.UserDao; +import com.epmet.dao.UserResiInfoDao; +import com.epmet.dao.UserRoleDao; +import com.epmet.dao.UserWechatDao; +import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.UserBaseInfoEntity; @@ -19,6 +22,7 @@ import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; import com.epmet.feign.EpmetPointOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; +import com.epmet.service.IcResiUserService; import com.epmet.service.UserBaseInfoService; import com.epmet.service.UserService; import com.epmet.util.ModuleConstant; @@ -53,7 +57,8 @@ public class UserServiceImpl extends BaseServiceImpl implem private EpmetPointOpenFeignClient epmetPointOpenFeignClient; @Autowired private UserResiInfoDao userResiInfoDao; - + @Autowired + private IcResiUserService icResiUserService; private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class); @@ -183,6 +188,8 @@ public class UserServiceImpl extends BaseServiceImpl implem MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg,MyResiUserInfoResultDTO.class); //registerFlag 是否已注册居民，true ,false result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId())); + // 已录入身份证号：true;未完善：false. + result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum())); result.setRegisterGridName(ModuleConstant.EMPTY_STR); if(StringUtils.isNotBlank(myselfMsg.getGridId())){ //registerGridName 当前在哪个网格，显示哪个网格的名称 @@ -342,4 +349,39 @@ public class UserServiceImpl extends BaseServiceImpl implem return baseDao.selectByUserId(userId); } + /** + * 根据身份证号||ic_resi_user.id找居民端小程序里的人 + * + * @param formDTO + * @return + */ + @Override + public ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getIdNum()) && StringUtils.isBlank(formDTO.getIcResiUserId())) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "身份证号、icResiUserId至少输入一个", "至少选择一种查询方式"); + } + //可以根据身份证号查询，也可以根据epmet_user.user.id查询 + if (StringUtils.isNotBlank(formDTO.getIcResiUserId()) && StringUtils.isBlank(formDTO.getIdNum())) { + IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(formDTO.getCustomerId(), null, formDTO.getIcResiUserId()); + if (null == icResiUserDTO) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据ic_resi_user.id没有找到记录id=" + formDTO.getIcResiUserId(), "至少选择一种查询方式"); + } + formDTO.setIdNum(icResiUserDTO.getIdCard()); + } + ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class); + if (StringUtils.isNotBlank(formDTO.getIdNum())) { + UserBaseInfoDTO userBaseInfoDTO = userBaseInfoService.getUserIdByIdNum(formDTO.getCustomerId(), + formDTO.getIdNum(), null); + if (null == userBaseInfoDTO || StringUtils.isBlank(userBaseInfoDTO.getUserId())) { + log.info("user_base_info没有找到,去查下user_resi_info表吧"); + UserResiInfoDTO userResiInfoDTO = userResiInfoDao.selectByIdNum(formDTO.getCustomerId(), + formDTO.getIdNum(), null); + resiUserResDTO.setEpmetUserId(null != userResiInfoDTO ? userResiInfoDTO.getId() : StrConstant.EPMETY_STR); + } else { + resiUserResDTO.setEpmetUserId(userBaseInfoDTO.getUserId()); + } + } + return resiUserResDTO; + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.19__user_resi_infoaddidnum.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.19__user_resi_infoaddidnum.sql new file mode 100644 index 0000000000..535da1b138 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.19__user_resi_infoaddidnum.sql @@ -0,0 +1 @@ +alter table user_resi_info add COLUMN ID_NUM VARCHAR(32) COMMENT '身份证号,1206新增' AFTER NAME; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2278cf515a..e7c9de9224 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -308,4 +308,20 @@ ORDER BY CONVERT ( ir.NAME USING gbk ) ASC + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml index 8c664e678e..16a0e4d8e9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml @@ -120,4 +120,32 @@ WHERE DEL_FLAG = '0' AND USER_ID = #{userId} + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index bbdaf024ba..6d82e4c200 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -34,7 +34,8 @@ IFNULL(wechat.NICKNAME,"") AS nickName, IFNULL(resi.ID,"") AS resiId, IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName, - IFNULL(relation.GRID_ID,"") AS gridId + IFNULL(relation.GRID_ID,"") AS gridId, + IFNULL(resi.id_num,'')AS idNum FROM USER user LEFT JOIN diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index fb360d3a39..13ff3e74eb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -43,7 +43,8 @@ NAME = #{name}, STREET = #{street}, DISTRICT = #{district}, - BUILDING_ADDRESS = #{buildingAddress} + BUILDING_ADDRESS = #{buildingAddress}, + ID_NUM = #{idNum} where USER_ID = #{userId} and DEL_FLAG = '0' @@ -175,4 +176,34 @@ uri.DEL_FLAG = '0' AND uri.USER_ID = #{userId} + + + +