From f5d3373ce02cecd7806bb145a55ab63258208832 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Wed, 25 Dec 2024 16:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E5=BD=92=E6=A8=A1=E5=9D=97=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/warn/earlyWarning.js              |  25 ++
 .../src/views/largeScreen/index.vue           |   1 +
 .../src/views/largeScreen/index2.vue          |  25 +-
 .../src/views/managementControl/index.vue     | 219 ++++++++++--------
 .../controller/system/SysXzqhController.java  |  18 +-
 .../kms/system/service/SysXzqhService.java    |   8 +-
 .../BsSgcJsjdWarnResultController.java        |  27 ++-
 .../kms/warn/domain/BsSgcJsjdWarnResult.java  |   7 +
 .../mapper/BsSgcJsjdWarnResultMapper.java     |  13 ++
 .../service/BsSgcJsjdWarnResultService.java   |  55 ++++-
 .../mapper/warn/BsSgcJsjdWarnResultMapper.xml |  57 +++++
 11 files changed, 322 insertions(+), 133 deletions(-)

diff --git a/jwtech-admin-page/src/api/warn/earlyWarning.js b/jwtech-admin-page/src/api/warn/earlyWarning.js
index 060004ba..24c28c7f 100644
--- a/jwtech-admin-page/src/api/warn/earlyWarning.js
+++ b/jwtech-admin-page/src/api/warn/earlyWarning.js
@@ -17,3 +17,28 @@ export function listProjectExport(data) {
     data:data
   })
 }
+
+
+export function getDistribution(params) {
+  return request({
+    url: '/warn/result/distribution',
+    method: 'get',
+    params:params
+  })
+}
+
+export function getTotal() {
+  return request({
+    url: '/warn/result/total',
+    method: 'get',
+  })
+}
+
+export function getPieChart() {
+  return request({
+    url: '/warn/result/warnType',
+    method: 'get',
+  })
+}
+
+
diff --git a/jwtech-admin-page/src/views/largeScreen/index.vue b/jwtech-admin-page/src/views/largeScreen/index.vue
index a1bee3ce..bb638307 100644
--- a/jwtech-admin-page/src/views/largeScreen/index.vue
+++ b/jwtech-admin-page/src/views/largeScreen/index.vue
@@ -418,6 +418,7 @@
   </div>
 </template>
 <script>
+
 export default {
   data() {
     return {
diff --git a/jwtech-admin-page/src/views/largeScreen/index2.vue b/jwtech-admin-page/src/views/largeScreen/index2.vue
index 02a82c1c..7c8cc254 100644
--- a/jwtech-admin-page/src/views/largeScreen/index2.vue
+++ b/jwtech-admin-page/src/views/largeScreen/index2.vue
@@ -105,15 +105,10 @@
               v-for="(item, index) in warnInfo"
               :key="item.warnType + index"
             >
-              <span class="text_43">{{ index + 1 }}</span>
-              <span class="text_44">{{ zdWarningType(item.warnType) }}</span>
-              <span class="text_45" style="width: auto">{{
-                item.alert_type == "0" ? item.number : 0
-              }}</span>
-
-              <span class="text_47" style="width: auto">{{
-                item.alert_type == "1" ? item.number : 0
-              }}</span>
+              <span class="text_43">{{index + 1}}</span>
+              <span class="text_44">{{zdWarningType(item.warnType)}}</span>
+              <span class="text_45" >{{item.alert_type == "0" ? item.number : 0}}</span>
+              <span class="text_47" >{{item.alert_type == "1" ? item.number : 0}}</span>
             </div>
             <!-- <div class="box_21 flex-row">
               <img
@@ -228,7 +223,7 @@
                   class="text_83"
                   style="text-align: center; width: auto; margin: unset"
                   >{{
-                    rightInfoData.typeNumber ? rightInfoData.typeNumber[0] : 0
+                    rightInfoData.typeNumber ? rightInfoData.typeNumber[3] : 0
                   }}</span
                 >
               </div>
@@ -238,27 +233,27 @@
                   class="text_85"
                   style="text-align: center; width: auto; margin: unset"
                   >{{
-                    rightInfoData.typeNumber ? rightInfoData.typeNumber[0] : 0
+                    rightInfoData.typeNumber ? rightInfoData.typeNumber[2] : 0
                   }}</span
                 >
               </div>
               <div class="text-wrapper_30 flex-col">
-                <span class="text_86">咨询(家)</span>
+                <span class="text_86">质量(家)</span>
                 <span
                   class="text_87"
                   style="text-align: center; width: auto; margin: unset"
                   >{{
-                    rightInfoData.typeNumber ? rightInfoData.typeNumber[0] : 0
+                    rightInfoData.typeNumber ? rightInfoData.typeNumber[4] : 0
                   }}</span
                 >
               </div>
               <div class="text-wrapper_31 flex-col">
-                <span class="text_88">监测(家)</span>
+                <span class="text_88">招标(家)</span>
                 <span
                   class="text_89"
                   style="text-align: center; width: auto; margin: unset"
                   >{{
-                    rightInfoData.typeNumber ? rightInfoData.typeNumber[0] : 0
+                    rightInfoData.typeNumber ? rightInfoData.typeNumber[1] : 0
                   }}</span
                 >
               </div>
diff --git a/jwtech-admin-page/src/views/managementControl/index.vue b/jwtech-admin-page/src/views/managementControl/index.vue
index 8f22cb43..d8317686 100644
--- a/jwtech-admin-page/src/views/managementControl/index.vue
+++ b/jwtech-admin-page/src/views/managementControl/index.vue
@@ -37,7 +37,7 @@
                 <div class="text-wrapper">
                   <span>预警项目</span>
                   <span
-                    ><span class="text">{{ "111" }}</span
+                    ><span class="text">{{ forewarnData.forewarningNum }}</span
                     >个</span
                   >
                 </div>
@@ -50,31 +50,31 @@
                     <svg-icon icon-class="u19" />
                   </div>
                 </div>
-                <div class="text-wrapper">
-                  <span>预警企业</span>
-                  <span
-                    ><span class="text">{{ "111" }}</span
-                    >家</span
-                  >
-                </div>
-              </div>
-            </div>
-            <div class="panel">
-              <div class="panel_left">
-                <div class="icon-wrapper">
-                  <div class="in-wrapper">
-                    <svg-icon icon-class="u24" />
-                  </div>
-                </div>
                 <div class="text-wrapper">
                   <span>数据总数</span>
                   <span
-                    ><span class="text">{{ "111" }}</span
+                    ><span class="text">{{ forewarnData.total }}</span
                     >条</span
                   >
                 </div>
               </div>
             </div>
+<!--            <div class="panel">-->
+<!--              <div class="panel_left">-->
+<!--                <div class="icon-wrapper">-->
+<!--                  <div class="in-wrapper">-->
+<!--                    <svg-icon icon-class="u24" />-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="text-wrapper">-->
+<!--                  <span>数据总数</span>-->
+<!--                  <span-->
+<!--                    ><span class="text">{{ "111" }}</span-->
+<!--                    >条</span-->
+<!--                  >-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
           </div>
           <div ref="Ele" style="width: 100%; height: 220px"></div>
         </div>
@@ -82,7 +82,7 @@
           <div class="title">预警情况</div>
           <el-table
             style="margin-top: 40px"
-            v-loading="loading"
+            v-loading="yjLoading"
             border
             :data="InfoList"
             height="380"
@@ -97,42 +97,40 @@
             <el-table-column
               label="地区"
               prop="adcd"
+              :formatter="$formatAdcd"
               width="120"
               align="center" />
             <el-table-column
               label="项目数"
-              prop="adcd"
+              prop="proInfoCount"
               width="120"
               align="center" />
-            <el-table-column label="预警项目数" prop="adcd" align="center"
-          /></el-table>
-
+            <el-table-column
+              label="预警项目数"
+              prop="matchedCount"
+              width="230"
+              align="center" />
+          </el-table>
           <!-- <pagination :total="100" :page.sync="20" :limit.sync="[10]" /> -->
         </div>
       </div>
       <div class="right">
         <div class="right-top commom">
           <div class="text-wrapper">
-            <span>预警项目</span>
-            <span
-              ><span class="text">{{ "111" }}</span
-              >个</span
-            >
-          </div>
-          <div class="text-wrapper">
-            <span>预警项目</span>
+            <span>未处置</span>
             <span
-              ><span class="text">{{ "111" }}</span
+              ><span class="text">{{ forewarnData.noHandleNum }}</span
               >个</span
             >
           </div>
           <div class="text-wrapper">
-            <span>预警项目</span>
+            <span>已处置</span>
             <span
-              ><span class="text">{{ "111" }}</span
+              ><span class="text">{{ forewarnData.isHandleNum }}</span
               >个</span
             >
           </div>
+
         </div>
         <div class="right-bottom commom">
           <div class="table-wrapper">
@@ -147,14 +145,14 @@
                   v-model="queryParams.data.projectName"
                   placeholder="请输入项目名称"
                   clearable
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="getResultList"
                 >
                   <el-button
                     type="primary"
                     slot="append"
                     icon="el-icon-search"
                     size="small"
-                    @click="handleQuery"
+                    @click="getResultList"
                     style="background-color: #1973fb; color: #fff"
                   ></el-button>
                 </el-input>
@@ -168,7 +166,7 @@
                 >
               </el-form-item>
             </el-form>
-            <el-table v-loading="loading" :data="InfoList" height="585" stripe>
+            <el-table v-loading="loading" :data="warningList" height="600" stripe :row-style="{ height: '60px' }" >
               <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
 
               <el-table-column
@@ -178,13 +176,7 @@
                 align="center"
                 fixed
               />
-              <el-table-column
-                label="行政区划"
-                prop="adcd"
-                width="120"
-                align="center"
-                :formatter="$formatAdcd"
-              />
+
               <el-table-column
                 label="项目名称"
                 prop="projectName"
@@ -192,54 +184,47 @@
                 align="center"
               />
               <el-table-column
-                label="项目批复时间"
-                prop="appTime"
+                label="预警问题"
+                prop="warnType"
                 min-width="120"
                 align="center"
-                :formatter="formatDate"
+                :formatter="warnTypeFormat"
               />
-
               <el-table-column
-                label="计划总投资(万元)"
-                prop="planInvestment"
+                label="预警类型"
+                prop="alertType"
                 min-width="120"
                 align="center"
+                :formatter="formatAlertType"
               />
-
               <el-table-column
-                label="累计完成总投资(万元)"
-                prop="actInvestment"
-                min-width="120"
+                label="项目所在地"
+                prop="adcd"
+                width="120"
                 align="center"
+                :formatter="$formatAdcd"
               />
               <el-table-column
-                label="亮灯状态"
+                label="预警时间"
+                prop="createTime"
+                min-width="120"
                 align="center"
-                class-name="small-padding fixed-width"
+              />
+
+              <el-table-column
+                label="状态"
+                prop="isHandle"
                 min-width="120"
-              >
-                <template slot-scope="scope">
-                  <svg-icon
-                    v-if="scope.row.type === '0'"
-                    icon-class="redLight"
-                  />
-                  <svg-icon
-                    v-else-if="scope.row.type === '1'"
-                    icon-class="yellowLight"
-                  />
-                  <svg-icon
-                    v-else-if="scope.row.type === '3'"
-                    icon-class="greenLight"
-                  />
-                </template>
-              </el-table-column>
+                align="center"
+                :formatter="formatIsHandler"
+              />
             </el-table>
             <pagination
               v-show="pageTotal > 0"
               :total="pageTotal"
               :page.sync="queryParams.pageNum"
               :limit.sync="queryParams.pageSize"
-              @pagination="getXMInfo"
+              @pagination="getResultList"
             />
           </div>
         </div>
@@ -256,6 +241,9 @@ import index from "@vue/test-utils";
 import * as echarts from "echarts";
 import { getInfo, getSourceFundsNum } from "@/api/projectStatistics/sort";
 import { codeToText } from "element-china-area-data";
+import {getDistribution,getTotal,getPieChart} from '@/api/warn/earlyWarning'
+import { listResult } from '@/api/warn/result'
+
 export default {
   data() {
     return {
@@ -269,10 +257,14 @@ export default {
       TypeNum: {},
       showSearch: true,
       forewarningNum: [],
+      forewarnData:{},
+      warningList:[],
+      yjLoading:false,
       ms: {},
       zd: {},
       adcd: [],
       year: "2024",
+
       routeList: [
         {
           path: "/evaluationEarlyWarning/earlyWarningManage/warning",
@@ -282,10 +274,11 @@ export default {
       formattedZd: {},
       formattedMs: {},
       projectType: [],
+      pieList:[],
       zdTotal: 0,
       msTotal: 0,
       total: 0,
-
+      warnTypeOptions:[],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -295,16 +288,69 @@ export default {
           projectType: null,
           total: null,
           projectPhase: null,
+          proNo:null
         },
       },
     };
   },
+  created() {
+    this.getDicts("Warning_items").then(response => {
+      this.warnTypeOptions = response.data;
+    });
+    getTotal().then(res=>{
+      this.forewarnData=res.data
+    })
+    this.getResultList()
+    this.getPie()
+
+    getDistribution({pageNum:1,pageSize:99}).then(res=>{
+      const newData=res.data.map (item=> {
+        item.adcd=item.adcdPrefix+'00'
+        return item })
+      console.log(newData)
+      this.InfoList=newData
+    })
+  },
   mounted() {
-    this.eleInit();
   },
 
   computed: {},
   methods: {
+    resetQuery(){
+      this.queryParams.data.projectName=null
+    },
+    getPie(){
+      getPieChart().then(res=>{
+        this.pieList=res.data
+        console.log(this.pieList)
+        this.eleInit();
+      })
+    },
+    warnTypeFormat(row, column) {
+      return this.selectDictLabel(this.warnTypeOptions, row.warnType);
+    },
+    formatAlertType(row){
+      if (row.alertType=='0'){
+        return '预警'
+      }else {
+        return '提醒'
+      }
+    },
+    formatIsHandler(row){
+      if (row.alertType=='0'){
+        return '未处置'
+      }else {
+        return '已处置'
+      }
+    },
+    getResultList(){
+      this.loading=true
+      listResult(this.queryParams).then(res=>{
+         this.warningList=res.records
+         this.pageTotal=res.total
+        this.loading=false
+      })
+    },
     eleInit() {
       let chartDom = this.$refs.Ele;
       let myChart = echarts.init(chartDom);
@@ -363,25 +409,10 @@ export default {
             //   ...item,
             //   name: this.truncateName(item.name),
             // })),
-            data: [
-              { name: "2233", value: 2 },
-              { name: "21", value: 2 },
-              { name: "32", value: 2 },
-              { name: "32", value: 2 },
-              { name: "12", value: 2 },
-              { name: "61", value: 2 },
-              { name: "34", value: 2 },
-              { name: "42", value: 2 },
-              { name: "32", value: 2 },
-              { name: "33", value: 2 },
-              { name: "43", value: 2 },
-              { name: "52", value: 2 },
-              { name: "72", value: 2 },
-              { name: "31", value: 2 },
-              { name: "55", value: 2 },
-              { name: "56", value: 2 },
-              { name: "62", value: 2 },
-            ],
+            data: this.pieList.map(item=>({
+              name:this.warnTypeFormat(item),
+              value:item.total
+            })),
           },
         ],
       };
diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
index 264180f9..3acd45d5 100644
--- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
+++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
@@ -86,13 +86,19 @@ public class SysXzqhController extends BaseController
     }
 
 
+    public static void main(String[] args) {
+
+    }
 
     @GetMapping("/common")
     public AjaxResult common(){
         SysUser user = UserUtils.getUser();
         String deptId = user.getDeptId();
         SysDept sysDept = sysDeptService.get(deptId);
-        String xzqhId = sysDept.getXzqhId();
+        String xzqhId="";
+        if (StringUtils.isNotEmpty(sysDept.getXzqhId())) {
+            xzqhId = sysDept.getXzqhId().substring(0, 6);
+        }
         SysXzqh xzqh = sysXzqhService.getById(xzqhId);
         String userName = user.getUserName();
         if (userName.equals("admin")||user.getUserType().equals("01")) {
@@ -113,15 +119,7 @@ public class SysXzqhController extends BaseController
         }else {
             List<SysXzqh>list=new ArrayList<>();
             list.add(xzqh);
-            while (true){
-                LambdaQueryWrapper<SysXzqh>lw=new LambdaQueryWrapper<>();
-                xzqh = sysXzqhService.getOne(lw.eq(SysXzqh::getXzqhdm, xzqh.getParentid()));
-                if (ObjectUtil.isNotEmpty(xzqh)) {
-                    list.add(xzqh);
-                }else {
-                    break;
-                }
-            }
+
             return AjaxResult.success(list);
         }
     }
diff --git a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java
index 19230c89..85116654 100644
--- a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java
+++ b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java
@@ -1,6 +1,8 @@
 package com.kms.system.service;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jwtech.util.StringUtil;
+import com.jwtech.util.StringUtils;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.mapper.SysXzqhMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +26,9 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh>{
 
 
     public String getSubString(String adcd) {
-
+        if (StringUtils.isNotEmpty(adcd)) {
+            adcd = adcd.substring(0, 6);
+        }
         SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class)
                 .eq(SysXzqh::getXzqhdm, adcd));
 
@@ -38,7 +42,7 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh>{
         } else if (sysXzqh.getLayer() == 2) {
             return sysXzqh.getXzqhdm().substring(0, 4);
         }else {
-            return sysXzqh.getXzqhdm();
+            return sysXzqh.getXzqhdm().substring(0,6);
         }
 
 
diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java
index d71a761e..2ad36078 100644
--- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java
+++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java
@@ -12,14 +12,7 @@ import com.kms.common.utils.BaseEntityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
@@ -74,6 +67,9 @@ public class BsSgcJsjdWarnResultController extends BaseController
         return util.exportExcel(list, "result");
     }
 
+
+
+
     /**
      * 获取预警结果详细信息
      */
@@ -84,6 +80,21 @@ public class BsSgcJsjdWarnResultController extends BaseController
         return AjaxResult.success(bsSgcJsjdWarnResultService.getById(id));
     }
 
+    @GetMapping("distribution")
+    public AjaxResult getDistribution(@RequestParam String pageNum, @RequestParam String pageSize){
+        return AjaxResult.success(bsSgcJsjdWarnResultService.getDistribution(pageNum,pageSize));
+    }
+
+    @GetMapping("total")
+    public AjaxResult getTotal(){
+        return AjaxResult.success(bsSgcJsjdWarnResultService.getTotal());
+    }
+
+
+    @GetMapping("warnType")
+    public AjaxResult getPieChart(){
+        return AjaxResult.success(bsSgcJsjdWarnResultService.getPieChart());
+    }
     /**
      * 新增预警结果
      */
diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
index 1bc78375..7c40fc58 100644
--- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
+++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
@@ -1,5 +1,6 @@
 package com.kms.warn.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -63,4 +64,10 @@ public class BsSgcJsjdWarnResult extends BaseEntity
     @ApiModelProperty("预警类型 0预警 1提醒")
     private String alertType;
 
+    @TableField(exist = false)
+    private String projectName;
+
+    @TableField(exist = false)
+    private String adcd;
+
 }
diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java
index c06b6b77..4aeb175c 100644
--- a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java
+++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java
@@ -1,5 +1,6 @@
 package com.kms.warn.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.warn.domain.BsSgcJsjdWarnResult;
@@ -16,4 +17,16 @@ import java.util.Map;
 @Repository
 public interface BsSgcJsjdWarnResultMapper extends BaseMapper<BsSgcJsjdWarnResult> {
     List<Map<String,Integer>> selectWarnTypeNumber();
+
+    List<Map<String,String>> selectWarnAreaNum(@Param("pageNum") int pageNum,
+                                               @Param("pageSize") int pageSize);
+
+
+    Map<String,String> getTotal();
+
+    List<Map<String,String>>getPieChart();
+
+//    List<BsSgcJsjdWarnResult> selectList(@Param("pageNum")int pageNum,
+//                                         @Param("pageSize")int pageSize,
+//                                         @Param("projectName")String projectName);
 }
diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java
index 442ec4aa..1834fbe5 100644
--- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java
+++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java
@@ -1,9 +1,14 @@
 package com.kms.warn.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
@@ -26,13 +31,46 @@ public class BsSgcJsjdWarnResultService extends BaseService<BsSgcJsjdWarnResultM
     @Autowired
     private BsSgcJsjdWarnResultMapper  bsSgcJsjdWarnResultMapper;
 
+    @Autowired
+    private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper;
 
     public IPage selectPage(SearchParam<BsSgcJsjdWarnResult> sp) {
-        return bsSgcJsjdWarnResultMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()),
-                Wrappers.lambdaQuery(BsSgcJsjdWarnResult.class).
-                        eq(BsSgcJsjdWarnResult::getResultType, "2")
-                        .eq(BsSgcJsjdWarnResult::getProNo, sp.getData().getProNo()));
+        LambdaQueryWrapper<BsSgcJsjdWarnResult> queryWrapper = new LambdaQueryWrapper<BsSgcJsjdWarnResult>()
+                .eq(BsSgcJsjdWarnResult::getResultType, "2");
+
+// 检查 proNo 是否为空，如果不为空则添加条件
+        String proNo = sp.getData().getProNo();
+        if (StringUtils.isNotBlank(proNo)) {
+            queryWrapper.eq(BsSgcJsjdWarnResult::getProNo, proNo);
+        }
+
+// 检查 projectName 是否为空，如果不为空则添加模糊查询条件
+        String projectName = sp.getData().getProjectName();
+        if (StringUtils.isNotBlank(projectName)) {
+            queryWrapper.apply("exists (select 1 from bs_sgc_jsjd_bui_pro_info where pro_no = bs_sgc_jsjd_warn_result.pro_no and project_name like concat('%', {0}, '%'))", projectName);
+        }
+
+// 分页查询
+        Page<BsSgcJsjdWarnResult> bsSgcJsjdWarnResultPage = bsSgcJsjdWarnResultMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), queryWrapper);
+        List<BsSgcJsjdWarnResult> records = bsSgcJsjdWarnResultPage.getRecords();
 
+// 查询关联表信息并设置到结果中
+        for (BsSgcJsjdWarnResult bsSgcJsjdWarnResult : records) {
+            BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo = bsSgcjsjdBuiProInfoMapper
+                    .selectOne(new LambdaQueryWrapper<BsSgcjsjdBuiProInfo>().eq(BsSgcjsjdBuiProInfo::getProNo, bsSgcJsjdWarnResult.getProNo()));
+            bsSgcJsjdWarnResult.setProjectName(bsSgcjsjdBuiProInfo.getProjectName());
+            bsSgcJsjdWarnResult.setAdcd(bsSgcjsjdBuiProInfo.getAdcd());
+        }
+
+        bsSgcJsjdWarnResultPage.setRecords(records);
+
+        return bsSgcJsjdWarnResultPage;
+    }
+
+
+    public List<Map<String, String>>getDistribution(String pageNum,String pageSize){
+        List<Map<String, String>> maps = bsSgcJsjdWarnResultMapper.selectWarnAreaNum(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return maps;
     }
 
     public List<Map<String,Integer>>getWarnTypeNumber(){
@@ -42,4 +80,13 @@ public class BsSgcJsjdWarnResultService extends BaseService<BsSgcJsjdWarnResultM
         return maps;
     }
 
+
+    public Map<String,String>getTotal(){
+            return  bsSgcJsjdWarnResultMapper.getTotal();
+    }
+
+    public List<Map<String,String>>getPieChart(){
+         return bsSgcJsjdWarnResultMapper.getPieChart();
+    }
+
 }
diff --git a/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdWarnResultMapper.xml b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdWarnResultMapper.xml
index f1d2bd4f..afd187ac 100644
--- a/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdWarnResultMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdWarnResultMapper.xml
@@ -9,4 +9,61 @@
         group by warn_type order by number desc  limit 4;
     </select>
 
+
+    <select id="selectWarnAreaNum" resultType="java.util.Map">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        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
+        FROM
+            bs_sgc_jsjd_bui_pro_info pi
+                LEFT JOIN
+            bs_sgc_jsjd_warn_result wr
+            ON
+                pi.pro_no = wr.pro_no
+        GROUP BY
+            SUBSTRING(pi.adcd, 1, 4)
+        order by proInfoCount desc LIMIT #{pageNum},#{pageSize};
+    </select>
+
+
+    <select id="getTotal" resultType="java.util.Map">
+        select
+            COUNT(1) as total,
+            COUNT(CASE WHEN wr.is_handle = 0 THEN  wr.pro_no END ) as noHandleNum,
+            COUNT(CASE WHEN wr.is_handle = 1 THEN  wr.pro_no END ) as isHandleNum,
+            COUNT(CASE WHEN wr.alert_type = 0 THEN  wr.pro_no END ) as forewarningNum,
+            COUNT(CASE WHEN wr.alert_type = 1 THEN  wr.pro_no END ) as warnNum
+        FROM
+            bs_sgc_jsjd_warn_result wr
+    </select>
+
+    <select id="getPieChart" resultType="java.util.Map">
+        select
+            warn_type as warnType,
+            COUNT(1) as total
+        FROM
+            bs_sgc_jsjd_warn_result wr
+        group by warn_type
+    </select>
+
+<!--    <select id="selectList" resultType="BsSgcJsjdWarnResult">-->
+<!--        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>-->
+<!--        select-->
+<!--            pi.adcd,-->
+<!--            pi.project_name,-->
+<!--            wr.id,  wr.create_uid,  wr.update_uid,  wr.create_time,  wr.update_time,  wr.pro_code,-->
+<!--        wr.pro_no,  wr.ower_dept,  wr.remark,  wr.warn_type,  wr.warn_sub_type,  wr.result_type,  wr.warn_result,  wr.is_handle,  wr.alert_type-->
+<!--        from bs_sgc_jsjd_bui_pro_info pi-->
+<!--        left join bs_sgc_jsjd_warn_result wr on pi.PRO_NO =wr.pro_no-->
+<!--        <where>-->
+<!--            <if test="projectName != null and projectName != ''">-->
+<!--                pi.PROJECT_NAME like concat('%'+#{projectName}+'%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        LIMIT #{pageNum},#{pageSize};-->
+<!--    </select>-->
+
+
 </mapper>