From dbea3a6e50c7d6b2bdb3a1d9a9ffdacbab1fc294 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 15:46:09 +0800 Subject: [PATCH 01/16] epmetMessage sendMsg --- .../service/impl/UserMessageServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 6c425c8d59..505f329900 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; +import com.epmet.dto.CustomerDepartmentDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; @@ -188,8 +189,18 @@ public class UserMessageServiceImpl extends BaseServiceImpl gridInfo = govOrgFeignClient.get(msgResi2GovFormDTO.getInstitutionId()); - if(!gridInfo.success() || null == gridInfo.getData() || StringUtils.isBlank(gridInfo.getData().getPid())){ + Result gridInfo = govOrgFeignClient.getGrid(msgResi2GovFormDTO.getInstitutionId()); + if(gridInfo.success() && null != gridInfo.getData() && StringUtils.isNotBlank(gridInfo.getData().getPid())){ + + }else{ + logger.warn(""); + } + }else if(ModuleConstant.INSTITUTION_DEPT.equals(msgResi2GovFormDTO.getInstitutionFlag())){ + //1.根据部门Id找到其AGENCY_ID，调用gov-org服务 + Result deptInfo = govOrgFeignClient.getDept(msgResi2GovFormDTO.getInstitutionId()); + if(deptInfo.success() && null != deptInfo.getData() && StringUtils.isNoneBlank(deptInfo.getData().getAgencyId())){ + + }else{ logger.warn(""); } } From 0ece1d128769b993ca991437a88d01511c8f25d9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 15:50:19 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1=E7=99=BB=E9=99=86=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8Csql=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/CustomerStaffGridDao.xml | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml index b4490ab565..9a4290d11c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml @@ -19,23 +19,21 @@ From 893e39caf5e0094fefb92fe43177c6ceb10b68ed Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 16:05:37 +0800 Subject: [PATCH 03/16] =?UTF-8?q?message=E6=A8=A1=E5=9D=97=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E7=94=A8=E5=A4=96=E9=83=A8=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/pom.xml | 6 --- .../fallback/GovOrgFeignClientFallBack.java | 18 -------- .../com/epmet/service/UserMessageService.java | 9 ---- .../service/impl/UserMessageServiceImpl.java | 41 ------------------- .../resi-group/resi-group-server/pom.xml | 6 +++ .../modules}/feign/GovOrgFeignClient.java | 4 +- .../fallback/GovOrgFeignClientFallBack.java | 24 +++++++++++ 7 files changed, 32 insertions(+), 76 deletions(-) delete mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java rename epmet-module/{epmet-message/epmet-message-server/src/main/java/com/epmet => resi-group/resi-group-server/src/main/java/com/epmet/modules}/feign/GovOrgFeignClient.java (91%) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 03180554fb..46bb33b442 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -90,12 +90,6 @@ feign-httpclient 10.3.0 - - com.epmet - gov-org-client - 2.0.0 - compile - diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java deleted file mode 100644 index 485e0b5883..0000000000 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.feign.fallback; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerGridDTO; -import com.epmet.feign.GovOrgFeignClient; -import org.springframework.stereotype.Component; - - -@Component -public class GovOrgFeignClientFallBack implements GovOrgFeignClient { - - @Override - public Result get(String id) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", id); - } -} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 6b867b26b1..ebb6141067 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; -import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; import java.util.List; @@ -135,12 +134,4 @@ public interface UserMessageService extends BaseService { * @Description 批量插入未读消息 **/ Result saveUserMessageList(List msgList); - - /** - * @Description 居民端动作触发发消息给政府端 - * @param msgResi2GovFormDTO - * @author wangc - * @date 2020.04.29 14:42 - */ - Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 505f329900..1e5cc4e52e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -24,23 +24,16 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; -import com.epmet.dto.CustomerDepartmentDTO; -import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; -import com.epmet.dto.form.SendMsgResi2GovFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; -import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.UserMessageRedis; import com.epmet.service.UserMessageService; -import com.epmet.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; -import org.bouncycastle.math.raw.Mod; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -63,8 +56,6 @@ public class UserMessageServiceImpl extends BaseServiceImpl page(Map params) { @@ -183,36 +174,4 @@ public class UserMessageServiceImpl extends BaseServiceImpl gridInfo = govOrgFeignClient.getGrid(msgResi2GovFormDTO.getInstitutionId()); - if(gridInfo.success() && null != gridInfo.getData() && StringUtils.isNotBlank(gridInfo.getData().getPid())){ - - }else{ - logger.warn(""); - } - }else if(ModuleConstant.INSTITUTION_DEPT.equals(msgResi2GovFormDTO.getInstitutionFlag())){ - //1.根据部门Id找到其AGENCY_ID，调用gov-org服务 - Result deptInfo = govOrgFeignClient.getDept(msgResi2GovFormDTO.getInstitutionId()); - if(deptInfo.success() && null != deptInfo.getData() && StringUtils.isNoneBlank(deptInfo.getData().getAgencyId())){ - - }else{ - logger.warn(""); - } - } - - - //2.1根据AgencyId查找staff_role下所有的staffId且是未被禁用的，调用epmet-user服务 - - //2.2是本机构下的所有拥有roleKey的工作人员还是本网格下所有拥有roleKey的工作人员 - //如果是本网格下则需要再次调用gov-org服务校验查询出相应角色的员工是否在本网格下，如果是本机构下则跳过此操作 - - //3.创建消息，调用epmet-message服务 - - return null; - } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index b246579931..16195cb349 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -70,6 +70,12 @@ 2.0.0 compile + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java similarity index 91% rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java index 06ad630418..23a4c288f1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java @@ -1,10 +1,10 @@ -package com.epmet.feign; +package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerDepartmentDTO; import com.epmet.dto.CustomerGridDTO; -import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..d71016b127 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,24 @@ +package com.epmet.modules.feign.fallback; + + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerDepartmentDTO; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.modules.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + + +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + + @Override + public Result getGrid(String id) { + return null; + } + + @Override + public Result getDept(String id) { + return null; + } +} From 60ff964c306e9daee2e8271b97bbf0c4905cb338 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 16:15:40 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message/epmet-message-server/docker-compose.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- epmet-module/gov-access/gov-access-server/docker-compose.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/gov-mine/gov-mine-server/docker-compose.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- epmet-module/resi-mine/resi-mine-server/docker-compose.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml index 4acd697b6a..d857148255 100644 --- a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml +++ b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.3 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 46bb33b442..c010cc11c2 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.2 + 0.3.3 com.epmet epmet-message diff --git a/epmet-module/gov-access/gov-access-server/docker-compose.yml b/epmet-module/gov-access/gov-access-server/docker-compose.yml index 97308b20a8..f718b955d9 100644 --- a/epmet-module/gov-access/gov-access-server/docker-compose.yml +++ b/epmet-module/gov-access/gov-access-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.4 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.5 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 39eb648ee5..236e3e4779 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.4 + 0.3.5 gov-access com.epmet diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index 437246d6fd..8611a05058 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.8 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 479a30aa60..c8763dd519 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-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.7 + 0.3.8 com.epmet gov-grid diff --git a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml index 6255e062a1..e1a9cfb9fb 100644 --- a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml +++ b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.5 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.6 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 9433e1feaf..5e0da7bf23 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.5 + 0.3.6 com.epmet gov-mine diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 8361613dab..dee7d3d762 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.23 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3d5a8a15cb..06c69b7720 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.22 + 0.3.23 com.epmet gov-org diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index 9aff8cbcfb..0518e66892 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.4 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.5 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 6dc1dbc8b9..397f48a84c 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.4 + 0.3.5 com.epmet resi-group diff --git a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml index 49332b795d..7ca19acf2e 100644 --- a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml +++ b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.4 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 25d9224c79..7b8a38f01c 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.3 + 0.3.4 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index f7c720ca4a..f2e8b2696f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.8 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index f746a56032..e0bfb6e9bc 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.7 + 0.3.8 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index e78e9c1a21..73c69d21de 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.17 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.18 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 1adb0d85af..1c871f8a2a 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.17 + 0.3.18 com.epmet epmet-user From 3494dba9428eb4b8b5d32a189d32774823048c21 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 29 Apr 2020 16:46:05 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/PartyMemberMessageConstant.java | 28 +++++++++++++ .../impl/PartyMemberConfirmServiceImpl.java | 42 ++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java new file mode 100644 index 0000000000..a64121d16e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java @@ -0,0 +1,28 @@ +package com.epmet.constant; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/29 13:41 + */ +public interface PartyMemberMessageConstant { + /** + * 消息标题 + */ + String GROUP_TITLE = "您有一条党员申请消息"; + + /** + * 党员提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为党员，请审核。 + */ + String MEMBER_APPLY_MSG = "%s申请成为党员，请审核。"; + + /** + * 党员申请审核通过给申请人发送消息：您好，您申请的党员已审核通过，请查看。 + */ + String AUDIT_APPROVE_MSG = "您好，您申请的%s党员已审核通过，请查看。"; + + /** + * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。 + */ + String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。"; +} 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 6718a6fb72..63483599b3 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 @@ -1,12 +1,18 @@ package com.epmet.modules.partymember.service.impl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; +import com.epmet.constant.PartyMemberMessageConstant; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; @@ -16,6 +22,8 @@ import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; +import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; +import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; @@ -260,11 +268,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService partymemberConfirmManualService.insert(manualEntity); } - + auditMessage(ConvertUtils.sourceToTarget(partyMemberInfo, PartymemberInfoEntity.class), PartyMemberMessageConstant.MEMBER_APPLY_MSG); return new Result(); } @Override + @Transactional(rollbackFor = Exception.class) public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); @@ -289,6 +298,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //存入党员注册关系表 用于统计客户网格的认证党员数 saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, PartymemberInfoDTO.class)); + auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG); + } else { + auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG); } return new Result(); @@ -532,4 +544,32 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return partymemberVisitEntity.getId(); } + /** + * 热心居民申请审核通过向申请人发送消息 + * @Author sun + * @param formDTO + * @param userMsg 消息模板 + */ + private Result auditMessage(PartymemberInfoEntity formDTO, String userMsg) { + UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO(); + userMessageFormDTO.setCustomerId(formDTO.getCustomerId()); + userMessageFormDTO.setGridId(formDTO.getGridId()); + userMessageFormDTO.setUserId(formDTO.getUserId()); + userMessageFormDTO.setApp(AppClientConstant.APP_RESI); + userMessageFormDTO.setTitle(PartyMemberMessageConstant.GROUP_TITLE); + //调用gov-org服务查询网格信息 + CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); + customerGridFormDTO.setGridId(formDTO.getGridId()); + Result result = govOrgFeignClient.getCustomerGridByGridId(customerGridFormDTO); + String gridName = null; + if (result.success() && null != result.getData()) { + gridName = result.getData().getGridName(); + } + String messageContent = String.format(userMsg, gridName); + userMessageFormDTO.setMessageContent(messageContent); + userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ); + //保存消息 + return messageFeignClient.saveUserMessage(userMessageFormDTO); + } + } From c2fc29611fa90d854c1d23fcc1792d0642230295 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 16:56:09 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=A2=AB=E8=B0=83=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=82=E6=95=B0=E5=8A=A0@RequestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ResiGroupController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index 128c08fa0a..e28a91d374 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -51,7 +51,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") - public Result> getGroupsInGrid(GroupAuditedFromDTO formDTO) { + public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); } @@ -63,7 +63,7 @@ public class ResiGroupController { * @return Result */ @PostMapping("getgroupsummarize") - public Result getGroupSummarize(GovGroupSummarizeFromDTO formDTO) { + public Result getGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupSummarize(formDTO); } From dfb0afb088dddfc3b2ab258bcbc7b8a2eba429db Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 16:59:10 +0800 Subject: [PATCH 07/16] =?UTF-8?q?epmet-group=E6=9C=8D=E5=8A=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8A=A0@RequestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/controller/ResiGroupController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 8d1e757349..84f5c4ad95 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -225,7 +225,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("audited") - public Result> audited(GroupAuditedFromDTO formDTO) { + public Result> audited(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.audited(formDTO); } @@ -237,7 +237,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") - public Result> getGroupsInGrid(GroupAuditedFromDTO formDTO) { + public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); } @@ -249,7 +249,7 @@ public class ResiGroupController { * @return Result */ @PostMapping("getgovgroupsummarize") - public Result getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO) { + public Result getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) { return resiGroupService.getGovGroupSummarize(formDTO); } From a29ee9355404e4daa3188307065e0cc7792a1b91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 17:12:49 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81-?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AuditedPartyMemberResultDTO.java | 2 +- .../com/epmet/dto/result/AuditingPartyMemberResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 2 ++ .../dto/partymember/result/ReviewedParyMemberResultDTO.java | 2 +- .../partymember/result/UnderReviewParyMemberResultDTO.java | 2 +- .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++--- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java index 96cfa3ffe4..7324243e89 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java @@ -31,7 +31,7 @@ public class AuditedPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java index b7fa6ff38d..21733fe9fb 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java @@ -32,7 +32,7 @@ public class AuditingPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * 提交网格：XXX街道-XXX社区-XXX网格 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index ab835da389..8f54c62f10 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -435,7 +435,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl(); } + gridInfoResultDTO.setGridId(gridId); gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId()); + gridInfoResultDTO.setGridName(customerGridDTO.getGridName()); String pids=customerGridDTO.getPids(); String[] pidArray = pids.split(":"); for(String agencyId:pidArray){ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java index 704b9f9b7a..4b9d082184 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java @@ -29,7 +29,7 @@ public class ReviewedParyMemberResultDTO { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java index f625e3117c..bef4f48ad2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java @@ -32,7 +32,7 @@ public class UnderReviewParyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * read已读unread未读 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index 809493652a..2cbad32ae0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -60,7 +60,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pcm.READ_FLAG AS readFlag, pi.id as partyMemberId, pca.id as autoId, @@ -85,7 +85,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId, @@ -102,7 +102,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId, From 6e346b39f8178dc5e11b189a73895eb05875a677 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 17:15:46 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81-?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=91=E5=B8=83=EF=BC=8C=E7=BE=A4=E7=BB=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index 8611a05058..77d9b3d06b 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.8 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.9 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index c8763dd519..8eb4863cb0 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-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.9 com.epmet gov-grid diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index dee7d3d762..691fb62d7e 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.23 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.24 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 06c69b7720..e35314fb3f 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.23 + 0.3.24 com.epmet gov-org diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index 0518e66892..306085ac2d 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.5 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.6 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 397f48a84c..e7467addca 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.5 + 0.3.6 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index f2e8b2696f..eaff328c77 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.8 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.9 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index e0bfb6e9bc..d087c173b4 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.8 + 0.3.9 com.epmet resi-partymember From 7d087cb0a1e4d8d8d1469759da223d1705788fee Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Wed, 29 Apr 2020 17:22:37 +0800 Subject: [PATCH 10/16] =?UTF-8?q?gridFullPath=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 11 ++++++----- .../service/impl/PartymemberInfoServiceImpl.java | 3 ++- .../mapper/partymember/PartymemberInfoDao.xml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 62a6993740..8b2962f518 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -96,13 +96,14 @@