From f84f34420604009408231793d15a5560ca0debfc Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 15:17:42 +0800
Subject: [PATCH] 1、大厅来访登记，添加当事人法人信息，选择企业接口4
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java | 20 +++++++++++++-------
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 12 +++++++++---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java | 1 +
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
index ea6a51e..7f8acda 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
@@ -1,6 +1,7 @@
package cn.huge.module.grid.controller.web;
import cn.huge.base.common.bo.R;
+import cn.huge.base.common.utils.AesUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java
index 53115f3..0588ac2 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java
@@ -4,6 +4,7 @@
import cn.huge.base.common.utils.AesUtils;
import cn.huge.base.common.utils.HttpClientUtils;
import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.dto.GridCompanyDTO;
import cn.huge.module.grid.domain.vo.*;
import com.alibaba.fastjson.JSON;
@@ -55,7 +56,7 @@
List<GridCompanyDTO.UnitDTO> records = data.getRecords();
for(GridCompanyDTO.UnitDTO item :records){
item.setLegalRepresent(AesUtils.decrypt(item.getLegalRepresent(),"eb4KhdJRyDwS4ndTBc2NTDNaSEP6KbwQ"));
-
+ item.setLegalPersonTelephone(AesUtils.decrypt(item.getLegalPersonTelephone(),"eb4KhdJRyDwS4ndTBc2NTDNaSEP6KbwQ"));
}
return R.ok(data);
} else {
@@ -75,12 +76,17 @@
public Page pageQuery(GridCompanyVo gridCompanyVo) throws Exception {
Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
PageRequest pageRequest = PageRequest.of(gridCompanyVo.getPage()-1, gridCompanyVo.getPageSize(), sort);
-// R<GridCompanyDTO> companyList = getCompanyList(gridCompanyVo);
- String url = "http://183.2.142.46:9007/api/thrid/grid/company/get-company-list";
- Map<String, String> headers = new HashMap<>();
- headers.put("Content-Type", "application/json");
- String s = HttpClientUtils.httpPostRaw(url, JSON.toJSONString(gridCompanyVo), headers, "utf-8");
- R companyList = JSON.parseObject(s, R.class);
+ R<GridCompanyDTO> companyList = null;
+ // 开发环境
+ if (SpringContextUtil.checkDev()) {
+ String url = "http://183.2.142.46:9007/api/thrid/grid/company/get-company-list";
+ Map<String, String> headers = new HashMap<>();
+ headers.put("Content-Type", "application/json");
+ String s = HttpClientUtils.httpPostRaw(url, JSON.toJSONString(gridCompanyVo), headers, "utf-8");
+ companyList = JSON.parseObject(s, R.class);
+ }else {
+ companyList = getCompanyList(gridCompanyVo);
+ }
if(companyList.getCode() != 0){
throw new Exception(companyList.getMsg());
}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index 799ab53..a53dc14 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -2,6 +2,7 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
+import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.dto.GridOrgDTO;
import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
@@ -37,9 +38,14 @@
requestVo.setBodyVo(gridTokenVo);
try {
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
- log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
-// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ // 开发环境
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }else {
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
log.info("xsd:{}",s);
} catch (Exception e) {
log.info("xsderror:{}",e.getLocalizedMessage());
--
Gitblit v1.8.0