Browse Source

Merge branch 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

dev
sunyuchao 5 years ago
parent
commit
ab964fa3a3
  1. 30
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java
  2. 8
      epmet-gateway/pom.xml
  3. 2
      epmet-module/gov-access/gov-access-server/docker-compose.yml
  4. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  5. 60
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
  6. 36
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java
  7. 56
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
  8. 13
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java
  9. 29
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java
  10. 25
      epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml
  11. 2
      epmet-module/gov-grid/gov-grid-server/docker-compose.yml
  12. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  13. 42
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java
  14. 13
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
  15. 4
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
  16. 2
      epmet-module/gov-mine/gov-mine-server/docker-compose.yml
  17. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  18. 2
      epmet-module/gov-org/gov-org-server/docker-compose.yml
  19. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  20. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  21. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  22. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  23. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  24. 22
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  25. 2
      epmet-module/oper-access/oper-access-server/docker-compose.yml
  26. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  27. 2
      epmet-module/oper-crm/oper-crm-server/docker-compose.yml
  28. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  29. 2
      epmet-module/oper-customize/oper-customize-server/docker-compose.yml
  30. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  31. 7
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java
  32. 8
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java
  33. 2
      epmet-module/resi-group/resi-group-server/docker-compose.yml
  34. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  35. 7
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  36. 2
      epmet-module/resi-guide/resi-guide-server/docker-compose.yml
  37. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  38. 2
      epmet-module/resi-mine/resi-mine-server/docker-compose.yml
  39. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  40. 2
      epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
  41. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  42. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
  43. 2
      epmet-user/epmet-user-server/docker-compose.yml
  44. 2
      epmet-user/epmet-user-server/pom.xml
  45. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
  46. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
  47. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
  48. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
  49. 16
      epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
  50. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

30
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java

@ -1,30 +0,0 @@
//package com.epmet.commons.tools.config;
//
//import com.epmet.commons.tools.annotation.RequirePermission;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.ApplicationContext;
//import org.springframework.context.annotation.Configuration;
//
//import javax.annotation.PostConstruct;
//import java.util.Map;
//
//@Configuration
//public class PermissionInitializer {
//
// @Autowired
// private ApplicationContext applicationContext;
//
// /**
// * 初始化操作权限
// */
// @PostConstruct
// public void initOpePermissions() {
// Map<String, Object> beanMap = applicationContext.getBeansWithAnnotation(RequirePermission.class);
// for (Map.Entry<String, Object> entry : beanMap.entrySet()) {
// System.out.println(entry);
// }
//
// }
//
//
//}

8
epmet-gateway/pom.xml

@ -126,8 +126,8 @@
<gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>
<!-- <gateway.routes.epmet-job-server.uri>http://127.0.0.1:8084</gateway.routes.epmet-job-server.uri>-->
<!-- 8、用户模块 -->
<gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>
<!-- <gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>-->
<!-- <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>-->
<gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>
<!-- 9、新模块结构demo -->
<!-- <gateway.routes.epmet-demo-server.uri>lb://epmet-demo-server</gateway.routes.epmet-demo-server.uri>-->
<gateway.routes.epmet-demo-server.uri>http://127.0.0.1:8088</gateway.routes.epmet-demo-server.uri>
@ -141,8 +141,8 @@
<gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>
<!-- <gateway.routes.resi-guide-server.uri>http://127.0.0.1:8091</gateway.routes.resi-guide-server.uri>-->
<!-- 13、政府组织管理 -->
<gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
<!-- <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>-->
<!--<gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>-->
<gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>
<!-- 14、#运营端访问权限控制 -->
<gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
<!-- <gateway.routes.oper-access-server.uri>http://127.0.0.1:8093</gateway.routes.oper-access-server.uri>-->

2
epmet-module/gov-access/gov-access-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.5
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.7
ports:
- "8099:8099"
network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/pom.xml

@ -2,7 +2,7 @@
<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">
<version>0.3.5</version>
<version>0.3.7</version>
<parent>
<artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId>

60
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java

@ -0,0 +1,60 @@
package com.epmet.config;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.entity.OperationEntity;
import com.epmet.service.OperationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.CollectionUtils;
import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@Configuration
public class PermissionInitializer {
@Autowired
private OperationService operationService;
/**
* 初始化操作权限
*/
@PostConstruct
public void initOpePermissions() {
Set<String> operationKeys = getExistsOperationKeys();
ArrayList<OperationEntity> operations2Create = new ArrayList<>();
RequirePermissionEnum[] requirePermissionEnums = RequirePermissionEnum.values();
Arrays.stream(requirePermissionEnums).forEach(perm -> {
String key = perm.getKey();
if (!operationKeys.contains(key)) {
OperationEntity operationEntity = new OperationEntity();
operationEntity.setOperationKey(key);
operationEntity.setBrief(perm.getBrief());
operationEntity.setOperationName(perm.getName());
operations2Create.add(operationEntity);
}
});
if (!CollectionUtils.isEmpty(operations2Create)) {
operationService.createBatch(operations2Create);
}
}
/**
* 获取现有的操作key列表
* @return
*/
public Set<String> getExistsOperationKeys() {
List<OperationEntity> operationEntities = operationService.listAllOperations();
if (!CollectionUtils.isEmpty(operationEntities)) {
return operationEntities.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet());
}
return new HashSet<>();
}
}

36
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java

@ -0,0 +1,36 @@
/**
* 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.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.OperationEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 操作类型表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-30
*/
@Mapper
public interface OperationDao extends BaseDao<OperationEntity> {
List<OperationEntity> listAllOperationEntities();
}

56
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java

@ -0,0 +1,56 @@
/**
* 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.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 操作类型表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-30
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("operation")
public class OperationEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
*
*/
private String operationKey;
/**
*
*/
private String operationName;
/**
* 操作简介
*/
private String brief;
}

13
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java

@ -0,0 +1,13 @@
package com.epmet.service;
import com.epmet.entity.OperationEntity;
import java.util.ArrayList;
import java.util.List;
public interface OperationService {
List<OperationEntity> listAllOperations();
void createBatch(ArrayList<OperationEntity> operations2Create);
}

29
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java

@ -0,0 +1,29 @@
package com.epmet.service.impl;
import com.epmet.dao.OperationDao;
import com.epmet.entity.OperationEntity;
import com.epmet.service.OperationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
public class OperationServiceImpl implements OperationService {
@Autowired
private OperationDao operationDao;
@Override
public List<OperationEntity> listAllOperations() {
return operationDao.listAllOperationEntities();
}
@Transactional
@Override
public void createBatch(ArrayList<OperationEntity> operations2Create) {
operations2Create.forEach(ope -> operationDao.insert(ope));
}
}

25
epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml

@ -0,0 +1,25 @@
<?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.epmet.dao.OperationDao">
<resultMap type="com.epmet.entity.OperationEntity" id="operationMap">
<result property="id" column="ID"/>
<result property="operationKey" column="OPERATION_KEY"/>
<result property="operationName" column="OPERATION_NAME"/>
<result property="brief" column="BRIEF"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="listAllOperationEntities" resultType="com.epmet.entity.OperationEntity">
SELECT o.*
FROM operation o
</select>
</mapper>

2
epmet-module/gov-grid/gov-grid-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.11
ports:
- "8097:8097"
network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.10</version>
<version>0.3.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>

42
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java

@ -0,0 +1,42 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
import com.epmet.service.ResiTopicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Description 话题评论相关接口
* @Author yinzuomei
* @Date 2020/4/30 16:42
*/
@RestController
@RequestMapping("topic")
public class ResiTopicCommentController {
@Autowired
private ResiTopicService resiTopicService;
/**
* @Description 政府端群组管理-获取某个话题的评论列表
* @Param tokenDto
* @Param ResiQueryCommentFormDTO
* @return Result<List<ResiCommentResultDTO>>
* @Author wangc
* @Date 2020.04.01 23:49
**/
@PostMapping("topiccomments")
Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
ValidatorUtils.validateEntity(queryCommentFormDTO);
return resiTopicService.topicComments(queryCommentFormDTO);
}
}

13
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java

@ -70,19 +70,6 @@ public class ResiTopicController {
return resiTopicService.topicDetail(topicDetailFormDTO);
}
/**
* @Description 政府端群组管理-获取某个话题的评论列表
* @Param tokenDto
* @Param ResiQueryCommentFormDTO
* @return Result<List<ResiCommentResultDTO>>
* @Author wangc
* @Date 2020.04.01 23:49
**/
@PostMapping("topiccomments")
Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
ValidatorUtils.validateEntity(queryCommentFormDTO);
return resiTopicService.topicComments(queryCommentFormDTO);
}
}

4
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java

@ -47,7 +47,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
govTopic.setUserNickName(top.getReleaseUserName());
govTopic.setTopicId(top.getTopicId());
govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
govTopic.setTopicRealseTime(top.getReleaseTime());
govTopic.setTopicFirstPhoto(top.getFirstPhoto());
topicsResult.add(govTopic);
});
@ -76,7 +76,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
govTopic.setUserNickName(top.getReleaseUserName());
govTopic.setTopicId(top.getTopicId());
govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
govTopic.setTopicRealseTime(top.getReleaseTime());
govTopic.setTopicFirstPhoto(top.getFirstPhoto());
govTopic.setTopicState(top.getStatus());
topicsResult.add(govTopic);

2
epmet-module/gov-mine/gov-mine-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.7
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.8
ports:
- "8098:8098"
network_mode: host # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -2,7 +2,7 @@
<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">
<version>0.3.7</version>
<version>0.3.8</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>

2
epmet-module/gov-org/gov-org-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.26
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.28
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.26</version>
<version>0.3.28</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -99,22 +99,6 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
*/
List<UserIdAndPidDTO> selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO);
/**
* 根据userId查询customerId
*
* @param userId
* @return
*/
String selectCustomerIdByUserId(@Param("userId") String userId);
/**
* 根据pid查询pids
*
* @param pid
* @return
*/
String selectPidsByPid(@Param("pid") String pid);
/**
* 根据gridName查询gridId
*

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -140,14 +140,6 @@ public interface EpmetUserFeignClient {
@PostMapping("/epmetuser/customerstaff/getdepartmentstafflist")
Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO departmentInStaffFormDTO);
/**
* 根据userId查询customerId
* @param addDepartmentStaffFormDTO
* @auther zxc
*/
@PostMapping("/epmetuser/customerstaff/selectcustomeridbyuserid")
Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
/**
* @Description 通过userId列表查询未被禁用的用户信息
* @Param CommonUserIdListFormDTO :: getUserIdList

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@ -91,11 +91,6 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result disabledStaff(StaffInfoFromDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabledStaff", fromDTO);
}
@Override
public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectCustomerIdByUserId", addDepartmentStaffFormDTO);
}
@Override
public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormDTO userIdList) {

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -227,9 +227,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
}
}
baseDao.insert(customerGridEntity);
//查询刚刚添加的gridId
AddGridResultDTO addGridResultDTO = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(), addGridFormDTO.getAgencyId(), null);
return new Result<AddGridResultDTO>().ok(addGridResultDTO);
AddGridResultDTO resultDTO = new AddGridResultDTO();
resultDTO.setGridId(customerGridEntity.getId());
return new Result<AddGridResultDTO>().ok(resultDTO);
}
/**

22
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -157,28 +157,6 @@
AND csg.grid_id = #{gridId}
</select>
<!-- 根据userId查询customerId -->
<select id="selectCustomerIdByUserId" resultType="string">
SELECT
customer_id
FROM
customer_staff_grid
WHERE
user_id = #{userId}
LIMIT 1
</select>
<!-- 根据pid查询pids -->
<select id="selectPidsByPid" resultType="string">
SELECT
pids
FROM
customer_agency
WHERE
id = #{pid}
limit 1
</select>
<!-- 根据gridName查询gridId -->
<select id="selectGridIdByGridName" resultType="com.epmet.dto.result.AddGridResultDTO">
SELECT

2
epmet-module/oper-access/oper-access-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-access-server:
container_name: oper-access-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.3
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.4
ports:
- "8093:8093"
network_mode: host # 使用现有网络

2
epmet-module/oper-access/oper-access-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.3</version>
<version>0.3.4</version>
<parent>
<artifactId>oper-access</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/oper-crm/oper-crm-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.4
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.5
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.4</version>
<version>0.3.5</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

2
epmet-module/oper-customize/oper-customize-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-customize-server:
container_name: oper-customize-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.3
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.4
ports:
- "8089:8089"
network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.3</version>
<version>0.3.4</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

7
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java

@ -1,8 +1,10 @@
package com.epmet.resi.group.dto.topic.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description
@ -40,9 +42,10 @@ public class GovHiddenTopicInfoResultDTO implements Serializable {
private String topicContent;
/**
* 话题发布时间 时间戳
* 话题发布时间
* */
private Long topicRealseTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date topicRealseTime;
/**
* 话题的第一张图片地址

8
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java

@ -1,8 +1,11 @@
package com.epmet.resi.group.dto.topic.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description
@ -40,9 +43,10 @@ public class GovTopicInfoResultDTO implements Serializable {
private String topicContent;
/**
* 话题发布时间 时间戳
* 话题发布时间
* */
private Long topicRealseTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date topicRealseTime;
/**
* 话题的第一张图片地址

2
epmet-module/resi-group/resi-group-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.12
ports:
- "8095:8095"
network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.10</version>
<version>0.3.12</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

7
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -761,7 +761,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
Result<List<UserResiInfoResultDTO>> userInfoResult =
epmetUserFeignClient.getUserResiInfoList(new UserResiInfoListFormDTO(userId));
if(userInfoResult.success() && null != userInfoResult.getData() && userInfoResult.getData().size() >= 1){
detail.setGroupHeadPhoto(userInfoResult.getData().get(0).getHeadPhoto());
//姓氏+先生/女士 注:在数据库中拼接成[街道+显示名称]默认格式,故要进行截取
//detail.setGroupLeaderName(userInfoResult.getData().get(0).getShowName().split("-")[NumConstant.ONE]);
//姓氏+名称
@ -827,12 +826,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
msgList.add(msgObj);
}
Result result = epmetMessageFeignClient.saveUserMessageList(msgList);
if(!result.success()){
logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
if(result.success()){
return;
}
}
}
logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
}
}

2
epmet-module/resi-guide/resi-guide-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.3
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.4
ports:
- "8091:8091"
network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.3</version>
<version>0.3.4</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

2
epmet-module/resi-mine/resi-mine-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.5
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.6
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.5</version>
<version>0.3.6</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

2
epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.11
ports:
- "8096:8096"
network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.10</version>
<version>0.3.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

6
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@ -60,7 +60,7 @@
SELECT
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
unix_timestamp(pi.CREATED_TIME) AS applyTime,
unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
pcm.READ_FLAG AS readFlag,
pi.id as partyMemberId,
pca.id as autoId,
@ -85,7 +85,7 @@
SELECT
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
unix_timestamp(pi.CREATED_TIME) AS applyTime,
unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
pi.CONFIRM_RESULT AS status,
pi.id as partyMemberId,
pca.id as autoId,
@ -102,7 +102,7 @@
SELECT
pi.USER_ID AS userId,
concat( pi.SURNAME, pi.NAME ) AS realName,
unix_timestamp(pi.CREATED_TIME) AS applyTime,
unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
pi.CONFIRM_RESULT AS status,
pi.id as partyMemberId,
pca.id as autoId,

2
epmet-user/epmet-user-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.19
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.21
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.19</version>
<version>0.3.21</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

6
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@ -180,12 +180,6 @@ public class CustomerStaffController {
return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
}
@PostMapping(value = "selectcustomeridbyuserid")
public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(@RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){
return customerStaffService.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
}
/**
* 人员添加页面初始化
*

7
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@ -115,13 +115,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
*/
List<DepartInStaffListResultDTO> selectDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
/**
*
* @param departmentStaffFormDTO
* @auther zxc
*/
List<CustomerIdDTO> selectCustomerIdByUserId(AddDepartmentStaffFormDTO departmentStaffFormDTO);
/**
* @Description 根据UserId列表查询用信息过滤掉被禁用的包含未激活的
* @Param List<String>

10
epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@ -21,12 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.*;
import com.epmet.dto.form.*;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffGridListDTO;
import com.epmet.dto.form.CommonUserIdListFormDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.CustomerStaffFormDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
@ -218,13 +215,6 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
*/
Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
/**
* 根据userId查询customerId
* @param: addDepartmentStaffFormDTO
* @auther: zxc
*/
Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
/**
* @Description 通过userId列表查询未被禁用的用户信息
* @Param CommonUserIdListFormDTO :: getUserIdList

9
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@ -403,15 +403,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
return new Result<List<DepartInStaffListResultDTO>>().ok(staffList);
}
/**
* @param: addDepartmentStaffFormDTO
* @auther: zxc
*/
@Override
public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
}
/**
* @return Result<List < CommonStaffInfoResultDTO>>
* @Description 通过userId列表查询未被禁用的用户信息

16
epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@ -160,22 +160,6 @@
ORDER BY CONVERT (real_name USING gbk) ASC<!--按中文对应的拼音升序排列-->
</select>
<!-- 根据userId查询customerId -->
<select id="selectCustomerIdByUserId" parameterType="com.epmet.dto.form.AddDepartmentStaffFormDTO" resultType="com.epmet.dto.CustomerIdDTO">
SELECT
user_id AS userId,
customer_id AS customerId
FROM
customer_staff
WHERE
user_id in
<foreach item="item" collection="selectedList" separator="," open="(" close=")" index="">
#{item}
</foreach>
AND del_flag = 0
AND enable_flag = 'enable'
</select>
<!-- 根据UserId列表查询用户Id、头像、昵称,过滤掉被禁用的,包含未激活的-->
<select id="selectEnableStaffMsg" resultType="com.epmet.dto.result.CommonStaffInfoResultDTO">
SELECT

2
epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@ -89,7 +89,7 @@
GOV_STAFF_ROLE
WHERE
ROLE_KEY IN
<foreach item="roleKey" collection="rolekeys" open="(" separator="," close=")">
<foreach item="roleKey" collection="roleKeys" open="(" separator="," close=")">
#{rolekey}
</foreach>
AND DEL_FLAG = '0' )

Loading…
Cancel
Save