From 841f4c82a2930057353300d7c25be3d07d518343 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 2 Jan 2025 16:23:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=9B=9E=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectInfo/projectProcess/site/index.vue | 14 ++++----- .../projectProcess/site/track/index.vue | 22 ------------- .../src/views/managementControl/index.vue | 4 +-- .../java/com/kms/config/WaterRequestUtil.java | 31 ++++++++++++------- .../src/main/resources/application-test.yml | 10 ++++-- .../service/BsSgcjsjdBuiProInfoService.java | 11 ++----- .../mapper/warn/BsSgcJsjdWarnResultMapper.xml | 25 +++++++++------ 7 files changed, 54 insertions(+), 63 deletions(-) diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue index 58c19c6b..1ce4c713 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue @@ -17,7 +17,7 @@ /> - + - - + />
- - - - - - - - - - 搜索 重置 diff --git a/jwtech-admin-page/src/views/managementControl/index.vue b/jwtech-admin-page/src/views/managementControl/index.vue index d3779efd..42e482c6 100644 --- a/jwtech-admin-page/src/views/managementControl/index.vue +++ b/jwtech-admin-page/src/views/managementControl/index.vue @@ -322,8 +322,8 @@ export default { getPie(){ getPieChart().then(res=>{ this.pieList=res.data - console.log(this.pieList) this.eleInit(); + }) }, warnTypeFormat(row, column) { @@ -409,7 +409,7 @@ export default { // ...item, // name: this.truncateName(item.name), // })), - data: this.pieList.map(item=>({ + data: res.data.map(item=>({ name:this.warnTypeFormat(item), value:item.total })), diff --git a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java index 3e7a329a..33f34e53 100644 --- a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java +++ b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java @@ -23,10 +23,17 @@ public class WaterRequestUtil { private static final Logger log = LoggerFactory.getLogger(WaterRequestUtil.class); - @Value("${water.paasToken}") - public String paasToken; - @Value("${water.paasId}") - public String paasId; + @Value("${water.tspToken}") + public String tspToken; + @Value("${water.tspPaasId}") + public String tspPaasId; + + @Value("${water.tifToken}") + public String tifToken; + @Value("${water.tifPaasId}") + public String tifPaasId; + + //网关 @Value("${water.url}") public String url; @@ -103,22 +110,24 @@ public class WaterRequestUtil { private void setHead(HttpRequest httpRequest,String serviceId,String appsecret){ String timestamp = String.valueOf(new Date().getTime()); String tifTimestamp = String.valueOf(new Date().getTime() / 1000); - String xTifPaasid=paasId; String nonce = IdUtil.fastSimpleUUID(); - String signature = tifTimestamp + paasToken + nonce + tifTimestamp; + String tifSignature = tifTimestamp + tifToken + nonce + tifTimestamp; + String tspSignature = tifTimestamp + tspToken + nonce + tifTimestamp; // System.out.println(signature); try { - signature = SHACoder.encodeSHA256Hex(signature).toUpperCase(); + tifSignature = SHACoder.encodeSHA256Hex(tifSignature).toUpperCase(); + tspSignature = SHACoder.encodeSHA256Hex(tspSignature).toUpperCase(); + } catch (Exception e) { e.printStackTrace(); } httpRequest - .header("x-tsp-paasid",paasId) - .header("x-tsp-signature",signature) + .header("x-tsp-paasid",tspPaasId) + .header("x-tsp-signature",tspSignature) .header("x-tsp-timestamp",tifTimestamp) .header("x-tsp-nonce", nonce) - .header("x-tif-paasid",paasId) - .header("x-tif-signature",signature) + .header("x-tif-paasid",tifPaasId) + .header("x-tif-signature",tifSignature) .header("x-tif-timestamp",tifTimestamp) .header("x-tif-nonce",nonce) .header("x-tsp-serviceid",serviceId) diff --git a/jwtech-admin/src/main/resources/application-test.yml b/jwtech-admin/src/main/resources/application-test.yml index 19b95732..f8bace98 100644 --- a/jwtech-admin/src/main/resources/application-test.yml +++ b/jwtech-admin/src/main/resources/application-test.yml @@ -265,8 +265,14 @@ water: #应用token paasToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzeXN0ZW1JZCI6IjE3MzI3MDMxMTE1NDc0ODIxMTQifQ.4oiD3WBwrxT5z8goAvA9O88vsYVxwaE-8vyQmWl7xbg #应用id - paasId: 1732703111547482114 - singOnUrl: ${water.url}/uaa/social/sso +# paasId: 1732703111547482114 + tifPaasId: jgThinking + tifToken: 459c2793c1434cf781cc6ed644c29ecd + tspPaasId: sgc-jg + tspToken: sgc-jg~sM08Ha2 + + singOnUrl: ${water.url}/services/am-uaa/uaa/social/sso + #服务id singOnServiceId: DGSP_1606192265703567361 #服务密钥 diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index df529596..9cf983cf 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -918,10 +918,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService(); } - ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(20, 20, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(records.size())); for (BsSgcjsjdBuiProInfo bs:records) { - threadPoolExecutor.execute(() -> { LambdaQueryWrapper lw = new LambdaQueryWrapper<>(); List bsSgcJsjdBuiComAccs = bsSgcJsjdBuiComAccMapper.selectList(lw .eq(BsSgcJsjdBuiComAcc::getProNo, bs.getProNo()).eq(BsSgcJsjdBuiComAcc::getSectionName, bs.getProjectName())); @@ -951,17 +949,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService SELECT - SUBSTRING(pi.adcd, 1, 4) AS adcdPrefix, - COUNT(pi.pro_no) AS proInfoCount, - COUNT(CASE WHEN wr.is_handle = 0 THEN wr.pro_no END) AS matchedCount + SUBSTRING(pi.adcd, 1, 4) AS adcdPrefix, + COUNT(pi.pro_no) AS proInfoCount, + COUNT(CASE WHEN wr.is_handle = 0 THEN wr.pro_no END) AS matchedCount FROM - bs_sgc_jsjd_bui_pro_info pi - LEFT JOIN - bs_sgc_jsjd_warn_result wr - ON - pi.pro_no = wr.pro_no + bs_sgc_jsjd_bui_pro_info pi + LEFT JOIN + bs_sgc_jsjd_warn_result wr + ON + pi.pro_no = wr.pro_no + WHERE + pi.adcd LIKE '44%' -- adcd 以 "44" 开头 + AND SUBSTRING(pi.adcd, 3, 2) != '00' -- "44" 后面的两位数字不是 "00" GROUP BY - SUBSTRING(pi.adcd, 1, 4) - order by proInfoCount desc LIMIT #{pageNum},#{pageSize}; + SUBSTRING(pi.adcd, 1, 4) + ORDER BY + proInfoCount DESC + LIMIT #{pageNum}, #{pageSize};