Browse Source

项目端工作人员绑定产品工作人员功能init

feature/screenDataPush
liuchuang 4 years ago
parent
commit
8f09d71e2c
  1. 89
      esua-epdc/epdc-admin/epdc-admin-epmet/pom.xml
  2. 17
      esua-epdc/epdc-admin/epdc-admin-epmet/src/db/sys_epmet_user_relation.sql
  3. 31
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/EpmetAnalysisFeignClient.java
  4. 22
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/feign/fallback/EpmetAnalysisFeignClientFallback.java
  5. 140
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java
  6. 43
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java
  7. 106
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java
  8. 76
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/entity/SysEpmetUserRelationEntity.java
  9. 136
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java
  10. 136
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/impl/SysEpmetUserRelationServiceImpl.java
  11. 24
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/application.yml
  12. 31
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/logback-spring.xml
  13. 10
      esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml
  14. 5
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  15. 1
      esua-epdc/epdc-admin/pom.xml
  16. 5
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java
  17. 5
      esua-epdc/epdc-gateway/pom.xml
  18. 21
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
  19. 44
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java
  20. 8
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
  21. 18
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java
  22. 14
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java
  23. 11
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java

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

@ -0,0 +1,89 @@
<?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

@ -0,0 +1,17 @@
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

@ -0,0 +1,31 @@
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

@ -0,0 +1,22 @@
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);
}
}

140
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/controller/SysEpmetUserRelationController.java

@ -0,0 +1,140 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.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 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;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
@RestController
@RequestMapping("sysepmetuserrelation")
public class SysEpmetUserRelationController {
@Autowired
private SysEpmetUserRelationService sysEpmetUserRelationService;
@GetMapping("page")
public Result<PageData<SysEpmetUserRelationDTO>> page(@RequestParam Map<String, Object> params){
PageData<SysEpmetUserRelationDTO> page = sysEpmetUserRelationService.page(params);
return new Result<PageData<SysEpmetUserRelationDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<SysEpmetUserRelationDTO> get(@PathVariable("id") String id){
SysEpmetUserRelationDTO data = sysEpmetUserRelationService.get(id);
return new Result<SysEpmetUserRelationDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody SysEpmetUserRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
sysEpmetUserRelationService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody SysEpmetUserRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
sysEpmetUserRelationService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
sysEpmetUserRelationService.delete(ids);
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);
}
/**
* 根据手机号获取产品工作人员信息
*
* @param mobile 当前用户手机号
* @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:42
*/
@GetMapping("getstaffuser/{mobile}")
public Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(@PathVariable("mobile") String mobile) {
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);
}
/**
* 解除当前用户已绑定的产品工作人员信息
*
* @param formDto 产品工作人员信息
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author liuchuang
* @since 2021/7/8 16:49
*/
@PostMapping("unbindepmetuser")
public Result unbindEpmetUser(@RequestBody SysEpmetUserRelationDTO formDto) {
return sysEpmetUserRelationService.unbindSysUserWithEpmetUser(formDto);
}
}

43
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dao/SysEpmetUserRelationDao.java

@ -0,0 +1,43 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO;
import com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
@Mapper
public interface SysEpmetUserRelationDao extends BaseDao<SysEpmetUserRelationEntity> {
/**
* 获取当前用户已绑定的产品工作人员信息
*
* @param id 当前用户ID
* @return com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity
* @author liuchuang
* @since 2021/7/8 17:04
*/
SysEpmetUserRelationEntity selectSysUserRelationEpmetInfo(Long id);
}

106
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/dto/SysEpmetUserRelationDTO.java

@ -0,0 +1,106 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
@Data
public class SysEpmetUserRelationDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
/**
* 项目端用户ID
*/
private Long sysUserId;
/**
* 产品端工作人员ID
*/
private String staffId;
/**
* 产品端工作人员姓名
*/
private String staffName;
/**
* 产品端工作人员手机号
*/
private String mobile;
/**
* 产品端工作人员所属组织ID
*/
private String agencyId;
/**
* 产品端工作人员所属组织全路径名称
*/
private String agencyAllName;
/**
* 产品端工作人员所属客户id
*/
private String customerId;
/**
* 删除标识 0-1-
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

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

@ -0,0 +1,76 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.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;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("sys_epmet_user_relation")
public class SysEpmetUserRelationEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 项目端用户ID
*/
private Long sysUserId;
/**
* 产品端工作人员ID
*/
private String staffId;
/**
* 产品端工作人员姓名
*/
private String staffName;
/**
* 产品端工作人员手机号
*/
private String mobile;
/**
* 产品端工作人员所属组织ID
*/
private String agencyId;
/**
* 产品端工作人员所属组织全路径名称
*/
private String agencyAllName;
/**
* 产品端工作人员所属客户id
*/
private String customerId;
}

136
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/java/com/elink/esua/epdc/epmet/modules/userrelation/service/SysEpmetUserRelationService.java

@ -0,0 +1,136 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.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 java.util.List;
import java.util.Map;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
public interface SysEpmetUserRelationService extends BaseService<SysEpmetUserRelationEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<SysEpmetUserRelationDTO>
* @author generator
* @date 2021-07-08
*/
PageData<SysEpmetUserRelationDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<SysEpmetUserRelationDTO>
* @author generator
* @date 2021-07-08
*/
List<SysEpmetUserRelationDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return SysEpmetUserRelationDTO
* @author generator
* @date 2021-07-08
*/
SysEpmetUserRelationDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2021-07-08
*/
void save(SysEpmetUserRelationDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2021-07-08
*/
void update(SysEpmetUserRelationDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2021-07-08
*/
void delete(String[] ids);
/**
* 获取当前用户已绑定的产品工作人员信息
*
* @param id 当前用户ID
* @return com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO
* @author liuchuang
* @since 2021/7/8 17:02
*/
SysEpmetUserRelationDTO getSysUserRelationEpmetInfo(Long id);
/**
* 根据手机号获取产品工作人员信息
*
* @param mobile 当前用户手机号
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.epmet.modules.userrelation.dto.SysEpmetUserRelationDTO>
* @author liuchuang
* @since 2021/7/8 17:14
*/
Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(String mobile);
/**
* 当前用户绑定产品工作人员信息
*
* @param formDto 产品工作人员信息
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author liuchuang
* @since 2021/7/8 17:09
*/
Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto);
/**
* 解除当前用户已绑定的产品工作人员信息
*
* @param formDto 产品工作人员信息
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author liuchuang
* @since 2021/7/8 17:12
*/
Result unbindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto);
}

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

@ -0,0 +1,136 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.epmet.modules.userrelation.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.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.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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 项目产品工作人员关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-07-08
*/
@Service
public class SysEpmetUserRelationServiceImpl extends BaseServiceImpl<SysEpmetUserRelationDao, SysEpmetUserRelationEntity> implements SysEpmetUserRelationService {
@Autowired
private EpmetAnalysisFeignClient epmetAnalysisFeignClient;
@Override
public PageData<SysEpmetUserRelationDTO> page(Map<String, Object> params) {
IPage<SysEpmetUserRelationEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, SysEpmetUserRelationDTO.class);
}
@Override
public List<SysEpmetUserRelationDTO> list(Map<String, Object> params) {
List<SysEpmetUserRelationEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, SysEpmetUserRelationDTO.class);
}
private QueryWrapper<SysEpmetUserRelationEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<SysEpmetUserRelationEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public SysEpmetUserRelationDTO get(String id) {
SysEpmetUserRelationEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, SysEpmetUserRelationDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SysEpmetUserRelationDTO dto) {
SysEpmetUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, SysEpmetUserRelationEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SysEpmetUserRelationDTO dto) {
SysEpmetUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, SysEpmetUserRelationEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public SysEpmetUserRelationDTO getSysUserRelationEpmetInfo(Long id) {
SysEpmetUserRelationEntity entity = baseDao.selectSysUserRelationEpmetInfo(id);
return ConvertUtils.sourceToTarget(entity, SysEpmetUserRelationDTO.class);
}
@Override
public Result<SysEpmetUserRelationDTO> getStaffUserFromEpmet(String mobile) {
SysEpmetUserFormDTO formDto = new SysEpmetUserFormDTO();
formDto.setMobile(mobile);
Result<SysEpmetUserResultDTO> result = epmetAnalysisFeignClient.getEpmetUserInfoByMobile(formDto);
if (result.success()) {
SysEpmetUserRelationDTO data = ConvertUtils.sourceToTarget(result.getData(), SysEpmetUserRelationDTO.class);
return new Result<SysEpmetUserRelationDTO>().ok(data);
}
return new Result<SysEpmetUserRelationDTO>().error(result.getMsg());
}
@Override
public Result bindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto) {
return null;
}
@Override
public Result unbindSysUserWithEpmetUser(SysEpmetUserRelationDTO formDto) {
return null;
}
}

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

@ -0,0 +1,24 @@
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

@ -0,0 +1,31 @@
<?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>

10
esua-epdc/epdc-admin/epdc-admin-epmet/src/main/resources/mapper/SysEpmetUserRelationDao.xml

@ -0,0 +1,10 @@
<?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">
<select id="selectSysUserRelationEpmetInfo" resultType="com.elink.esua.epdc.epmet.modules.userrelation.entity.SysEpmetUserRelationEntity">
SELECT * FROM sys_epmet_user_relation WHERE DEL_FLAG = '0' AND SYS_USER_ID = #{id}
</select>
</mapper>

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

@ -13,6 +13,11 @@
<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>

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

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

5
esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java

@ -227,6 +227,11 @@ public interface EpmetConstant {
*/
String EPMET_SCREEN_AGENCY_ADD_STREET_COMM = "/data/report/screen/agency/addstreetcomm";
/**
* 查询工作人员基本信息
*/
String EPMET_STAFF_INFO = "/data/aggregator/epmetuser/open-staffdetail";
/**
* 行政地区编码查询 - 平阴县

5
esua-epdc/epdc-gateway/pom.xml

@ -100,8 +100,9 @@
<!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>
<!-- <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
</gateway.routes.epdc-activiti-server.uri>
<!-- <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->

21
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java

@ -0,0 +1,21 @@
package com.elink.esua.epdc.dto.admin;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Authorliuchuang
* @Date2021/7/8 19:08
*/
@Data
public class SysEpmetUserFormDTO implements Serializable {
private static final long serialVersionUID = 6400768831973551059L;
/**
* 工作人员手机号
*/
@NotBlank(message = "手机号不能为空")
private String mobile;
}

44
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java

@ -0,0 +1,44 @@
package com.elink.esua.epdc.dto.admin;
import lombok.Data;
import java.io.Serializable;
/**
* @Authorliuchuang
* @Date2021/7/8 19:10
*/
@Data
public class SysEpmetUserResultDTO implements Serializable {
private static final long serialVersionUID = 5008884147555281491L;
/**
* 产品端工作人员ID
*/
private String staffId;
/**
* 产品端工作人员姓名
*/
private String staffName;
/**
* 产品端工作人员手机号
*/
private String mobile;
/**
* 产品端工作人员所属组织ID
*/
private String agencyId;
/**
* 产品端工作人员所属组织全路径名称
*/
private String agencyAllName;
/**
* 产品端工作人员所属客户id
*/
private String customerId;
}

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

@ -136,10 +136,10 @@
<nacos.server-addr>47.105.119.155:8848</nacos.server-addr>
<nacos.ip></nacos.ip>
<nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
<epmet.url>http://epmet-dev.elinkservice.cn:48080/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>
</properties>
</profile>

18
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java

@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.admin.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
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.modules.admin.service.AdminAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
@ -50,4 +48,18 @@ public class AdminAnalysisController {
return adminAnalysisService.addAreaCode(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("getEpmetUserInfo")
public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(@RequestBody SysEpmetUserFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return adminAnalysisService.getEpmetUserInfoByMobile(formDto);
}
}

14
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java

@ -1,9 +1,7 @@
package com.elink.esua.epdc.modules.admin.service;
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;
/**
@ -30,4 +28,14 @@ public interface AdminAnalysisService {
* @since 2021/5/11 15:45
*/
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:21
*/
Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto);
}

11
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java

@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
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.DeptCodeTree;
import com.elink.esua.epdc.dto.admin.*;
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;
@ -52,4 +49,10 @@ public class AdminAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
return JSONObject.parseObject(dataResult, Result.class);
}
@Override
public Result<SysEpmetUserResultDTO> getEpmetUserInfoByMobile(SysEpmetUserFormDTO formDto) {
String dataResult = epmetUtils.httpPost(EpmetConstant.EPMET_STAFF_INFO, JSONObject.toJSONString(formDto));
return JSONObject.parseObject(dataResult, Result.class);
}
}

Loading…
Cancel
Save