Browse Source

Merge branch 'dev_plugins' into dev_temp

dev_shibei_match
zhaoqifeng 5 years ago
parent
commit
39f809ff05
  1. 6
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
  2. 2
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
  3. 18
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  4. 16
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerDomainFormDTO.java
  5. 28
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java
  6. 11
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
  7. 9
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionCustomizedDao.java
  8. 14
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
  9. 59
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
  10. 13
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml

6
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@ -286,9 +286,9 @@ public class CustomerController {
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CustomerListResultDTO>>
*/
@PostMapping("customerlist")
public Result<List<CustomerListResultDTO>> customerList(@RequestBody PageQueryFormDTO formDTO) {
List<CustomerListResultDTO> result = customerService.customerList(formDTO);
return new Result<List<CustomerListResultDTO>>().ok(result);
public Result<PageData> customerList(@RequestBody PageQueryFormDTO formDTO) {
PageData result = customerService.customerList(formDTO);
return new Result<PageData>().ok(result);
}
/**

2
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java

@ -194,7 +194,7 @@ public interface CustomerService extends BaseService<CustomerEntity> {
* @param formDTO
* @return com.epmet.dto.result.CustomerListResultDTO
*/
List<CustomerListResultDTO> customerList(PageQueryFormDTO formDTO);
PageData customerList(PageQueryFormDTO formDTO);
/**
* 客户基本信息修改

18
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -578,7 +578,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
}
@Override
public List<CustomerListResultDTO> customerList(PageQueryFormDTO formDTO) {
public PageData customerList(PageQueryFormDTO formDTO) {
PageInfo<CustomerListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
.doSelectPageInfo(() -> baseDao.selectAllCustomerList(formDTO.getCustomerName()));
List<CustomerListResultDTO> list = pageInfo.getList();
@ -592,25 +592,29 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
CustomerAgencyDTO agency = customerRootAgencyRst.getData();
// 管理员
GovStaffRoleResultDTO manager = new GovStaffRoleResultDTO();
if (agency != null) {
StaffRoleFormDTO staffsInRoleForm = new StaffRoleFormDTO();
staffsInRoleForm.setOrgId(agency.getId());
staffsInRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
Result<List<GovStaffRoleResultDTO>> managersResult = epmetUserFeignClient.getStaffsInRole(staffsInRoleForm);
if (!managersResult.success() || null == managersResult.getData() || managersResult.getData().size() == NumConstant.ZERO) {
if (!managersResult.success()) {
throw new RenException("查询客户详情:查询客户管理员失败:".concat(managersResult.toString()));
}
manager = managersResult.getData().get(NumConstant.ZERO);
dto.setProvince(agency.getProvince());
dto.setCity(agency.getCity());
dto.setCounty(agency.getDistrict());
dto.setRootManageName(manager.getRealName());
dto.setRootManagePhone(manager.getMobile());
if (null != managersResult.getData() && managersResult.getData().size() > NumConstant.ZERO) {
GovStaffRoleResultDTO manager = managersResult.getData().get(NumConstant.ZERO);
dto.setRootManageName(manager.getRealName());
dto.setRootManagePhone(manager.getMobile());
}
}
});
}
return list;
pageInfo.setList(list);
return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
}
@Override

16
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerDomainFormDTO.java

@ -0,0 +1,16 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/19 16:13
*/
@Data
public class CustomerDomainFormDTO implements Serializable {
private static final long serialVersionUID = 6766612197218605922L;
private String customerId;
}

28
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/WebviewDomainFormDTO.java

@ -0,0 +1,28 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/19 17:46
*/
@Data
public class WebviewDomainFormDTO implements Serializable {
private static final long serialVersionUID = 8022056850984848597L;
/**
* 客户ID
*/
private String customerId;
/**
* 客户端类型
*/
private String clientType;
/**
* 业务域名
*/
private List<String> webViewDomain;
}

11
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java

@ -26,10 +26,7 @@ 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.FunctionCustomizedDTO;
import com.epmet.dto.form.CommonFunctionIdFormDTO;
import com.epmet.dto.form.FunctionCustomizedListFormDTO;
import com.epmet.dto.form.SaveFunctionCustomizedFormDTO;
import com.epmet.dto.form.UpdateCustomizedFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.FunctionCustomizedDetailResultDTO;
import com.epmet.dto.result.FunctionCustomizedListResultDTO;
import com.epmet.excel.FunctionCustomizedExcel;
@ -174,4 +171,10 @@ public class FunctionCustomizedController {
ValidatorUtils.validateEntity(formDTO);
return functionCustomizedService.functionCustomizedList(formDTO);
}
@PostMapping("customerdomainname")
public Result customerDomain(@RequestBody CustomerDomainFormDTO formDTO) {
functionCustomizedService.customerDomain(formDTO);
return new Result();
}
}

9
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionCustomizedDao.java

@ -116,4 +116,13 @@ public interface FunctionCustomizedDao extends BaseDao<FunctionCustomizedEntity>
* @Description 查询定制功能信息
**/
FunctionCustomizedDTO selectByFunctionId(@Param("functionId") String functionId);
/**
* 获取业务域名
* @author zhaoqifeng
* @date 2020/8/20 9:36
* @param customerId
* @return java.util.List<com.epmet.dto.FunctionCustomizedDTO>
*/
List<FunctionCustomizedDTO> selectDomains(@Param("customerId") String customerId);
}

14
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java

@ -21,10 +21,7 @@ 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.FunctionCustomizedDTO;
import com.epmet.dto.form.CommonFunctionIdFormDTO;
import com.epmet.dto.form.FunctionCustomizedListFormDTO;
import com.epmet.dto.form.SaveFunctionCustomizedFormDTO;
import com.epmet.dto.form.UpdateCustomizedFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.FunctionCustomizedDetailResultDTO;
import com.epmet.dto.result.FunctionCustomizedListResultDTO;
import com.epmet.entity.FunctionCustomizedEntity;
@ -153,4 +150,13 @@ public interface FunctionCustomizedService extends BaseService<FunctionCustomize
* @Date 10:07 2020-08-14
**/
Result<FunctionCustomizedListResultDTO> functionCustomizedList(FunctionCustomizedListFormDTO formDTO);
/**
* 设置业务域名
* @author zhaoqifeng
* @date 2020/8/19 16:15
* @param formDTO
* @return void
*/
void customerDomain(CustomerDomainFormDTO formDTO);
}

59
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java

@ -17,23 +17,24 @@
package com.epmet.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
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.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.CustomerFunctionDetailDao;
import com.epmet.dao.FunctionCustomizedDao;
import com.epmet.dto.CustomerFunctionDetailDTO;
import com.epmet.dto.CustomizedDTO;
import com.epmet.dto.FunctionCustomizedDTO;
import com.epmet.dto.form.CommonFunctionIdFormDTO;
import com.epmet.dto.form.FunctionCustomizedListFormDTO;
import com.epmet.dto.form.SaveFunctionCustomizedFormDTO;
import com.epmet.dto.form.UpdateCustomizedFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.FunctionCustomizedDetailResultDTO;
import com.epmet.dto.result.FunctionCustomizedListResultDTO;
import com.epmet.entity.CustomerFunctionDetailEntity;
@ -52,6 +53,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 定制功能
@ -236,6 +238,55 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
return new Result<FunctionCustomizedListResultDTO>().ok(resultDTO);
}
@Override
public void customerDomain(CustomerDomainFormDTO formDTO) {
//获取业务域名
List<FunctionCustomizedDTO> list = baseDao.selectDomains(formDTO.getCustomerId());
List<String> workDomains = new ArrayList<>();
List<String> resiDomains = new ArrayList<>();
if (null != list) {
for(FunctionCustomizedDTO dto : list) {
if (StringUtils.isNotBlank(dto.getDomainName())) {
String[] domainNames = dto.getDomainName().split(";");
if (("resi").equals(dto.getFromApp())) {
resiDomains.addAll(Arrays.asList(domainNames));
} else {
workDomains.addAll(Arrays.asList(domainNames));
}
}
}
}
String domainUrl = "https://epmet-cloud.elinkservice.cn/api/third/code/setWebviewDomain";
if(resiDomains.size() > NumConstant.ZERO) {
resiDomains = resiDomains.stream().distinct().collect(Collectors.toList());
WebviewDomainFormDTO domainFormDTO = new WebviewDomainFormDTO();
domainFormDTO.setCustomerId(formDTO.getCustomerId());
domainFormDTO.setClientType("resi");
domainFormDTO.setWebViewDomain(resiDomains);
String domainData = HttpClientManager.getInstance().sendPostByJSON(domainUrl, JSON.toJSONString(domainFormDTO)).getData();
JSONObject domainObject = JSON.parseObject(domainData);
Result domainResult = ConvertUtils.mapToEntity(domainObject, Result.class);
if (!domainResult.success()) {
throw new RenException(domainResult.getCode(), domainResult.getInternalMsg());
}
}
if(workDomains.size() > NumConstant.ZERO) {
workDomains = workDomains.stream().distinct().collect(Collectors.toList());
WebviewDomainFormDTO domainFormDTO = new WebviewDomainFormDTO();
domainFormDTO.setCustomerId(formDTO.getCustomerId());
domainFormDTO.setClientType("work");
domainFormDTO.setWebViewDomain(workDomains);
String domainData = HttpClientManager.getInstance().sendPostByJSON(domainUrl, JSON.toJSONString(domainFormDTO)).getData();
JSONObject domainObject = JSON.parseObject(domainData);
Result domainResult = ConvertUtils.mapToEntity(domainObject, Result.class);
if (!domainResult.success()) {
throw new RenException(domainResult.getCode(), domainResult.getInternalMsg());
}
}
}
/**
* 保存数据到 功能表
* @param formDTO

13
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml

@ -87,6 +87,19 @@
AND cu.FROM_APP = 'gov'
</if>
</select>
<select id="selectDomains" resultType="com.epmet.dto.FunctionCustomizedDTO">
SELECT
cfd.DOMAIN_NAME,
fc.FROM_APP
FROM
customer_function_detail cfd
INNER JOIN function_customized fc ON cfd.FUNCTION_ID = fc.FUNCTION_ID
WHERE
cfd.DEL_FLAG = 0
AND fc.DEL_FLAG = 0
AND cfd.SHOPPING_STATUS = 1
AND cfd.CUSTOMER_ID = #{customerId}
</select>
<select id="selectFunctionCustomizedList" resultType="com.epmet.dto.result.FunctionResultDTO">
SELECT

Loading…
Cancel
Save