需求回归

jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue

@@ -17,7 +17,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="人员实时定位信息" name="loInformation">
+      <el-tab-pane label="人员实时定位信息" name="information">
         <information
           v-if="activeName === 'information'"
           :proNo="proNo"
@@ -47,7 +47,7 @@
         />
       </el-tab-pane>
       <el-tab-pane label="生产出料明细信息" name="output">
-        <output
+        <outputL
           v-if="activeName === 'output'"
           :proNo="proNo"
           :proCode="proCode"
@@ -68,11 +68,11 @@
         />
       </el-tab-pane>
       <el-tab-pane label="车辆轨迹监测信息" name="track">
-        <track
+        <trackL
           v-if="activeName === 'track'"
           :proNo="proNo"
           :proCode="proCode"
-        />
+         />
       </el-tab-pane>
       <el-tab-pane label="灌浆实时状态统计信息" name="statistics">
         <statistics
@@ -108,9 +108,9 @@ import deviceInformation from "./deviceInformation/index.vue";
 import information from "./information/index.vue";
 import monitoring from "./monitoring/index.vue";
 import noiseMonitoring from "./noiseMonitoring/index.vue";
-import output from "./output/index.vue";
+import outputL from "./output/index.vue";
 import vehicleInformation from "./vehicleInformation/index.vue";
-import track from "./track/index.vue";
+import trackL from "./track/index.vue";
 import record from "./record/index.vue";
 import statistics from "./statistics/index.vue";
 import qualityMonitoring from "./qualityMonitoring/index.vue";
@@ -118,7 +118,7 @@ import qualityMonitoring from "./qualityMonitoring/index.vue";
 export default {
   props: ["projectName", "proNo", "proCode"],
   components: { personnel, personDetails, loInformation, deviceInformation, information,monitoring,
-    noiseMonitoring,vehicleInformation,output,track,record,statistics,qualityMonitoring},
+    noiseMonitoring,vehicleInformation,outputL,trackL,record,statistics,qualityMonitoring},
   data() {
     return {
       activeName: "personnel",

jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/track/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="车辆类型" prop="type">
-        <el-select v-model="queryParams.data.type" placeholder="请选择车辆类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="所在工区" prop="workArea">
         <el-input
           v-model="queryParams.data.workArea"
@@ -40,23 +35,6 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item label="历史轨迹信息" prop="trajectory">
-        <el-input
-          v-model="queryParams.data.trajectory"
-          placeholder="请输入历史轨迹信息"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-button
-              type="primary"
-              slot="append"
-              icon="el-icon-search"
-              size="small"
-              @click="handleQuery"
-          ></el-button>
-        </el-input>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

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
             })),

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}")
+    @Value("${water.tspToken}")
-    public String paasToken;
+    public String tspToken;
-    @Value("${water.paasId}")
+    @Value("${water.tspPaasId}")
-    public String paasId;
+    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-paasid",tspPaasId)
-                .header("x-tsp-signature",signature)
+                .header("x-tsp-signature",tspSignature)
                 .header("x-tsp-timestamp",tifTimestamp)
                 .header("x-tsp-nonce", nonce)
-                .header("x-tif-paasid",paasId)
+                .header("x-tif-paasid",tifPaasId)
-                .header("x-tif-signature",signature)
+                .header("x-tif-signature",tifSignature)
                 .header("x-tif-timestamp",tifTimestamp)
                 .header("x-tif-nonce",nonce)
                 .header("x-tsp-serviceid",serviceId)

jwtech-admin/src/main/resources/application-test.yml

@@ -265,8 +265,14 @@ water:
   #应用token
   paasToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzeXN0ZW1JZCI6IjE3MzI3MDMxMTE1NDc0ODIxMTQifQ.4oiD3WBwrxT5z8goAvA9O88vsYVxwaE-8vyQmWl7xbg
   #应用id
-  paasId: 1732703111547482114
+#  paasId: 1732703111547482114
-  singOnUrl: ${water.url}/uaa/social/sso
+  tifPaasId: jgThinking
+  tifToken: 459c2793c1434cf781cc6ed644c29ecd
+  tspPaasId: sgc-jg
+  tspToken: sgc-jg~sM08Ha2
+
+  singOnUrl: ${water.url}/services/am-uaa/uaa/social/sso
+
   #服务id
   singOnServiceId: DGSP_1606192265703567361
   #服务密钥

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -918,10 +918,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
             return new HashMap<>();
         }
 
-        ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(20, 20, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(records.size()));
 
         for (BsSgcjsjdBuiProInfo bs:records) {
-            threadPoolExecutor.execute(() -> {
                 LambdaQueryWrapper<BsSgcJsjdBuiComAcc> lw = new LambdaQueryWrapper<>();
                 List<BsSgcJsjdBuiComAcc> bsSgcJsjdBuiComAccs = bsSgcJsjdBuiComAccMapper.selectList(lw
                         .eq(BsSgcJsjdBuiComAcc::getProNo, bs.getProNo()).eq(BsSgcJsjdBuiComAcc::getSectionName, bs.getProjectName()));
@@ -951,17 +949,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                         }
                     }
                 }
-            });
+
         }
         // 关闭线程池
-        threadPoolExecutor.shutdown();
 
         // 等待所有线程完成
-        try {
+
-            threadPoolExecutor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
         map.put("acc",isAcc);
         map.put("zd",zdType);
         map.put("ms",msType);

jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdWarnResultMapper.xml

@@ -13,18 +13,23 @@
     <select id="selectWarnAreaNum" resultType="java.util.Map">
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         SELECT
-            SUBSTRING(pi.adcd, 1, 4) AS adcdPrefix,
+        SUBSTRING(pi.adcd, 1, 4) AS adcdPrefix,
-            COUNT(pi.pro_no) AS proInfoCount,
+        COUNT(pi.pro_no) AS proInfoCount,
-            COUNT(CASE WHEN wr.is_handle = 0 THEN wr.pro_no END) AS matchedCount
+        COUNT(CASE WHEN wr.is_handle = 0 THEN wr.pro_no END) AS matchedCount
         FROM
-            bs_sgc_jsjd_bui_pro_info pi
+        bs_sgc_jsjd_bui_pro_info pi
-                LEFT JOIN
+        LEFT JOIN
-            bs_sgc_jsjd_warn_result wr
+        bs_sgc_jsjd_warn_result wr
-            ON
+        ON
-                pi.pro_no = wr.pro_no
+        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)
+        SUBSTRING(pi.adcd, 1, 4)
-        order by proInfoCount desc LIMIT #{pageNum},#{pageSize};
+        ORDER BY
+        proInfoCount DESC
+        LIMIT #{pageNum}, #{pageSize};
     </select>