diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java index 33badfa0..cb9a04c6 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -1,8 +1,11 @@ package com.kms.system.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.mapper.SysXzqhMapper; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +24,9 @@ public class SysXzqhService extends BaseService { @Autowired private SysXzqhMapper sysXzqhMapper; + @Autowired + private SysDeptService sysDeptService; + public String getSubString(String adcd) { @@ -44,5 +50,29 @@ public class SysXzqhService extends BaseService { } + public Integer getLayer() { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + + SysDept sysDept = sysDeptService.getById(deptId); + + SysXzqh sysXzqh = sysXzqhMapper.selectById(sysDept.getXzqhId()); + + return sysXzqh.getLayer(); + + } + + public String getXzqh() { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + + SysDept sysDept = sysDeptService.getById(deptId); + + SysXzqh sysXzqh = sysXzqhMapper.selectById(sysDept.getXzqhId()); + + return sysXzqh.getXzqhdm(); + } + + } 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 a436a30e..68ae3714 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 @@ -14,6 +14,7 @@ import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.dto.FzrDto; +import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.service.BsSgcSzFzrService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; @@ -65,6 +66,20 @@ public class BsSgcSzFzrController extends BaseController private SysDeptService sysDeptService; + @GetMapping("/getHistogram") + public HistogramDto getHistogram() { + Integer layer = sysXzqhService.getLayer(); + + String xzqh = sysXzqhService.getXzqh(); + + HistogramDto dto = bsSgcSzFzrService.getHistogram(layer, xzqh); + + + return dto; + + } + + /** * 查询水闸负责人列表 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 0652e327..e4036113 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -1,7 +1,9 @@ package com.kms.yg.sz.controller; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -13,6 +15,8 @@ import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; @@ -51,8 +55,7 @@ import com.shuili.common.enums.BusinessType; @RestController @RequestMapping("/yg/jbxx") @Api(tags = "水闸安全管理基本信息") -public class BsSgcSzSafeJbxxController extends BaseController -{ +public class BsSgcSzSafeJbxxController extends BaseController { @Autowired private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; @@ -62,18 +65,56 @@ public class BsSgcSzSafeJbxxController extends BaseController @Autowired private SysDeptService sysDeptService; + + @GetMapping("/getPie") + public List> getPie() { + + Integer layer = sysXzqhService.getLayer(); + + String xzqh = sysXzqhService.getXzqh(); + + + List list = bsSgcSzSafeJbxxService.getPie(layer, xzqh); + + + List> listBy = new ArrayList<>(); + HashMap map = new HashMap<>(); + for (PieDto pieDto : list) { + + map.put(pieDto.getName(), pieDto.getNum()); + + } + listBy.add(map); + return listBy; + + + } + + @GetMapping("/getHistogram") + public HistogramDto getHistogram() { + Integer layer = sysXzqhService.getLayer(); + + String xzqh = sysXzqhService.getXzqh(); + + HistogramDto dto = bsSgcSzSafeJbxxService.getHistogram(layer, xzqh); + + + return dto; + + } + + /** * 查询水闸安全管理基本信息列表 */ @PostMapping("/list") @ApiOperation("水闸安全管理基本信息列表") - public IPage list(@RequestBody SearchParam sp) - { + public IPage list(@RequestBody SearchParam sp) { BsSgcSzSafeJbxx data = sp.getData(); Page page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) - .eq(data.getStatus()!=null,BsSgcSzSafeJbxx::getStatus,data.getStatus()) + .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd())) .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)); @@ -87,9 +128,10 @@ public class BsSgcSzSafeJbxxController extends BaseController Page page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) - .eq(BsSgcSzSafeJbxx::getStatus,"1").or().eq(BsSgcSzSafeJbxx::getStatus,"4") + .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0") + .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0") .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) - .eq(data.getStatus()!=null,BsSgcSzSafeJbxx::getStatus,data.getStatus()) + .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd())) .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)); @@ -103,8 +145,7 @@ public class BsSgcSzSafeJbxxController extends BaseController @Log(title = "水闸安全管理基本信息导出", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("水闸安全管理基本信息导出") - public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) - { + public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) { List list = bsSgcSzSafeJbxxService.listByIds(bsSgcSzSafeJbxx.getIds()); ExcelUtil util = new ExcelUtil<>(BsSgcSzSafeJbxx.class); return util.exportExcel(list, "jbxx"); @@ -115,8 +156,7 @@ public class BsSgcSzSafeJbxxController extends BaseController */ @ApiOperation(" 水闸安全管理基本信息详情") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(bsSgcSzSafeJbxxService.getById(id)); } @@ -126,8 +166,7 @@ public class BsSgcSzSafeJbxxController extends BaseController @Log(title = "水闸安全管理基本信息新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("水闸安全管理基本信息新增") - public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) - { + public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) { BaseEntityUtils.preInsert(bsSgcSzSafeJbxx); return toAjax(bsSgcSzSafeJbxxService.save(bsSgcSzSafeJbxx)); } @@ -138,8 +177,7 @@ public class BsSgcSzSafeJbxxController extends BaseController @ApiOperation("水闸安全管理基本信息修改") @Log(title = "水闸安全管理基本信息修改", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) - { + public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) { return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } @@ -148,9 +186,8 @@ public class BsSgcSzSafeJbxxController extends BaseController */ @ApiOperation("水闸安全管理基本信息删除") @Log(title = "水闸安全管理基本信息删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { return toAjax(bsSgcSzSafeJbxxService.removeByIds(Arrays.asList(ids))); } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java index 4446eb83..824c7c92 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java @@ -1,8 +1,12 @@ package com.kms.yg.sz.controller; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -52,6 +56,42 @@ public class BsSgcSzYhxxController extends BaseController @Autowired private SysDeptService sysDeptService; + + @GetMapping("/getHistogram") + public HashMap> getHistogram() { + Integer layer = sysXzqhService.getLayer(); + + String xzqh = sysXzqhService.getXzqh(); + + HashMap> dto = bsSgcSzYhxxService.getHistogram(layer, xzqh); + + + return dto; + + } + + + @GetMapping("/getPie") + public List> getPie() { + + Integer layer = sysXzqhService.getLayer(); + + String xzqh = sysXzqhService.getXzqh(); + + List list = bsSgcSzYhxxService.getPie(layer, xzqh); + + List> listBy = new ArrayList<>(); + HashMap map = new HashMap<>(); + for (PieDto pieDto : list) { + + map.put(pieDto.getStatus(), pieDto.getNum()); + + } + listBy.add(map); + return listBy; + + } + /** * 查询水闸隐患信息列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java new file mode 100644 index 00000000..591f0d35 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java @@ -0,0 +1,13 @@ +package com.kms.yg.sz.domain.dto; + +import lombok.Data; + +import java.util.HashMap; +import java.util.List; + +@Data +public class HistogramDto { + + private HashMap> map; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java new file mode 100644 index 00000000..1cd6c405 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java @@ -0,0 +1,14 @@ +package com.kms.yg.sz.domain.dto; + + +import lombok.Data; + +@Data +public class PieDto { + + private String name; + + private String num; + + private String status; +} 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 99df06f4..9e032a73 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 @@ -1,6 +1,7 @@ package com.kms.yg.sz.mapper; import com.kms.yg.sz.domain.BsSgcSzFzr; +import com.kms.yg.sz.domain.dto.PieDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,4 +24,13 @@ public interface BsSgcSzFzrMapper extends BaseMapper { @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); + + List getType1(@Param("layer") Integer layer, + @Param("adcd") String adcd); + + List getType2(@Param("layer") Integer layer, + @Param("adcd") String adcd); + + List getType3(@Param("layer") Integer layer, + @Param("adcd") String adcd); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java index 883e21d7..6695fa9f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.sz.mapper; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.dto.PieDto; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * 水闸安全管理基本信息Mapper接口 @@ -14,4 +18,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Repository public interface BsSgcSzSafeJbxxMapper extends BaseMapper { + List getPie(@Param("layer") Integer layer, + @Param("adcd") String adcd); + + List getNo(@Param("layer") Integer layer, + @Param("adcd") String adcd); + + List getFin(@Param("layer") Integer layer, + @Param("adcd") String adcd); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java index bd0703b7..d0c44c87 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.sz.mapper; +import com.kms.yg.sz.domain.dto.PieDto; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzYhxx; +import java.util.List; + /** * 水闸隐患信息Mapper接口 * @@ -13,4 +17,9 @@ import com.kms.yg.sz.domain.BsSgcSzYhxx; @Repository public interface BsSgcSzYhxxMapper extends BaseMapper { + List getPie(@Param("layer") Integer layer, + @Param("adcd") String adcd); + + List getHistogram(@Param("layer") Integer layer, + @Param("adcd") String xzqh); } 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 58d2e4e7..67ee1c69 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 @@ -7,6 +7,8 @@ import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzFxzz; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; import com.kms.yg.sz.mapper.BsSgcSzFzrMapper; import com.shuili.common.core.domain.SearchParam; @@ -14,6 +16,8 @@ import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -88,4 +92,42 @@ public class BsSgcSzFzrService extends BaseService return page; } + + public HistogramDto getHistogram(Integer layer, String xzqh) { + //获取政府责任人 + List listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh)); + + //获取主管部门责任人 + List listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh)); + + //获取管理单位责任人 + List listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh)); + + HistogramDto dto = new HistogramDto(); + + HashMap> map = new HashMap<>(); + + for (PieDto pieDto : listType1) { + ArrayList list = new ArrayList<>(); + list.add(pieDto.getNum()); + + for (PieDto p : listType2) { + if (p.getName().equals(pieDto.getName())) { + list.add(p.getNum()); + } + } + for (PieDto p2 : listType3) { + if (p2.getName().equals(pieDto.getName())) { + list.add(p2.getNum()); + } + } + + map.put(pieDto.getName(), list); + } + + dto.setMap(map); + + return dto; + + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java index 3d264ccb..ff0317e6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java @@ -3,15 +3,21 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,11 +29,14 @@ import java.util.Map; * @date 2024-01-16 */ @Service -public class BsSgcSzSafeJbxxService extends BaseService{ +public class BsSgcSzSafeJbxxService extends BaseService { @Resource private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper; + @Autowired + private SysXzqhService sysXzqhService; + public IPage selectPage(SearchParam sp, String adcd) { @@ -38,16 +47,16 @@ public class BsSgcSzSafeJbxxService extends BaseService params = sp.getParams(); - if (params!=null) { + if (params != null) { //create_time if (params.get("orderBy") != null) { String orderBy = (String) params.get("orderBy"); @@ -56,9 +65,42 @@ public class BsSgcSzSafeJbxxService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); Page infoPage = bsSgcSzSafeJbxxMapper.selectPage(page, queryWrapper); return infoPage; } + public List getPie(Integer layer, String xzqh) { + return bsSgcSzSafeJbxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh)); + } + + public HistogramDto getHistogram(Integer layer, String xzqh) { + + //获取未登记的 + List listNo = bsSgcSzSafeJbxxMapper.getNo(layer, sysXzqhService.getSubString(xzqh)); + + //获取已登记的 + List listFin = bsSgcSzSafeJbxxMapper.getFin(layer, sysXzqhService.getSubString(xzqh)); + + HistogramDto dto = new HistogramDto(); + + HashMap> map = new HashMap<>(); + + for (PieDto pieDto : listNo) { + ArrayList list = new ArrayList<>(); + list.add(pieDto.getNum()); + for (PieDto p : listFin) { + if (p.getName().equals(pieDto.getName())) { + list.add(p.getNum()); + } + } + + map.put(pieDto.getName(), list); + } + + dto.setMap(map); + + return dto; + + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java index 94925d05..592c9fcf 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java @@ -1,9 +1,18 @@ package com.kms.yg.sz.service; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper; import com.kms.yg.sz.domain.BsSgcSzYhxx; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** * 水闸隐患信息Service接口 * @@ -11,6 +20,38 @@ import org.springframework.stereotype.Service; * @date 2024-01-16 */ @Service -public class BsSgcSzYhxxService extends BaseService{ +public class BsSgcSzYhxxService extends BaseService { + + @Autowired + private BsSgcSzYhxxMapper bsSgcSzYhxxMapper; + + @Autowired + private SysXzqhService sysXzqhService; + + public List getPie(Integer layer, String xzqh) { + return bsSgcSzYhxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh)); + + } + + public HashMap> getHistogram(Integer layer, String xzqh) { + List list = bsSgcSzYhxxMapper.getHistogram(layer, xzqh); + + HistogramDto dto = new HistogramDto(); + HashMap> map = new HashMap<>(); + + for (int i = 0; i < list.size(); i++) { + HashMap hashMap = new HashMap<>(); + hashMap.put(list.get(i).getStatus(), list.get(i).getNum()); + for (int j = 0; j < list.size(); j++) { + if (list.get(j).getName().equals(list.get(i).getName()) && !list.get(j).getStatus().equals(list.get(i).getStatus())) { + hashMap.put(list.get(j).getStatus(), list.get(j).getNum()); + } + } + map.put(list.get(i).getName(), hashMap); + + + } + return map; + } } 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 9d74ad36..742e1592 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -12,6 +12,21 @@ + + select sx.name, + count(1) num + from bs_sgc_sz_fzr sf + left join bs_sgc_sz_safe_jbxx sj on sf.waga_id = sj.id + left join sys_xzqh sx on sj.adcd=sx.xzqhdm + + + + + + + + + @@ -54,4 +69,52 @@ order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml new file mode 100644 index 00000000..de94c6f6 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml @@ -0,0 +1,72 @@ + + + + + + select sx.name, + count(1) num + from bs_sgc_sz_safe_jbxx sj + left join sys_xzqh sx on sj.adcd=sx.xzqhdm + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml new file mode 100644 index 00000000..95b419ef --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml @@ -0,0 +1,90 @@ + + + + + + select sy.`status`, + count(1) num + from bs_sgc_sz_yhxx sy + left join bs_sgc_sz_safe_jbxx sj on sj.id=sy.waga_id + left join sys_xzqh sx on sj.adcd=sx.xzqhdm + + + + + + + + + + + + + + + + + + + + +