Browse Source

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

master
wangxianzhang 3 years ago
parent
commit
6c8c176551
  1. 15
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java
  2. 60
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
  3. 42
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java
  4. 8
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
  5. 5
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
  6. 14
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
  7. 2
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java
  8. 30
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
  9. 49
      epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java
  10. 5
      epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
  11. 7
      epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java
  12. 6
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java
  13. 2
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java
  14. 3
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java
  15. 6
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java
  16. 12
      epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml
  17. 0
      epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.35__formitem_zhzl.sql

15
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java

@ -0,0 +1,15 @@
package com.epmet.entity;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2022/7/27 16:23
*/
@Data
public class ServerInfoDTO {
private String serviceName;
private String mobile;
}

60
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@ -43,6 +43,7 @@ import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.constant.ReadFlagConstant;
import com.epmet.constant.SmsTemplateConstant;
import com.epmet.constant.UserDemandConstant;
import com.epmet.constant.UserMessageTypeConstant;
import com.epmet.dao.IcUserDemandOperateLogDao;
@ -414,11 +415,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
//3、插入或更新服务记录
IcUserDemandServiceEntity serviceEntity=ConvertUtils.sourceToTarget(formDTO,IcUserDemandServiceEntity.class);
//4、设置服务方名称
String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serviceName)) {
ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
}
serviceEntity.setServerName(serviceName);
serviceEntity.setServerName(serverInfoDTO.getServiceName());
IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
if (null == origin) {
@ -430,6 +431,32 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
}
// 4、如果需求是小程序端上报的,提醒需求人,服务已指派
sendDemandUserHaveOrgService(entity,formDTO.getServerId(),formDTO.getServiceType());
//给服务方负责人发短信
sendPhoneMsgToServer(formDTO.getCustomerId(),formDTO.getUserId(),serverInfoDTO.getMobile());
}
/**
* 需求指派后给社区自组织联建单位志愿者发短信通知
* @param staffId
* @param mobile
*/
private void sendPhoneMsgToServer(String customerId,String staffId, String mobile) {
// XXX社区给您指派了一个新的需求,请查看
CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(customerId,staffId);
if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyName())) {
return;
}
List<SendSmsFormDTO> smsList=new ArrayList<>();
SendSmsFormDTO sms = new SendSmsFormDTO();
sms.setCustomerId(customerId);
sms.setMobile(mobile);
sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
List<String> paramsContent=new ArrayList<>();
paramsContent.add(String.format("%s给您指派了一个新的需求,请查看",staffInfoCacheResult.getAgencyName()));
sms.setParamsContent(paramsContent);
smsList.add(sms);
messageOpenFeignClient.sendMsg(smsList);
}
/**
@ -438,21 +465,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
* @param serviceType
* @return
*/
private String queryServiceName(String serverId, String serviceType) {
private ServerInfoDTO queryServiceName(String serverId, String serviceType) {
String serviceName="";
String mobile="";
switch (serviceType)
{
case UserDemandConstant.PARTY_UNIT:
IcPartyUnitDTO partyUnitDTO=partyUnitService.get(serverId);
serviceName=null != partyUnitDTO ? partyUnitDTO.getUnitName() : StrConstant.EPMETY_STR;
mobile = null != partyUnitDTO ? partyUnitDTO.getContactMobile() : StrConstant.EPMETY_STR;
break;
case UserDemandConstant.SOCIAL_ORG:
IcSocietyOrgDTO societyOrgDTO=societyOrgService.get(serverId);
serviceName=null != societyOrgDTO ? societyOrgDTO.getSocietyName() : StrConstant.EPMETY_STR;
mobile=null != societyOrgDTO ? societyOrgDTO.getMobile() : StrConstant.EPMETY_STR;
break;
case UserDemandConstant.COMMUNITY_ORG:
IcCommunitySelfOrganizationDTO dto=communitySelfOrganizationService.get(serverId);
serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
mobile = null != dto ? dto.getPrincipalPhone() : StrConstant.EPMETY_STR;
break;
case UserDemandConstant.VOLUNTEER:
//爱心互助的志愿者
@ -461,6 +492,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询爱心互助志愿者信息异常","志愿者信息查询异常");
}
serviceName=userInfoRes.getData().get(NumConstant.ZERO).getRealName();
mobile = userInfoRes.getData().get(NumConstant.ZERO).getMobile();
break;
case UserDemandConstant.IC_USER_VOLUNTEER:
//居民信息的志愿者 ic_resi_user
@ -469,12 +501,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
}
serviceName=icUserInfoRes.getData().getName();
mobile = icUserInfoRes.getData().getMobile();
break;
default:
log.warn("serviceType 错误");
break;
}
return serviceName;
ServerInfoDTO serverInfoDTO=new ServerInfoDTO();
serverInfoDTO.setServiceName(serviceName);
serverInfoDTO.setMobile(mobile);
return serverInfoDTO;
}
/**
@ -1166,8 +1202,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
operateLogDao.insert(logEntity);
//3、插入或更新服务记录
IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
if (StringUtils.isBlank(serviceName)) {
ServerInfoDTO serverInfoDTO=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
}
String serviceId="";
@ -1177,14 +1213,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
serviceEntity.setDemandRecId(entity.getId());
serviceEntity.setServiceType(UserDemandConstant.VOLUNTEER);
serviceEntity.setServerId(formDTO.getUserId());
serviceEntity.setServerName(serviceName);
serviceEntity.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.insert(serviceEntity);
serviceId=serviceEntity.getId();
}else{
origin.setServiceType(UserDemandConstant.VOLUNTEER);
origin.setServerId(formDTO.getUserId());
origin.setUpdatedBy(formDTO.getUserId());
origin.setServerName(serviceName);
origin.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.updateById(origin);
serviceId=origin.getId();
}
@ -1556,11 +1592,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
if("ic_event".equals(formDTO.getOrigin())){
IcUserDemandServiceEntity serviceEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandServiceEntity.class);
serviceEntity.setDemandRecId(demandRecId);
String serviceName = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serviceName)) {
ServerInfoDTO serverInfoDTO = queryServiceName(serviceEntity.getServerId(), serviceEntity.getServiceType());
if (StringUtils.isBlank(serverInfoDTO.getServiceName())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
}
serviceEntity.setServerName(serviceName);
serviceEntity.setServerName(serverInfoDTO.getServiceName());
demandServiceDao.insert(serviceEntity);
}
return resultDto;

42
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* @Description
* @Author yzm
* @Date 2022/7/27 17:23
*/
@Data
public class SendSmsFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
private String mobile;
/**
* 场景
*/
@NotBlank(message = "短信模板编码不能为空", groups = {AddUserInternalGroup.class})
private String aliyunTemplateCode;
/**
* 如果短信模板内有参数按序传入
*/
private List<String> paramsContent;
private String customerId;
}

8
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@ -21,8 +21,8 @@ import java.util.List;
* @author yinzuomei@elink-cn.com
* @date 2020/6/4 13:47
*/
//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085")
@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class)
@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085")
// @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class)
public interface EpmetMessageOpenFeignClient {
/**
* 发送短信
@ -123,4 +123,8 @@ public interface EpmetMessageOpenFeignClient {
*/
@PostMapping("/message/system/pendding-mq-msg-scan")
Result penddingMqMsgScan();
@PostMapping(value = "message/sms/send-msg", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result sendMsg(@RequestBody List<SendSmsFormDTO> formDTO);
}

5
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@ -73,4 +73,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
public Result penddingMqMsgScan() {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "penddingMqMsgScan");
}
@Override
public Result sendMsg(List<SendSmsFormDTO> formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendMsg",formDTO);
}
}

14
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java

@ -16,6 +16,7 @@ import com.epmet.commons.tools.validator.group.AliyunGroup;
import com.epmet.commons.tools.validator.group.QcloudGroup;
import com.epmet.dto.SysSmsDTO;
import com.epmet.dto.form.ProjectSendMsgFormDTO;
import com.epmet.dto.form.SendSmsFormDTO;
import com.epmet.dto.form.SendVerificationCodeFormDTO;
import com.epmet.dto.result.SendVerificationCodeResultDTO;
import com.epmet.enums.PlatformEnum;
@ -128,4 +129,17 @@ public class SmsController {
return new Result();
}
/**
* 通用发短信方法传入短信模板内容
*
* @param formDTOList
* @return
*/
@PostMapping("send-msg")
public Result sendMsg(@RequestBody List<SendSmsFormDTO> formDTOList) {
ValidatorUtils.validateEntity(formDTOList, SendSmsFormDTO.AddUserShowGroup.class, SendSmsFormDTO.AddUserInternalGroup.class);
sysSmsService.sendMsg(formDTOList);
return new Result();
}
}

2
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java

@ -13,6 +13,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.SysSmsDTO;
import com.epmet.dto.form.ProjectSendMsgFormDTO;
import com.epmet.dto.form.SendSmsFormDTO;
import com.epmet.dto.form.SendVerificationCodeFormDTO;
import com.epmet.dto.result.SendVerificationCodeResultDTO;
import com.epmet.entity.SysSmsEntity;
@ -77,5 +78,6 @@ public interface SysSmsService extends BaseService<SysSmsEntity> {
**/
void projectSendMsg(List<ProjectSendMsgFormDTO> formDTOList);
void sendMsg(List<SendSmsFormDTO> formDTOList);
}

30
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@ -13,6 +13,7 @@ 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.constant.Constant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.exception.RenException;
@ -25,6 +26,7 @@ import com.epmet.dao.SysSmsDao;
import com.epmet.dto.SysSmsDTO;
import com.epmet.dto.form.CrmParameterFormDTO;
import com.epmet.dto.form.ProjectSendMsgFormDTO;
import com.epmet.dto.form.SendSmsFormDTO;
import com.epmet.dto.form.SendVerificationCodeFormDTO;
import com.epmet.dto.result.CrmParameterResultDTO;
import com.epmet.dto.result.SendVerificationCodeResultDTO;
@ -323,7 +325,33 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
service.sendSmsMsg(sysSmsDTO);
}
} catch (Exception e) {
logger.warn(String.format("项目提醒发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage()));
logger.warn(String.format("发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage()));
}
}
@Override
public void sendMsg(List<SendSmsFormDTO> formDTOList) {
try {
for(SendSmsFormDTO formDTO:formDTOList){
SysSmsDTO sysSmsDTO = new SysSmsDTO();
sysSmsDTO.setMobile(formDTO.getMobile());
sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode());
sysSmsDTO.setCustomerId(formDTO.getCustomerId());
HashMap<String, String> map = new HashMap<>();
try{
if(SmsTemplateConstant.PROJECT_TRANSFER.equals(formDTO.getAliyunTemplateCode())){
map.put("params1", formDTO.getParamsContent().get(NumConstant.ZERO));
}
String paramJson = new ObjectMapper().writeValueAsString(map);
sysSmsDTO.setParams(paramJson);
} catch (JsonProcessingException e) {
log.warn("sendMsg JsonProcessingException", e);
}
//推送短信
this.sendMsg(sysSmsDTO);
}
} catch (Exception e) {
logger.error("sendMsg exception", e);
}
}

49
epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java

@ -0,0 +1,49 @@
/**
* 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.form;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 角色管理
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-18
*/
@Data
public class GovRoleListDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 角色名称
*/
private String name;
}

5
epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@ -2,6 +2,8 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.GovMenuDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.NewUserRoleResultDTO;
@ -59,4 +61,7 @@ public interface GovAccessFeignClient {
@PostMapping("/gov/access/menu/getCustomerMenuList")
Result<List<GovMenuDTO>> getCustomerMenuList(@RequestBody GetCustomerMenuListFormDTO formDTO);
@PostMapping("/gov/access/govrole/getgovrole")
Result<GovRoleDTO> getGovRole(@RequestBody GovRoleListDTO formDTO);
}

7
epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java

@ -3,6 +3,8 @@ package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.GovMenuDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.NewUserRoleResultDTO;
@ -43,4 +45,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
public Result<List<GovMenuDTO>> getCustomerMenuList(GetCustomerMenuListFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getCustomerMenuList", formDTO);
}
@Override
public Result<GovRoleDTO> getGovRole(GovRoleListDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getGovRole", formDTO);
}
}

6
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java

@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.form.GovRoleListDTO;
import com.epmet.service.GovRoleMenuService;
import com.epmet.service.GovRoleService;
import org.springframework.beans.factory.annotation.Autowired;
@ -102,4 +103,9 @@ public class GovRoleController {
return new Result<List<GovRoleDTO>>().ok(data);
}
@PostMapping("getgovrole")
public Result<GovRoleDTO> getGovRole(@RequestBody GovRoleListDTO fromDTO){
return new Result<GovRoleDTO>().ok(govRoleService.getGovRole(fromDTO));
}
}

2
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java

@ -9,6 +9,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.result.NewUserRoleResultDTO;
import com.epmet.entity.GovRoleEntity;
import org.apache.ibatis.annotations.Mapper;
@ -33,4 +34,5 @@ public interface GovRoleDao extends BaseDao<GovRoleEntity> {
*/
List<NewUserRoleResultDTO> getCustomerRoles(@Param("customerId")String customerId);
GovRoleDTO selectGovRole(@Param("customerId") String customerId, @Param("name") String name);
}

3
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java

@ -20,6 +20,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.form.GovRoleListDTO;
import com.epmet.entity.GovRoleEntity;
import java.util.List;
@ -92,4 +93,6 @@ public interface GovRoleService extends BaseService<GovRoleEntity> {
* @date 2020-03-18
*/
void delete(String[] ids);
GovRoleDTO getGovRole(GovRoleListDTO fromDTO);
}

6
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java

@ -28,6 +28,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.GovRoleDao;
import com.epmet.dto.GovRoleDTO;
import com.epmet.dto.form.GovRoleListDTO;
import com.epmet.entity.GovRoleEntity;
import com.epmet.redis.GovRoleRedis;
import com.epmet.service.GovRoleMenuService;
@ -122,4 +123,9 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
govRoleUserService.deleteByRoleIds(ids);
}
@Override
public GovRoleDTO getGovRole(GovRoleListDTO fromDTO) {
return baseDao.selectGovRole(fromDTO.getCustomerId(), fromDTO.getName());
}
}

12
epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml

@ -12,4 +12,16 @@
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
</select>
<select id="selectGovRole" resultType="com.epmet.dto.GovRoleDTO">
SELECT
*
FROM gov_role
WHERE
del_flag = 0
AND customer_id = #{customerId}
AND `name` = #{name}
LIMIT 1
</select>
</mapper>

0
epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql → epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.35__formitem_zhzl.sql

Loading…
Cancel
Save