Browse Source

系统用户绑定产品网格员功能修改

feature/screenDataPush
liuchuang 4 years ago
parent
commit
fc903df9c8
  1. 5
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java
  2. 5
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
  3. 89
      esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml
  4. 17
      esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql
  5. 31
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java
  6. 22
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java
  7. 24
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml
  8. 31
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml
  9. 5
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  10. 38
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysEpmetUserRelationController.java
  11. 11
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  12. 15
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysEpmetUserRelationDao.java
  13. 5
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysEpmetUserRelationEntity.java
  14. 15
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
  15. 9
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
  16. 13
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysEpmetUserRelationService.java
  17. 33
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java
  18. 13
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  19. 8
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysEpmetUserRelationDao.xml
  20. 1
      esua-epdc/epdc-admin/pom.xml
  21. 5
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
  22. 11
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
  23. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java
  24. 13
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java
  25. 3
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml

5
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java → 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 <http://www.gnu.org/licenses/>.
*/
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;
/**

5
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;
}

89
esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml

@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>esua-epdc</artifactId>
<groupId>com.esua.epdc</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-admin-epmet</artifactId>
<description>admin模块项目对接产品功能工具包</description>
<dependencies>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-admin-client</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-commons-mybatis</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>
</project>

17
esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql

@ -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='项目产品工作人员关系表';

31
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java

@ -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;
/**
* 数据分析模块调用
*
* @Authorliuchuang
* @Date2020/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<com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO>
* @author liuchuang
* @since 2021/7/8 19:19
*/
@GetMapping(value = "analysis/admin/getEpmetUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto);
}

22
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java

@ -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;
/**
* @Authorsongyunpeg
* @Date2020/9/9 15:42
*/
@Component
public class EpmetAnalysisFeignClientFallback implements EpmetAnalysisFeignClient {
@Override
public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getEpmetUserInfoByMobile",formDto);
}
}

24
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml

@ -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'

31
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 开发、测试环境 -->
<springProfile name="dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.elink.esua.epdc" level="INFO"/>
<logger name="com.elink.esua.epdc.epmet.modules.userrelation.dao" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.elink.esua.epdc" level="INFO"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
</configuration>

5
esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@ -13,11 +13,6 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-admin-epmet</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-admin-client</artifactId>

38
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java → 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 <http://www.gnu.org/licenses/>.
*/
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<com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO>
* @author liuchuang
* @since 2021/7/8 16:39
*/
@GetMapping("getepmetuser/{id}")
public Result<SysEpmetUserRelationDTO> getEpmetUser(@PathVariable("id") Long id) {
SysEpmetUserRelationDTO data = sysEpmetUserRelationService.getSysUserRelationEpmetInfo(id);
return new Result<SysEpmetUserRelationDTO>().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);
}
}

11
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<Long> 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<SysUserDTO>().ok(data);
}

15
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java → 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 <http://www.gnu.org/licenses/>.
*/
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<SysEpmetUserRelationEnt
*/
SysEpmetUserRelationEntity selectSysUserRelationEpmetInfo(Long id);
/**
* 根据手机号获取系统用户
*
* @param mobile 手机号
* @return com.elink.esua.epdc.dto.SysUserDTO
* @author liuchuang
* @since 2021/7/10 14:13
*/
SysUserDTO selectSysUserInfoByMobile(String mobile);
/**
* 删除已绑定网格员信息
*

5
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/entity/SysEpmetUserRelationEntity.java → esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysEpmetUserRelationEntity.java

@ -15,16 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;
/**
* 项目产品工作人员关系表
*

15
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<DeptAddAreaCodeResultDTO> addAreaCode(DeptAddAreaCodeFormDTO formDto);
/**
* 根据手机号获取产品工作人员信息
*
* @param formDto 入参
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO>
* @author liuchuang
* @since 2021/7/8 19:19
*/
@GetMapping(value = "analysis/admin/getEpmetUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto);
}

9
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<DeptAddAreaCodeResultDTO> addAreaCode(DeptAddAreaCodeFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "addAreaCode",formDto);
}
@Override
public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getEpmetUserInfoByMobile",formDto);
}
}

13
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java → 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 <http://www.gnu.org/licenses/>.
*/
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<SysEpmetUserRel
/**
* 当前用户绑定产品工作人员信息
*
* @param formDto 产品工作人员信息
* @param id 系统用户ID
* @param wgyInfo 网格员信息
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author liuchuang
* @since 2021/7/8 17:09
* @since 2021/7/10 17:45
*/
Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto);
Result saveOrUpdateUserEpmetRelation(Long id, SysEpmetUserRelationDTO wgyInfo);
}

33
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java → esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java

@ -15,24 +15,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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<SysEpmetUserRelationDao, SysEpmetUserRelationEntity> implements SysEpmetUserRelationService {
@Autowired
private EpmetAnalysisFeignClient epmetAnalysisFeignClient;
private AnalysisFeignClient analysisFeignClient;
@Override
public PageData<SysEpmetUserRelationDTO> page(Map<String, Object> params) {
@ -116,7 +116,7 @@ public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl<SysEpmetUse
public Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(String mobile) {
SysEpmetUserFormDTO formDto = new SysEpmetUserFormDTO();
formDto.setMobile(mobile);
Result<SysEpmetUserResultDTO> result = epmetAnalysisFeignClient.getEpmetUserInfoByMobile(formDto);
Result<SysEpmetUserResultDTO> result = analysisFeignClient.getEpmetUserInfoByMobile(formDto);
if (result.success()) {
SysEpmetUserRelationDTO data = ConvertUtils.sourceToTarget(result.getData(), SysEpmetUserRelationDTO.class);
return new Result<SysEpmetUserRelationDTO>().ok(data);
@ -126,17 +126,12 @@ public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl<SysEpmetUse
}
@Override
public Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto) {
// 获取系统工作人员ID
SysUserDTO sysUser = baseDao.selectSysUserInfoByMobile(formDto.getMobile());
if (null == sysUser) {
throw new RenException("查询用户信息失败");
}
formDto.setSysUserId(sysUser.getId());
public Result saveOrUpdateUserEpmetRelation(Long id, SysEpmetUserRelationDTO wgyInfo) {
// 删除已绑定网格员信息
baseDao.deleteRelationInfoBySysUserId(sysUser.getId());
if (StringUtils.isNotEmpty(formDto.getId())) {
insert(ConvertUtils.sourceToTarget(formDto, SysEpmetUserRelationEntity.class));
baseDao.deleteRelationInfoBySysUserId(id);
if (StringUtils.isNotEmpty(wgyInfo.getStaffId())) {
wgyInfo.setSysUserId(id);
insert(ConvertUtils.sourceToTarget(wgyInfo, SysEpmetUserRelationEntity.class));
}
return new Result();

13
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -32,10 +32,7 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
import com.elink.esua.epdc.entity.SysUserEntity;
import com.elink.esua.epdc.service.SysDeptService;
import com.elink.esua.epdc.service.SysRoleUserService;
import com.elink.esua.epdc.service.SysUserDeptService;
import com.elink.esua.epdc.service.SysUserService;
import com.elink.esua.epdc.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -61,6 +58,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
@Autowired
private SysUserDeptService sysUserDeptService;
@Autowired
private SysEpmetUserRelationService sysEpmetUserRelationService;
@Override
public PageData<SysUserDTO> page(Map<String, Object> params) {
//转换成like
@ -142,6 +142,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
// 保存/更新用户关联部门信息
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
// 保存/更新网格员信息
sysEpmetUserRelationService.saveOrUpdateUserEpmetRelation(entity.getId(), dto.getWgyInfo());
}
@Override
@ -168,6 +170,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
// 保存/更新用户关联部门信息
sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
// 保存/更新网格员信息
sysEpmetUserRelationService.saveOrUpdateUserEpmetRelation(entity.getId(), dto.getWgyInfo());
}
/**

8
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml → esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysEpmetUserRelationDao.xml

@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.epmet.modules.userrelation.dao.SysEpmetUserRelationDao">
<mapper namespace="com.elink.esua.epdc.dao.SysEpmetUserRelationDao">
<select id="selectSysUserRelationEpmetInfo" resultType="com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity">
<select id="selectSysUserRelationEpmetInfo" resultType="com.elink.esua.epdc.entity.SysEpmetUserRelationEntity">
SELECT * FROM sys_epmet_user_relation WHERE DEL_FLAG = '0' AND SYS_USER_ID = #{id}
</select>
<select id="selectSysUserInfoByMobile" resultType="com.elink.esua.epdc.dto.SysUserDTO">
SELECT * FROM sys_user WHERE DEL_FLAG = 0 AND mobile = #{mobile}
</select>
<delete id="deleteRelationInfoBySysUserId">
DELETE FROM sys_epmet_user_relation WHERE SYS_USER_ID = #{id}
</delete>

1
esua-epdc/epdc-admin/pom.xml

@ -16,7 +16,6 @@
<modules>
<module>epdc-admin-client</module>
<module>epdc-admin-server</module>
<module>epdc-admin-epmet</module>
</modules>
</project>

5
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;
}

11
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml

@ -137,10 +137,11 @@
<nacos.ip></nacos.ip>
<nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
<epmet.url>http://192.168.1.140/api</epmet.url>
<epmet.secret>d2c011b14217425eb48e27cf6481716ae845cff14cc0429198a8348c76893023</epmet.secret>
<epmet.appId>c1fe1becebf94b8aef724728690816a0</epmet.appId>
<epmet.customerId>eac9d3b8b10c328350b59ac4b1d64db5</epmet.customerId>
<epmet.url>https://epmet-dev.elinkservice.cn/api</epmet.url>
<epmet.secret>0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e</epmet.secret>
<epmet.appId>d44a6daaea58be408bb74fe93714710f</epmet.appId>
<epmet.customerId>f5ff0770f409981c73adda6ae35143ef</epmet.customerId>
<epmet.py.customerId>78e2b2227c07de1fe54da14e2b2d9eb6</epmet.py.customerId>
</properties>
</profile>
@ -168,6 +169,7 @@
<epmet.secret>0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e</epmet.secret>
<epmet.appId>d44a6daaea58be408bb74fe93714710f</epmet.appId>
<epmet.customerId>f5ff0770f409981c73adda6ae35143ef</epmet.customerId>
<epmet.py.customerId>78e2b2227c07de1fe54da14e2b2d9eb6</epmet.py.customerId>
</properties>
</profile>
@ -193,6 +195,7 @@
<epmet.secret>0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1</epmet.secret>
<epmet.appId>f257a3497224ae078af12966b068a81c</epmet.appId>
<epmet.customerId>44876154d10d7cb7affd92000f84f833</epmet.customerId>
<epmet.py.customerId>6f203e30de1a65aab7e69c058826cd80</epmet.py.customerId>
</properties>
</profile>
</profiles>

4
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<IssueAnalysisDao,
@Autowired
private EpmetUtils epmetUtils;
@Autowired
private EpmetProperties epmetProperties;
@Override
public DeptCodeOption getDeptCode(DeptCodeFormDTO deptCodeFormDTO) {
@ -51,6 +54,7 @@ public class AdminAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
@Override
public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) {
formDto.setCustomerId(epmetProperties.getPyCustomerId());
String dataResult = epmetUtils.httpPost(EpmetConstant.EPMET_STAFF_INFO, JSONObject.toJSONString(formDto));
return JSONObject.parseObject(dataResult, Result.class);
}

13
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;
}
}

3
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@
pyCustomerId: @epmet.py.customerId@
url: @epmet.url@

Loading…
Cancel
Save