From 11e073d7c3f97303cd2f74abee5e08761f05ae73 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Sun, 23 Mar 2025 04:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfBzhjsController.java | 5 ++++ .../df/controller/BsSgcDfDfrwController.java | 3 +++ .../df/controller/BsSgcDfFzrController.java | 5 ++++ .../kms/yg/df/mapper/BsSgcDfBzhjsMapper.java | 3 +++ .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 3 +++ .../yg/df/service/BsSgcDfBzhjsService.java | 15 +++++++++++ .../kms/yg/df/service/BsSgcDfFzrService.java | 13 ++++++++++ .../sz/controller/BsSgcSzBzhjsController.java | 6 +++++ .../sz/controller/BsSgcSzFzrController.java | 5 +++- .../kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java | 4 +++ .../kms/yg/sz/mapper/BsSgcSzFzrMapper.java | 3 +++ .../yg/sz/service/BsSgcSzBzhjsService.java | 15 +++++++++++ .../kms/yg/sz/service/BsSgcSzFzrService.java | 15 ++++++++++- .../mapper/yg/df/BsSgcDfBzhjsMapper.xml | 8 ++++++ .../mapper/yg/df/BsSgcDfFzrMapper.xml | 25 +++++++++++++++++++ .../mapper/yg/sz/BsSgcSzBzhjsMapper.xml | 8 ++++++ .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 24 ++++++++++++++++++ 17 files changed, 158 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java index fa9bdab0..4de8e0d4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java +++ b/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()); + } /** * 获取堤防标准化建设详细信息 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java index dfe3fdb3..5409b417 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java +++ b/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"); } + + /** * 获取水闸鉴定任务关联详细信息 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java index 97a569fa..e880b76f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java +++ b/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()); + } /** * 导出水闸负责人列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java index 1c9004f5..30ab9b50 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java +++ b/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 { @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); + + List>getBarChart(); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index cbc5a763..b5907245 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/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 { @Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("dikeName")String dikeName); + List> getPercent(); + List getType1(@Param("layer") Integer layer, @Param("adcd") String adcd); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index ef27faf2..9ec7b8ea 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/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> getBarChart(){ + Map>chart=new HashMap<>(); + List> barChart = bsSgcDfBzhjsMapper.getBarChart(); + for (Mapmap: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; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java index d672f51c..ebe78a5d 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java +++ b/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 return infoPage; } + public MapgetPercent(){ + MappercentMap=new HashMap<>(); + List> percent = bsSgcDfFzrMapper.getPercent(); + if (CollectionUtil.isNotEmpty(percent)) { + for (Map map : percent) { + percentMap.put((String) map.get("name"),(BigDecimal) map.get("score")); + } + } + return percentMap; + } + public IPage selectPage(SearchParam sp) { BsSgcDfFzr data = sp.getData(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java index 59e91b09..9e72bd43 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java +++ b/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()); + } /** * 导出水闸标准化建设列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java index 07d74c39..adae0dfa 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java +++ b/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()); + } /** * 查询水闸负责人列表 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java index 16842433..10a71cb7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java +++ b/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 { @Param("pageSize") int pageSize, @Param("wagaCode")String wagaCOde); + + List>getBarChart(); + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java index 048283d0..3c20e798 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java +++ b/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 { @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); + List>getPercent(); + List getType1(@Param("layer") Integer layer, @Param("adcd") String adcd); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java index e23b3257..6cd16918 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java +++ b/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> getBarChart(){ + Map>chart=new HashMap<>(); + List> barChart = bsSgcSzBzhjsMapper.getBarChart(); + for (Mapmap: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; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java index 0c411de3..a4e8f40a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java +++ b/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 } + + Map params = sp.getParams(); if (params!=null) { //create_time @@ -70,7 +74,16 @@ public class BsSgcSzFzrService extends BaseService return infoPage; } - + public MapgetPercent(){ + MappercentMap=new HashMap<>(); + List> percent = bsSgcSzFzrMapper.getPercent(); + if (CollectionUtil.isNotEmpty(percent)) { + for (Map map : percent) { + percentMap.put((String) map.get("name"), (BigDecimal) map.get("score")); + } + } + return percentMap; + } public IPage selectPage(SearchParam sp) { BsSgcSzFzr data = sp.getData(); diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml index dd6f02c6..8a09fd15 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -45,4 +45,12 @@ order by sf.create_time desc LIMIT #{pageNum},#{pageSize}; + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml index f93623b2..ca6f628e 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -76,6 +76,31 @@ order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index 3dd8b579..ebf663cc 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -76,6 +76,30 @@ order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + +