diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java similarity index 97% rename from esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java rename to esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java index 8b17c9e0..8730de11 100644 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.epmet.modules.userrelation.dto; +package com.elink.esua.epdc.dto; + +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; /** diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index e8aa6d35..9667eaae 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java @@ -129,4 +129,9 @@ public class SysUserDTO implements Serializable { */ private String relationLeaderDeptName; + /** + * 系统用户绑定的网格员信息 + */ + private SysEpmetUserRelationDTO wgyInfo; + } diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml b/esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml deleted file mode 100644 index 55da4ac6..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - esua-epdc - com.esua.epdc - 1.0.0 - - 4.0.0 - - epdc-admin-epmet - admin模块项目对接产品功能工具包 - - - - com.esua.epdc - epdc-admin-client - 1.0.0 - - - com.esua.epdc - epdc-commons-mybatis - 1.0.0 - - - org.springframework.boot - spring-boot-autoconfigure - compile - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-context-support - - - - - ${project.artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - com.spotify - dockerfile-maven-plugin - - - - ${project.basedir}/src/main/java - - - - true - ${basedir}/src/main/resources - - **/application*.yml - **/*.properties - logback-spring.xml - registry.conf - - - - ${basedir}/src/main/resources - - **/application*.yml - **/*.properties - logback-spring.xml - registry.conf - - - - - - diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql b/esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql deleted file mode 100644 index 6b35d620..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql +++ /dev/null @@ -1,17 +0,0 @@ -CREATE TABLE `sys_epmet_user_relation` ( - `ID` varchar(32) NOT NULL COMMENT 'ID', - `SYS_USER_ID` bigint(20) NOT NULL COMMENT '项目端用户ID', - `STAFF_ID` varchar(100) NOT NULL COMMENT '产品端工作人员ID', - `STAFF_NAME` varchar(100) NOT NULL COMMENT '产品端工作人员姓名', - `MOBILE` varchar(50) NOT NULL COMMENT '产品端工作人员手机号', - `AGENCY_ID` varchar(100) NOT NULL COMMENT '产品端工作人员所属组织ID', - `AGENCY_ALL_NAME` varchar(300) NOT NULL COMMENT '产品端工作人员所属组织全路径名称', - `CUSTOMER_ID` varchar(100) NOT NULL COMMENT '产品端工作人员所属客户id', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0-否，1-是', - `REVISION` int(11) DEFAULT 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/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java deleted file mode 100644 index 01a0b69c..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.elink.esua.epdc.epmet.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.admin.*; -import com.elink.esua.epdc.epmet.modules.feign.fallback.EpmetAnalysisFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * 数据分析模块调用 - * - * @Author：liuchuang - * @Date：2020/9/9 15:41 - */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = EpmetAnalysisFeignClientFallback.class) -public interface EpmetAnalysisFeignClient { - - /** - * 根据手机号获取产品工作人员信息 - * - * @param formDto 入参 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2021/7/8 19:19 - */ - @GetMapping(value = "analysis/admin/getEpmetUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto); - -} diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java deleted file mode 100644 index 9448221e..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.epmet.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.admin.*; -import com.elink.esua.epdc.epmet.modules.feign.EpmetAnalysisFeignClient; -import org.springframework.stereotype.Component; - -/** - * @Author：songyunpeg - * @Date：2020/9/9 15:42 - */ -@Component -public class EpmetAnalysisFeignClientFallback implements EpmetAnalysisFeignClient { - - - @Override - public Result getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getEpmetUserInfoByMobile",formDto); - } -} diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml deleted file mode 100644 index 71d20d6a..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml +++ /dev/null @@ -1,24 +0,0 @@ -mybatis-plus: - mapper-locations: classpath:/mapper/**/*.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.elink.esua.epdc.epmet.modules.*.entity - global-config: - #数据库相关配置 - db-config: - #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; - id-type: UUID - #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" - field-strategy: NOT_NULL - #驼峰下划线转换 - column-underline: true - #db-type: mysql - #刷新mapper 调试神器 - refresh-mapper: true - banner: false - #原生配置 - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - call-setters-on-nulls: true - jdbc-type-for-null: 'null' - diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml b/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml deleted file mode 100644 index 361642d5..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 7b80a8dc..9230ffca 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -13,11 +13,6 @@ jar - - com.esua.epdc - epdc-admin-epmet - 1.0.0 - com.esua.epdc epdc-admin-client diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysEpmetUserRelationController.java similarity index 71% rename from esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java rename to esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysEpmetUserRelationController.java index 3b2e24e4..9169635c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysEpmetUserRelationController.java @@ -15,23 +15,20 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.epmet.modules.userrelation.controller; +package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO; -import com.elink.esua.epdc.epmet.modules.userrelation.service.SysEpmetUserRelationService; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO; +import com.elink.esua.epdc.service.SysEpmetUserRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; import java.util.Map; @@ -84,20 +81,6 @@ public class SysEpmetUserRelationController { return new Result(); } - /** - * 获取当前用户已绑定的产品工作人员信息 - * - * @param id 当前用户ID - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2021/7/8 16:39 - */ - @GetMapping("getepmetuser/{id}") - public Result getEpmetUser(@PathVariable("id") Long id) { - SysEpmetUserRelationDTO data = sysEpmetUserRelationService.getSysUserRelationEpmetInfo(id); - return new Result().ok(data); - } - /** * 根据手机号获取产品工作人员信息 * @@ -111,17 +94,4 @@ public class SysEpmetUserRelationController { return sysEpmetUserRelationService.getStaffUserFromEpmet(mobile); } - /** - * 当前用户绑定产品工作人员信息 - * - * @param formDto 产品工作人员信息 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2021/7/8 16:47 - */ - @PostMapping("bindepmetuser") - public Result bindEpmetUser(@RequestBody SysEpmetUserRelationDTO formDto) { - return sysEpmetUserRelationService.bindSysUserWithEpmetUser(formDto); - } - } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 19152cfb..8e2284b5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -61,6 +61,8 @@ public class SysUserController { private SysResourceService sysResourceService; @Autowired private SysDeptService sysDeptService; + @Autowired + private SysEpmetUserRelationService sysEpmetUserRelationService; @GetMapping("page") @ApiOperation("分页") @@ -86,6 +88,15 @@ public class SysUserController { List roleIdList = sysRoleUserService.getRoleIdList(id); data.setRoleIdList(roleIdList); + // 绑定的网格员信息 + SysEpmetUserRelationDTO wgyInfo = sysEpmetUserRelationService.getSysUserRelationEpmetInfo(id); + if (null == wgyInfo) { + SysEpmetUserRelationDTO wgy = new SysEpmetUserRelationDTO(); + data.setWgyInfo(wgy); + } else { + data.setWgyInfo(wgyInfo); + } + return new Result().ok(data); } diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysEpmetUserRelationDao.java similarity index 76% rename from esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java rename to esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysEpmetUserRelationDao.java index 26f32429..c5359917 100644 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysEpmetUserRelationDao.java @@ -15,12 +15,11 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.epmet.modules.userrelation.dao; +package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.SysUserDTO; -import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO; -import com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity; +import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -42,16 +41,6 @@ public interface SysEpmetUserRelationDao extends BaseDao. */ -package com.elink.esua.epdc.epmet.modules.userrelation.entity; +package com.elink.esua.epdc.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 项目产品工作人员关系表 * diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 905eb1e6..9d127060 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO; -import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO; -import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.admin.*; import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -43,4 +41,15 @@ public interface AnalysisFeignClient { @PostMapping(value = "analysis/admin/addAreaCode", consumes = MediaType.APPLICATION_JSON_VALUE) Result addAreaCode(DeptAddAreaCodeFormDTO formDto); + /** + * 根据手机号获取产品工作人员信息 + * + * @param formDto 入参 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2021/7/8 19:19 + */ + @GetMapping(value = "analysis/admin/getEpmetUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto); + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 0691bd96..39186393 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -3,9 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO; -import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO; -import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.admin.*; import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; @@ -27,4 +25,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result addAreaCode(DeptAddAreaCodeFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "addAreaCode",formDto); } + + @Override + public Result getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getEpmetUserInfoByMobile",formDto); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysEpmetUserRelationService.java similarity index 89% rename from esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java rename to esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysEpmetUserRelationService.java index cf1e78a4..e55cf15f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysEpmetUserRelationService.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.epmet.modules.userrelation.service; +package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO; -import com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity; +import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO; +import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity; import java.util.List; import java.util.Map; @@ -117,10 +117,11 @@ public interface SysEpmetUserRelationService extends BaseService. */ -package com.elink.esua.epdc.epmet.modules.userrelation.service.impl; +package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dao.SysEpmetUserRelationDao; +import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO; import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO; -import com.elink.esua.epdc.epmet.modules.feign.EpmetAnalysisFeignClient; -import com.elink.esua.epdc.epmet.modules.userrelation.dao.SysEpmetUserRelationDao; -import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO; -import com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity; -import com.elink.esua.epdc.epmet.modules.userrelation.service.SysEpmetUserRelationService; +import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.service.SysEpmetUserRelationService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,7 +52,7 @@ import java.util.Map; public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl implements SysEpmetUserRelationService { @Autowired - private EpmetAnalysisFeignClient epmetAnalysisFeignClient; + private AnalysisFeignClient analysisFeignClient; @Override public PageData page(Map params) { @@ -116,7 +116,7 @@ public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl getStaffUserFromEpmet(String mobile) { SysEpmetUserFormDTO formDto = new SysEpmetUserFormDTO(); formDto.setMobile(mobile); - Result result = epmetAnalysisFeignClient.getEpmetUserInfoByMobile(formDto); + Result result = analysisFeignClient.getEpmetUserInfoByMobile(formDto); if (result.success()) { SysEpmetUserRelationDTO data = ConvertUtils.sourceToTarget(result.getData(), SysEpmetUserRelationDTO.class); return new Result().ok(data); @@ -126,17 +126,12 @@ public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl page(Map params) { //转换成like @@ -142,6 +142,8 @@ public class SysUserServiceImpl extends BaseServiceImpl - + - SELECT * FROM sys_epmet_user_relation WHERE DEL_FLAG = '0' AND SYS_USER_ID = #{id} - - DELETE FROM sys_epmet_user_relation WHERE SYS_USER_ID = #{id} diff --git a/esua-epdc/epdc-admin/pom.xml b/esua-epdc/epdc-admin/pom.xml index 558dfeff..efcda291 100644 --- a/esua-epdc/epdc-admin/pom.xml +++ b/esua-epdc/epdc-admin/pom.xml @@ -16,7 +16,6 @@ epdc-admin-client epdc-admin-server - epdc-admin-epmet diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java index c47d22a7..89de94e4 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java @@ -18,4 +18,9 @@ public class SysEpmetUserFormDTO implements Serializable { */ @NotBlank(message = "手机号不能为空") private String mobile; + + /** + * 客户ID + */ + private String customerId; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 179404ae..18e5c522 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -137,10 +137,11 @@ 1da17390-6495-4e16-9ec6-0b8ece18a4a0 - http://192.168.1.140/api - d2c011b14217425eb48e27cf6481716ae845cff14cc0429198a8348c76893023 - c1fe1becebf94b8aef724728690816a0 - eac9d3b8b10c328350b59ac4b1d64db5 + https://epmet-dev.elinkservice.cn/api + 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e + d44a6daaea58be408bb74fe93714710f + f5ff0770f409981c73adda6ae35143ef + 78e2b2227c07de1fe54da14e2b2d9eb6 @@ -168,6 +169,7 @@ 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e d44a6daaea58be408bb74fe93714710f f5ff0770f409981c73adda6ae35143ef + 78e2b2227c07de1fe54da14e2b2d9eb6 @@ -193,6 +195,7 @@ 0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1 f257a3497224ae078af12966b068a81c 44876154d10d7cb7affd92000f84f833 + 6f203e30de1a65aab7e69c058826cd80 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java index 46d219f0..4f749c6b 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java @@ -11,6 +11,7 @@ import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.admin.service.AdminAnalysisService; import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao; +import com.elink.esua.epdc.properties.EpmetProperties; import com.elink.esua.epdc.utils.EpmetUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +29,8 @@ public class AdminAnalysisServiceImpl extends BaseServiceImpl getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) { + formDto.setCustomerId(epmetProperties.getPyCustomerId()); String dataResult = epmetUtils.httpPost(EpmetConstant.EPMET_STAFF_INFO, JSONObject.toJSONString(formDto)); return JSONObject.parseObject(dataResult, Result.class); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java index b9723e82..085ea80f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java @@ -33,6 +33,11 @@ public class EpmetProperties { */ private String customerId; + /** + * 平阴客户ID + */ + private String pyCustomerId; + public String getAppId() { return appId; } @@ -64,4 +69,12 @@ public class EpmetProperties { public void setCustomerId(String customerId) { this.customerId = customerId; } + + public String getPyCustomerId() { + return pyCustomerId; + } + + public void setPyCustomerId(String pyCustomerId) { + this.pyCustomerId = pyCustomerId; + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml index a6a8c4d4..34c4a1a5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml @@ -70,4 +70,5 @@ epmet: secret: @epmet.secret@ appId: @epmet.appId@ customerId: @epmet.customerId@ - url: @epmet.url@ \ No newline at end of file + pyCustomerId: @epmet.py.customerId@ + url: @epmet.url@