Merge branch 'refs/heads/master' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java

@@ -57,6 +57,11 @@ public class BsSgcDfBzhjsController extends BaseController
         return util.exportExcel(list, "bzhjs");
     }
 
+
+    @GetMapping("chart")
+    public AjaxResult getChart(){
+        return AjaxResult.success(bsSgcDfBzhjsService.getBarChart());
+    }
     /**
      * 获取堤防标准化建设详细信息
      */

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java

@@ -51,6 +51,7 @@ public class BsSgcDfDfrwController extends BaseController
         return bsSgcSzSzrwService.selectPage(sp);
     }
 
+
     /**
      * 导出水闸鉴定任务关联列表
      */
@@ -64,6 +65,8 @@ public class BsSgcDfDfrwController extends BaseController
         return util.exportExcel(list, "szrw");
     }
 
+
+
     /**
      * 获取水闸鉴定任务关联详细信息
      */

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java

@@ -81,6 +81,11 @@ public class BsSgcDfFzrController extends BaseController {
         return bsSgcSzFzrService.selectPage(sp);
     }
 
+
+    @GetMapping("/percent")
+    public AjaxResult getPercent(){
+        return AjaxResult.success(bsSgcSzFzrService.getPercent());
+    }
     /**
      * 导出水闸负责人列表
      */

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 堤防标准化建设Mapper接口
@@ -26,4 +27,6 @@ public interface BsSgcDfBzhjsMapper extends BaseMapper<BsSgcDfBzhjs> {
                               @Param("pageNum") int pageNum,
                               @Param("pageSize") int pageSize);
 
+
+    List<Map<String,Object>>getBarChart();
 }

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -42,6 +43,8 @@ public interface BsSgcDfFzrMapper extends BaseMapper<BsSgcDfFzr> {
                              @Param("pageNum") int pageNum,
                              @Param("pageSize") int pageSize,
                              @Param("dikeName")String dikeName);
+    List<Map<String,Object>> getPercent();
+
 
     List<PieDto> getType1(@Param("layer") Integer layer,
                           @Param("adcd") String adcd);

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java

@@ -10,7 +10,9 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 堤防标准化建设Service接口
@@ -46,4 +48,17 @@ public class BsSgcDfBzhjsService extends BaseService<BsSgcDfBzhjsMapper, BsSgcDf
 
     }
 
+    public Map<String, Map<String,Long>> getBarChart(){
+        Map<String,Map<String,Long>>chart=new HashMap<>();
+        List<Map<String, Object>> barChart = bsSgcDfBzhjsMapper.getBarChart();
+        for (Map<String,Object>map:barChart){
+            if (!chart.containsKey((String) map.get("name"))) {
+                chart.put((String) map.get("name"), new HashMap<>());
+            }
+            chart.get((String) map.get("name")).put((String) map.get("type"), (Long) map.get("num"));
+        }
+
+        return chart;
+    }
+
 }

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java

@@ -1,5 +1,6 @@
 package com.kms.yg.df.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +15,7 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -72,6 +74,17 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
         return infoPage;
     }
 
+    public Map<String,BigDecimal>getPercent(){
+        Map<String,BigDecimal>percentMap=new HashMap<>();
+        List<Map<String, Object>> percent = bsSgcDfFzrMapper.getPercent();
+        if (CollectionUtil.isNotEmpty(percent)) {
+            for (Map<String, Object> map : percent) {
+                percentMap.put((String) map.get("name"),(BigDecimal) map.get("score"));
+            }
+        }
+        return percentMap;
+    }
+
 
     public IPage selectPage(SearchParam<BsSgcDfFzr> sp) {
         BsSgcDfFzr data = sp.getData();

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java

@@ -12,6 +12,7 @@ import com.shuili.common.enums.BusinessType;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +45,11 @@ public class BsSgcSzBzhjsController extends BaseController
         return bsSgcSzBzhjsService.selectPage(sp);
     }
 
+
+    @GetMapping("chart")
+    public AjaxResult getChart(){
+        return AjaxResult.success(bsSgcSzBzhjsService.getBarChart());
+    }
     /**
      * 导出水闸标准化建设列表
      */

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java

@@ -64,7 +64,10 @@ public class BsSgcSzFzrController extends BaseController
 
     }
 
-
+    @GetMapping("/percent")
+    public AjaxResult getPercent(){
+        return AjaxResult.success(bsSgcSzFzrService.getPercent());
+    }
 
     /**
      * 查询水闸负责人列表

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 水闸标准化建设Mapper接口
@@ -28,4 +29,7 @@ public interface BsSgcSzBzhjsMapper extends BaseMapper<BsSgcSzBzhjs> {
                               @Param("pageSize") int pageSize,
                               @Param("wagaCode")String wagaCOde);
 
+
+    List<Map<String,Object>>getBarChart();
+
 }

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -41,6 +42,8 @@ public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
                              @Param("pageNum") int pageNum,
                              @Param("pageSize") int pageSize);
 
+    List<Map<String,Object>>getPercent();
+
     List<PieDto> getType1(@Param("layer") Integer layer,
                           @Param("adcd") String adcd);
 

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java

@@ -11,7 +11,9 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 水闸标准化建设Service接口
@@ -45,4 +47,17 @@ public class BsSgcSzBzhjsService extends BaseService<BsSgcSzBzhjsMapper, BsSgcSz
 
     }
 
+    public Map<String,Map<String,Long>> getBarChart(){
+        Map<String,Map<String,Long>>chart=new HashMap<>();
+        List<Map<String, Object>> barChart = bsSgcSzBzhjsMapper.getBarChart();
+        for (Map<String,Object>map:barChart){
+            if (!chart.containsKey((String) map.get("name"))) {
+                chart.put((String) map.get("name"), new HashMap<>());
+            }
+            chart.get((String) map.get("name")).put((String) map.get("type"), (Long) map.get("num"));
+        }
+
+        return chart;
+    }
+
 }

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@@ -1,5 +1,6 @@
 package com.kms.yg.sz.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +14,7 @@ import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -55,6 +57,8 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
         }
 
 
+
+
         Map<String, Object> params = sp.getParams();
         if (params!=null) {
             //create_time
@@ -70,7 +74,16 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
 
         return infoPage;
     }
-
+    public Map<String, BigDecimal>getPercent(){
+        Map<String,BigDecimal>percentMap=new HashMap<>();
+        List<Map<String, Object>> percent = bsSgcSzFzrMapper.getPercent();
+        if (CollectionUtil.isNotEmpty(percent)) {
+            for (Map<String, Object> map : percent) {
+                percentMap.put((String) map.get("name"), (BigDecimal) map.get("score"));
+            }
+        }
+        return percentMap;
+    }
 
     public IPage selectPage(SearchParam<BsSgcSzFzr> sp) {
         BsSgcSzFzr data = sp.getData();

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml

@@ -45,4 +45,12 @@
         </where>
         order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
+
+    <select id="getBarChart" resultType="java.util.Map">
+        SELECT DIKE_TYPE as type, xzqh.NAME as name, COUNT(*) as num
+        FROM att_dike_base waga
+                 INNER JOIN bs_sgc_df_bzhjs sf ON sf.dike_CODE = waga.dike_CODE
+                 left join sys_xzqh xzqh on LEFT(waga.adcd,4)=LEFT(XZQHDM,4) and RIGHT(xzqh.XZQHDM,8)='00000000'
+        GROUP BY DIKE_TYPE, LEFT(adcd,4)
+    </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml

@@ -76,6 +76,31 @@
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
 
+    <select id="getPercent" resultType="java.util.Map">
+        SELECT
+            xzqh.NAME as name ,
+            SUM(score) AS score
+        FROM (
+                 SELECT
+                     db.adcd,
+                     db.dike_code,
+                     COUNT(DISTINCT person_responsible_type)*33.3 AS score
+                 FROM
+                     bs_sgc_df_fzr fzr
+                         LEFT JOIN
+                     att_dike_base db ON fzr.dike_code = db.dike_code
+                 WHERE
+                     fzr.type = '0'
+                 GROUP BY
+                     db.adcd, dike_code
+             ) AS subquery
+                 LEFT JOIN
+             sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000'
+        GROUP BY
+            xzqh.NAME;
+    </select>
+
+
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
         <if test="layer==5">

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml

@@ -47,4 +47,12 @@
         </where>
         order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
+
+    <select id="getBarChart" resultType="java.util.Map">
+        SELECT WAGA_TYPE as type, xzqh.NAME as name, COUNT(*) as num
+        FROM att_waga_base waga
+                 INNER JOIN bs_sgc_sz_bzhjs sf ON sf.waga_code = waga.WAGA_CODE
+                left join sys_xzqh xzqh on LEFT(waga.adcd,4)=LEFT(XZQHDM,4) and RIGHT(xzqh.XZQHDM,8)='00000000'
+        GROUP BY WAGA_TYPE, LEFT(adcd,4)
+    </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@@ -76,6 +76,30 @@
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
 
+    <select id="getPercent" resultType="java.util.Map">
+        SELECT
+            xzqh.NAME as name ,
+            SUM(score) AS score
+        FROM (
+                 SELECT
+                     db.adcd,
+                     db.WAGA_CODE,
+                     COUNT(DISTINCT person_responsible_type)*33.3 AS score
+                 FROM
+                     bs_sgc_sz_fzr fzr
+                         LEFT JOIN
+                    att_waga_base db ON fzr.waga_code = db.WAGA_CODE
+                 WHERE
+                     fzr.type = '0'
+                 GROUP BY
+                     db.adcd, fzr.waga_code
+             ) AS subquery
+                 LEFT JOIN
+             sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000'
+        GROUP BY
+            xzqh.NAME;
+    </select>
+
     <select id="getType1" resultMap="pieDto">
         <include refid="getHistogram"></include>
         <if test="layer==5">