Browse Source

Merge branch 'dev_customize' into dev_temp

# Conflicts:
#	epmet-module/resi-mine/resi-mine-server/pom.xml
master
sunyuchao 5 years ago
parent
commit
27f0cd9132
  1. 5
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
  2. 5
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
  3. 4
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
  4. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  5. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  6. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  7. 5
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
  8. 19
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
  9. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
  10. 1
      epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql
  11. 96
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java
  12. 29
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java
  13. 27
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/RoleListFormDTO.java
  14. 37
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveCustomerFunctionRoleFormDTO.java
  15. 26
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java
  16. 123
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java
  17. 52
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java
  18. 66
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java
  19. 71
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerFunctionRoleExcel.java
  20. 47
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerFunctionRoleRedis.java
  21. 114
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionRoleService.java
  22. 154
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java
  23. 15
      epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.6__customer_function_role.sql
  24. 24
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml
  25. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
  26. 46
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiGovRoleListResultDTO.java
  27. 44
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiGovRoleResultDTO.java
  28. 17
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
  29. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleTemplateDao.java
  30. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
  31. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
  32. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
  33. 9
      epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleTemplateDao.xml
  34. 8
      epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml

5
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java

@ -58,6 +58,11 @@ public class CodeAuditResultDTO implements Serializable {
*/
private String result;
/**
* 是否加急
*/
private Boolean isSpeed;
/**
* 原因
*/

5
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java

@ -25,6 +25,11 @@ public class SubmitAuditFormDTO implements Serializable {
*/
private Boolean isSpeed;
/**
* isSpeed=true时是否是审核失败后的反馈提审
*/
private Boolean isRepeat;
/**
* 小程序版本说明和功能解释
*/

4
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java

@ -71,6 +71,10 @@ public class CodeVersionInfoResultDTO implements Serializable {
*
*/
private String status;
/**
*
*/
private Boolean isSpeed;
}
@Data

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.134
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.141
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.141
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.138</version>
<version>0.0.141</version>
<parent>
<groupId>com.epmet</groupId>

5
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java

@ -58,6 +58,11 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
*/
private String result;
/**
* 是否加急
*/
private Boolean isSpeed;
/**
* 原因
*/

19
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@ -183,6 +183,7 @@ public class CodeServiceImpl implements CodeService {
//审核版本
CodeCustomerDTO audit = codeCustomerService.getAuditInfo(formDTO.getCustomerId(), formDTO.getClientType());
if(null != audit) {
CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
CodeVersionInfoResultDTO.AuditBean auditBean = new CodeVersionInfoResultDTO.AuditBean();
auditBean.setCodeId(audit.getId());
auditBean.setVersion(audit.getUserVersion());
@ -191,7 +192,6 @@ public class CodeServiceImpl implements CodeService {
//获取小程序调用令牌
AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
//获取审核结果信息
CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
//调用微信API获取最新审核状态
WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
request.setAuditId(auditResult.getAuditId());
@ -222,6 +222,7 @@ public class CodeServiceImpl implements CodeService {
}
}
auditBean.setStatus(audit.getStatus());
auditBean.setIsSpeed(auditResult.getIsSpeed());
auditBean.setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN));
auditBean.setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN));
resultDTO.setAudit(auditBean);
@ -283,6 +284,7 @@ public class CodeServiceImpl implements CodeService {
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxResult.getErrorMsg());
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
boolean speedSuccess = false;
if(formDTO.getIsSpeed()) {
//调用微信API 加急审核
WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq();
@ -291,8 +293,9 @@ public class CodeServiceImpl implements CodeService {
if (!wxSpeedResult.success()) {
saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
log.error(wxSpeedResult.getErrorMsg());
}
speedSuccess = wxSpeedResult.success();
}
//获取审核结果信息
CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId());
@ -302,18 +305,24 @@ public class CodeServiceImpl implements CodeService {
codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
codeAuditResultDTO.setAuditId(wxResult.getData());
codeAuditResultDTO.setIsSpeed(speedSuccess);
codeAuditResultDTO.setResult(CodeConstant.AUDITING);
codeAuditResultService.save(codeAuditResultDTO);
} else {
codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
codeAuditResultService.update(codeAuditResultDTO);
codeAuditResultService.deleteById(codeAuditResultDTO.getId());
codeAuditResultDTO = new CodeAuditResultDTO();
codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
codeAuditResultDTO.setAuditId(wxResult.getData());
codeAuditResultDTO.setResult(CodeConstant.AUDITING);
if (formDTO.getIsRepeat()) {
codeAuditResultDTO.setIsSpeed(true);
} else {
codeAuditResultDTO.setIsSpeed(speedSuccess);
}
codeAuditResultService.save(codeAuditResultDTO);
}
//更新代码表状态
@ -656,6 +665,8 @@ public class CodeServiceImpl implements CodeService {
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
}
codeAuditResultDTO.setIsSpeed(true);
codeAuditResultService.update(codeAuditResultDTO);
}
@Override

2
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java

@ -44,7 +44,7 @@ public interface WxMaCodeConstant {
* 下面注释url为按钮形式
*/
String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
// String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
// String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=3#wechat_redirect";
/**
* 创建开放平台帐号并绑定公众号/小程序

1
epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql

@ -0,0 +1 @@
ALTER TABLE code_audit_result ADD COLUMN IS_SPEED tinyint NULL DEFAULT 0 COMMENT '是否加急' AFTER RESULT;

96
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFunctionRoleDTO.java

@ -0,0 +1,96 @@
/**
* 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.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@Data
public class CustomerFunctionRoleDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id
*/
private String customerId;
/**
* 功能ID(function.ID)
*/
private String functionId;
/**
* 所属APP(工作端:gov居民端:resi)
*/
private String fromApp;
/**
* 角色Key值
*/
private String roleKey;
/**
* 角色名称
*/
private String roleName;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

29
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionRoleListFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* 查询客户定制功能角色列表--接口入参
*
* @author sun
*/
@Data
public class CustomerFunctionRoleListFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户Id
*/
@NotBlank(message = "客户Id不能为空", groups = {AddUserInternalGroup.class })
private String customerId;
/**
* 定制功能ID
*/
@NotBlank(message = "功能ID不能为空", groups = {AddUserInternalGroup.class })
private String functionId;
public interface AddUserInternalGroup {}
}

27
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/RoleListFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 客户定制功能角色设置--接口入参
*
* @author sun
*/
@Data
public class RoleListFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 角色Key
*/
@NotBlank(message = "角色key不能为空", groups = {AddUserInternalGroup.class })
private String roleKey;
/**
* 角色名称
*/
@NotBlank(message = "角色名称不能为空", groups = {AddUserInternalGroup.class })
private String roleName;
public interface AddUserInternalGroup {}
}

37
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveCustomerFunctionRoleFormDTO.java

@ -0,0 +1,37 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* 客户定制功能角色设置--接口入参
*
* @author sun
*/
@Data
public class SaveCustomerFunctionRoleFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户Id
*/
@NotBlank(message = "客户Id不能为空", groups = {AddUserInternalGroup.class })
private String customerId;
/**
* 定制功能ID
*/
@NotBlank(message = "功能ID不能为空", groups = {AddUserInternalGroup.class })
private String functionId;
/**
* 所属APP(工作端:gov居民端:resi)
*/
@NotBlank(message = "所属App不能为空", groups = {AddUserInternalGroup.class })
private String fromApp;
/**
* 角色信息集合
*/
private List<RoleListFormDTO> roleList;
public interface AddUserInternalGroup {}
}

26
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionRoleListResultDTO.java

@ -0,0 +1,26 @@
package com.epmet.dto.result;
import com.epmet.dto.form.RoleListFormDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 查询客户定制功能角色列表--接口返参
*
* @author sun
*/
@Data
public class CustomerFunctionRoleListResultDTO implements Serializable {
private static final long serialVersionUID = 2971689193155710437L;
/**
* 角色Key
*/
private String roleKey;
/**
* 角色名称
*/
private String roleName;
}

123
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionRoleController.java

@ -0,0 +1,123 @@
/**
* 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.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.CustomerFunctionRoleDTO;
import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionRoleFormDTO;
import com.epmet.dto.result.CustomerFunctionRoleListResultDTO;
import com.epmet.excel.CustomerFunctionRoleExcel;
import com.epmet.service.CustomerFunctionRoleService;
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 generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@RestController
@RequestMapping("customerfunctionrole")
public class CustomerFunctionRoleController {
@Autowired
private CustomerFunctionRoleService customerFunctionRoleService;
@GetMapping("page")
public Result<PageData<CustomerFunctionRoleDTO>> page(@RequestParam Map<String, Object> params){
PageData<CustomerFunctionRoleDTO> page = customerFunctionRoleService.page(params);
return new Result<PageData<CustomerFunctionRoleDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<CustomerFunctionRoleDTO> get(@PathVariable("id") String id){
CustomerFunctionRoleDTO data = customerFunctionRoleService.get(id);
return new Result<CustomerFunctionRoleDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody CustomerFunctionRoleDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
customerFunctionRoleService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody CustomerFunctionRoleDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
customerFunctionRoleService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
customerFunctionRoleService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<CustomerFunctionRoleDTO> list = customerFunctionRoleService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, CustomerFunctionRoleExcel.class);
}
/**
* @param tokenDTO formDTO
* @return
* @author sun
* @Description 客户定制功能角色设置
*/
@PostMapping("savecustomerfunctionrole")
public Result saveCustomerFunctionRole(@LoginUser TokenDto tokenDTO, @RequestBody SaveCustomerFunctionRoleFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, SaveCustomerFunctionRoleFormDTO.AddUserInternalGroup.class);
customerFunctionRoleService.saveCustomerFunctionRole(formDTO);
return new Result();
}
/**
* @param tokenDTO formDTO
* @return
* @author sun
* @Description 查询客户定制功能角色列表
*/
@PostMapping("customerfunctionrolelist")
public Result<List<CustomerFunctionRoleListResultDTO>> customerFunctionRoleList(@LoginUser TokenDto tokenDTO, @RequestBody CustomerFunctionRoleListFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, CustomerFunctionRoleListFormDTO.AddUserInternalGroup.class);
return new Result<List<CustomerFunctionRoleListResultDTO>>().ok(customerFunctionRoleService.customerFunctionRoleList(formDTO));
}
}

52
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionRoleDao.java

@ -0,0 +1,52 @@
/**
* 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.dto.CustomerFunctionRoleDTO;
import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
import com.epmet.dto.result.CustomerFunctionRoleListResultDTO;
import com.epmet.entity.CustomerFunctionRoleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@Mapper
public interface CustomerFunctionRoleDao extends BaseDao<CustomerFunctionRoleEntity> {
/**
* @author sun
* @Description 根据客户Id删除客户功能角色信息
*/
void delByCustomerId(@Param("customerId") String customerId);
/**
* @param formDTO
* @return
* @author sun
* @Description 查询客户定制功能角色列表
*/
List<CustomerFunctionRoleListResultDTO> selectCustomerFunctionRoleList(CustomerFunctionRoleListFormDTO formDTO);
}

66
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFunctionRoleEntity.java

@ -0,0 +1,66 @@
/**
* 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-09-07
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("customer_function_role")
public class CustomerFunctionRoleEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id
*/
private String customerId;
/**
* 功能ID(function.ID)
*/
private String functionId;
/**
* 所属APP(工作端:gov居民端:resi)
*/
private String fromApp;
/**
* 角色Key值
*/
private String roleKey;
/**
* 角色名称
*/
private String roleName;
}

71
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/CustomerFunctionRoleExcel.java

@ -0,0 +1,71 @@
/**
* 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.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@Data
public class CustomerFunctionRoleExcel {
@Excel(name = "唯一标识")
private String id;
@Excel(name = "客户Id ")
private String customerId;
@Excel(name = "功能ID(function.ID)")
private String functionId;
@Excel(name = "所属APP(工作端:gov、居民端:resi)")
private String fromApp;
@Excel(name = "角色Key值")
private String roleKey;
@Excel(name = "角色名称")
private String roleName;
@Excel(name = "删除标识:0.未删除 1.已删除")
private Integer delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

47
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/redis/CustomerFunctionRoleRedis.java

@ -0,0 +1,47 @@
/**
* 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.redis;
import com.epmet.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@Component
public class CustomerFunctionRoleRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

114
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionRoleService.java

@ -0,0 +1,114 @@
/**
* 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.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.CustomerFunctionRoleDTO;
import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionRoleFormDTO;
import com.epmet.dto.result.CustomerFunctionRoleListResultDTO;
import com.epmet.entity.CustomerFunctionRoleEntity;
import java.util.List;
import java.util.Map;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
public interface CustomerFunctionRoleService extends BaseService<CustomerFunctionRoleEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<CustomerFunctionRoleDTO>
* @author generator
* @date 2020-09-07
*/
PageData<CustomerFunctionRoleDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<CustomerFunctionRoleDTO>
* @author generator
* @date 2020-09-07
*/
List<CustomerFunctionRoleDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return CustomerFunctionRoleDTO
* @author generator
* @date 2020-09-07
*/
CustomerFunctionRoleDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-09-07
*/
void save(CustomerFunctionRoleDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-09-07
*/
void update(CustomerFunctionRoleDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-09-07
*/
void delete(String[] ids);
/**
* @param formDTO
* @return
* @author sun
* @Description 客户定制功能角色设置
*/
void saveCustomerFunctionRole(SaveCustomerFunctionRoleFormDTO formDTO);
/**
* @param formDTO
* @return
* @author sun
* @Description 查询客户定制功能角色列表
*/
List<CustomerFunctionRoleListResultDTO> customerFunctionRoleList(CustomerFunctionRoleListFormDTO formDTO);
}

154
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionRoleServiceImpl.java

@ -0,0 +1,154 @@
/**
* 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.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.CustomerFunctionRoleDao;
import com.epmet.dto.CustomerFunctionRoleDTO;
import com.epmet.dto.form.CustomerFunctionRoleListFormDTO;
import com.epmet.dto.form.RoleListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionRoleFormDTO;
import com.epmet.dto.result.CustomerFunctionRoleListResultDTO;
import com.epmet.entity.CustomerFunctionRoleEntity;
import com.epmet.redis.CustomerFunctionRoleRedis;
import com.epmet.service.CustomerFunctionRoleService;
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.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 客户定制功能角色列表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-07
*/
@Service
public class CustomerFunctionRoleServiceImpl extends BaseServiceImpl<CustomerFunctionRoleDao, CustomerFunctionRoleEntity> implements CustomerFunctionRoleService {
@Autowired
private CustomerFunctionRoleRedis customerFunctionRoleRedis;
@Override
public PageData<CustomerFunctionRoleDTO> page(Map<String, Object> params) {
IPage<CustomerFunctionRoleEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, CustomerFunctionRoleDTO.class);
}
@Override
public List<CustomerFunctionRoleDTO> list(Map<String, Object> params) {
List<CustomerFunctionRoleEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, CustomerFunctionRoleDTO.class);
}
private QueryWrapper<CustomerFunctionRoleEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<CustomerFunctionRoleEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public CustomerFunctionRoleDTO get(String id) {
CustomerFunctionRoleEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, CustomerFunctionRoleDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(CustomerFunctionRoleDTO dto) {
CustomerFunctionRoleEntity entity = ConvertUtils.sourceToTarget(dto, CustomerFunctionRoleEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CustomerFunctionRoleDTO dto) {
CustomerFunctionRoleEntity entity = ConvertUtils.sourceToTarget(dto, CustomerFunctionRoleEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @param formDTO
* @return
* @author sun
* @Description 客户定制功能角色设置
*/
@Override
public void saveCustomerFunctionRole(SaveCustomerFunctionRoleFormDTO formDTO) {
List<CustomerFunctionRoleEntity> listEntity = new ArrayList<>();
//1.封装数据
List<RoleListFormDTO> roleList = formDTO.getRoleList();
roleList.forEach(role->{
CustomerFunctionRoleEntity entity = new CustomerFunctionRoleEntity();
entity.setCustomerId(formDTO.getCustomerId());
entity.setFunctionId(formDTO.getFunctionId());
entity.setFromApp(formDTO.getFromApp());
entity.setRoleKey(role.getRoleKey());
entity.setRoleName(role.getRoleName());
listEntity.add(entity);
});
//2.先按客户Id执行删除操作
baseDao.delByCustomerId(formDTO.getCustomerId());
//3.批量新增
if(!insertBatch(listEntity)){
throw new RenException("定制功能角色设置失败");
}
}
/**
* @param formDTO
* @return
* @author sun
* @Description 查询客户定制功能角色列表
*/
@Override
public List<CustomerFunctionRoleListResultDTO> customerFunctionRoleList(CustomerFunctionRoleListFormDTO formDTO) {
//1.根据客户Id、功能Id查询客户定制功能设置的角色列表
return baseDao.selectCustomerFunctionRoleList(formDTO);
}
}

15
epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.6__customer_function_role.sql

@ -0,0 +1,15 @@
CREATE TABLE `customer_function_role` (
`ID` varchar(64) NOT NULL COMMENT '唯一标识',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ',
`FUNCTION_ID` varchar(64) NOT NULL COMMENT '功能ID(function.ID)',
`FROM_APP` varchar(32) NOT NULL COMMENT '所属APP(工作端:gov、居民端:resi)',
`ROLE_KEY` varchar(32) NOT NULL COMMENT '角色Key值',
`ROLE_NAME` varchar(32) NOT NULL COMMENT '角色名称',
`DEL_FLAG` int(11) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
`REVISION` int(11) NOT 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='客户定制功能角色列表';

24
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml

@ -0,0 +1,24 @@
<?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.CustomerFunctionRoleDao">
<select id="selectCustomerFunctionRoleList" resultType="com.epmet.dto.result.CustomerFunctionRoleListResultDTO">
SELECT
role_key AS "roleKey",
role_name AS "roleName"
FROM
customer_function_role
WHERE
del_flag = '0'
AND customer_id = #{customerId}
AND function_id = #{functionId}
</select>
<delete id="delByCustomerId">
DELETE
FROM customer_function_role
WHERE customer_id = #{customerId}
</delete>
</mapper>

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

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

46
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiGovRoleListResultDTO.java

@ -0,0 +1,46 @@
/**
* 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.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 获取居民端工作端人员角色列表--接口返参
*
* @author sun
*/
@Data
public class ResiGovRoleListResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 居民端角色列表
*/
private List<ResiGovRoleResultDTO> resiRoleList;
/**
* 工作端角色列表
*/
private List<ResiGovRoleResultDTO> govRoleList;
}

44
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiGovRoleResultDTO.java

@ -0,0 +1,44 @@
/**
* 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.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 获取居民端工作端人员角色列表--接口返参
*
* @author sun
*/
@Data
public class ResiGovRoleResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 角色key
*/
private String roleKey;
/**
* 角色名称
*/
private String roleName;
}

17
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java

@ -1,11 +1,16 @@
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.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.RoleDTO;
import com.epmet.dto.form.GovStaffRoleFormDTO;
import com.epmet.dto.form.IssueInitiatorFormDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.GovStaffRoleTemplateDTO;
import com.epmet.dto.result.IssueInitiatorResultDTO;
import com.epmet.dto.result.ResiGovRoleListResultDTO;
import com.epmet.entity.GovStaffRoleEntity;
import com.epmet.service.GovStaffRoleService;
import org.springframework.beans.factory.annotation.Autowired;
@ -59,4 +64,16 @@ public class GovStaffRoleController {
return new Result<List<GovStaffRoleResultDTO>>().ok(roleDTOS);
}
/**
* @param tokenDTO
* @return ResiGovRoleListResultDTO
* @author sun
* @Description 获取居民端工作端人员角色列表
*/
@PostMapping("resigovrolelist")
public Result<ResiGovRoleListResultDTO> resiGovRoleList(@LoginUser TokenDto tokenDTO){
return new Result<ResiGovRoleListResultDTO>().ok(govStaffRoleService.resiGovRoleList());
}
}

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

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.GovStaffRoleTemplateDTO;
import com.epmet.dto.result.ResiGovRoleResultDTO;
import com.epmet.entity.GovStaffRoleTemplateEntity;
import org.apache.ibatis.annotations.Mapper;
@ -38,4 +39,10 @@ public interface GovStaffRoleTemplateDao extends BaseDao<GovStaffRoleTemplateEnt
* @return
*/
List<GovStaffRoleTemplateDTO> listValidateRoles();
/**
* @author sun
* @Description 获取工作端角色列表
*/
List<ResiGovRoleResultDTO> selectGovRoleList();
}

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

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.RoleDTO;
import com.epmet.dto.result.ResiGovRoleResultDTO;
import com.epmet.entity.RoleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -41,4 +42,10 @@ public interface RoleDao extends BaseDao<RoleEntity> {
* @return RoleEntity
*/
RoleEntity selectRoleByKey(RoleEntity param);
/**
* @author sun
* @Description 获取居民端角色列表
*/
List<ResiGovRoleResultDTO> selectResiRoleList();
}

7
epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java

@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.GovStaffRoleTemplateDTO;
import com.epmet.dto.result.ResiGovRoleListResultDTO;
import com.epmet.entity.GovStaffRoleEntity;
import java.util.List;
@ -127,4 +128,10 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
List<GovStaffRoleTemplateDTO> listRoleTemplates();
GovStaffRoleResultDTO getDTOById(String roleId);
/**
* @author sun
* @Description 获取居民端工作端人员角色列表
*/
ResiGovRoleListResultDTO resiGovRoleList();
}

27
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java

@ -27,10 +27,13 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.GovStaffRoleDao;
import com.epmet.dao.GovStaffRoleTemplateDao;
import com.epmet.dao.RoleDao;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.InitDefaultOperationsFormDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.GovStaffRoleTemplateDTO;
import com.epmet.dto.result.ResiGovRoleListResultDTO;
import com.epmet.dto.result.ResiGovRoleResultDTO;
import com.epmet.entity.GovStaffRoleEntity;
import com.epmet.feign.GovAccessFeignClient;
import com.epmet.redis.GovStaffRoleRedis;
@ -66,6 +69,9 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
@Autowired
private GovAccessFeignClient govAccessFeignClient;
@Autowired
private RoleDao roleDao;
@Override
public PageData<GovStaffRoleDTO> page(Map<String, Object> params) {
IPage<GovStaffRoleEntity> page = baseDao.selectPage(
@ -181,4 +187,25 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
public GovStaffRoleResultDTO getDTOById(String roleId) {
return govStaffRoleDao.getDTOById(roleId);
}
/**
* @param
* @return ResiGovRoleListResultDTO
* @author sun
* @Description 获取居民端工作端人员角色列表
*/
@Override
public ResiGovRoleListResultDTO resiGovRoleList() {
ResiGovRoleListResultDTO resultDTO = new ResiGovRoleListResultDTO();
//1.查询居民端角色列表
List<ResiGovRoleResultDTO> resiRoleList = roleDao.selectResiRoleList();
//2.查询工作端角色列表
List<ResiGovRoleResultDTO> govRoleList = govStaffRoleTemplateDao.selectGovRoleList();
//3.封装数据并返回
resultDTO.setResiRoleList(resiRoleList);
resultDTO.setGovRoleList(govRoleList);
return resultDTO;
}
}

9
epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleTemplateDao.xml

@ -23,5 +23,14 @@
WHERE DEL_FLAG = 0
</select>
<select id="selectGovRoleList" resultType="com.epmet.dto.result.ResiGovRoleResultDTO">
SELECT
role_key AS "roleKey",
role_name AS "roleName"
FROM gov_staff_role_template
WHERE del_flag = '0'
ORDER BY full_time_only DESC
</select>
</mapper>

8
epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml

@ -27,4 +27,12 @@
and ROLE_KEY = #{roleKey}
and DEL_FLAG = 0
</select>
<select id="selectResiRoleList" resultType="com.epmet.dto.result.ResiGovRoleResultDTO">
SELECT
role_key AS "roleKey",
role_name AS "roleName"
FROM epmet_role
WHERE del_flag = '0'
</select>
</mapper>
Loading…
Cancel
Save