From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridCompanyService.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
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 1a14f5a..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
@@ -3,6 +3,8 @@
import cn.huge.base.common.bo.R;
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;
@@ -10,15 +12,16 @@
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import static cn.huge.base.common.utils.AesUtils.KEY_ALGORITHM;
@@ -53,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 {
@@ -70,4 +73,31 @@
return headVo;
}
+ 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 = 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());
+ }
+ if(ObjectUtils.isNotEmpty(companyList)){
+ GridCompanyDTO data = JSON.parseObject(JSON.toJSONString(companyList.getData()), GridCompanyDTO.class);
+ if(ObjectUtils.isNotEmpty(data)){
+ List<GridCompanyDTO.UnitDTO> records = data.getRecords();
+ return new PageImpl<>(records, pageRequest, data.getTotal());
+ }
+ }
+ return new PageImpl<>(new ArrayList<>(), pageRequest, 0);
+ }
+
}
--
Gitblit v1.8.0