Browse Source

运管开发

master_tdsql
zhuyulei 1 year ago
parent
commit
5d5b376af6
  1. 30
      shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
  2. 15
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java
  3. 73
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  4. 40
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java
  5. 13
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/HistogramDto.java
  6. 14
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java
  7. 10
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java
  8. 12
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSafeJbxxMapper.java
  9. 9
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java
  10. 42
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  11. 52
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java
  12. 43
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java
  13. 63
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
  14. 72
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
  15. 90
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

30
shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java

@ -1,8 +1,11 @@
package com.kms.system.service; package com.kms.system.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh; import com.kms.system.domain.SysXzqh;
import com.kms.system.mapper.SysXzqhMapper; 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 com.shuili.common.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -21,6 +24,9 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
@Autowired @Autowired
private SysXzqhMapper sysXzqhMapper; private SysXzqhMapper sysXzqhMapper;
@Autowired
private SysDeptService sysDeptService;
public String getSubString(String adcd) { public String getSubString(String adcd) {
@ -44,5 +50,29 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
} }
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();
}
} }

15
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.BsSgcSzFzr;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.domain.dto.FzrDto; 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.kms.yg.sz.service.BsSgcSzFzrService;
import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.SearchParam;
@ -65,6 +66,20 @@ public class BsSgcSzFzrController extends BaseController
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@GetMapping("/getHistogram")
public HistogramDto getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HistogramDto dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
return dto;
}
/** /**
* 查询水闸负责人列表 * 查询水闸负责人列表

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

@ -1,7 +1,9 @@
package com.kms.yg.sz.controller; package com.kms.yg.sz.controller;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzBzbp;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; 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.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.SearchParam;
@ -51,8 +55,7 @@ import com.shuili.common.enums.BusinessType;
@RestController @RestController
@RequestMapping("/yg/jbxx") @RequestMapping("/yg/jbxx")
@Api(tags = "水闸安全管理基本信息") @Api(tags = "水闸安全管理基本信息")
public class BsSgcSzSafeJbxxController extends BaseController public class BsSgcSzSafeJbxxController extends BaseController {
{
@Autowired @Autowired
private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@ -62,18 +65,56 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Autowired @Autowired
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
List<PieDto> list = bsSgcSzSafeJbxxService.getPie(layer, xzqh);
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> 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") @PostMapping("/list")
@ApiOperation("水闸安全管理基本信息列表") @ApiOperation("水闸安全管理基本信息列表")
public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
{
BsSgcSzSafeJbxx data = sp.getData(); BsSgcSzSafeJbxx data = sp.getData();
Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) .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())) .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime)); .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
@ -87,9 +128,10 @@ public class BsSgcSzSafeJbxxController extends BaseController
Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) 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.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())) .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime)); .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
@ -103,8 +145,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Log(title = "水闸安全管理基本信息导出", businessType = BusinessType.EXPORT) @Log(title = "水闸安全管理基本信息导出", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ApiOperation("水闸安全管理基本信息导出") @ApiOperation("水闸安全管理基本信息导出")
public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) public AjaxResult export(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
{
List<BsSgcSzSafeJbxx> list = bsSgcSzSafeJbxxService.listByIds(bsSgcSzSafeJbxx.getIds()); List<BsSgcSzSafeJbxx> list = bsSgcSzSafeJbxxService.listByIds(bsSgcSzSafeJbxx.getIds());
ExcelUtil<BsSgcSzSafeJbxx> util = new ExcelUtil<>(BsSgcSzSafeJbxx.class); ExcelUtil<BsSgcSzSafeJbxx> util = new ExcelUtil<>(BsSgcSzSafeJbxx.class);
return util.exportExcel(list, "jbxx"); return util.exportExcel(list, "jbxx");
@ -115,8 +156,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
*/ */
@ApiOperation(" 水闸安全管理基本信息详情") @ApiOperation(" 水闸安全管理基本信息详情")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) public AjaxResult getInfo(@PathVariable("id") String id) {
{
return AjaxResult.success(bsSgcSzSafeJbxxService.getById(id)); return AjaxResult.success(bsSgcSzSafeJbxxService.getById(id));
} }
@ -126,8 +166,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
@Log(title = "水闸安全管理基本信息新增", businessType = BusinessType.INSERT) @Log(title = "水闸安全管理基本信息新增", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@ApiOperation("水闸安全管理基本信息新增") @ApiOperation("水闸安全管理基本信息新增")
public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) public AjaxResult add(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
{
BaseEntityUtils.preInsert(bsSgcSzSafeJbxx); BaseEntityUtils.preInsert(bsSgcSzSafeJbxx);
return toAjax(bsSgcSzSafeJbxxService.save(bsSgcSzSafeJbxx)); return toAjax(bsSgcSzSafeJbxxService.save(bsSgcSzSafeJbxx));
} }
@ -138,8 +177,7 @@ public class BsSgcSzSafeJbxxController extends BaseController
@ApiOperation("水闸安全管理基本信息修改") @ApiOperation("水闸安全管理基本信息修改")
@Log(title = "水闸安全管理基本信息修改", businessType = BusinessType.UPDATE) @Log(title = "水闸安全管理基本信息修改", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) {
{
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));
} }
@ -148,9 +186,8 @@ public class BsSgcSzSafeJbxxController extends BaseController
*/ */
@ApiOperation("水闸安全管理基本信息删除") @ApiOperation("水闸安全管理基本信息删除")
@Log(title = "水闸安全管理基本信息删除", businessType = BusinessType.DELETE) @Log(title = "水闸安全管理基本信息删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) public AjaxResult remove(@PathVariable String[] ids) {
{
return toAjax(bsSgcSzSafeJbxxService.removeByIds(Arrays.asList(ids))); return toAjax(bsSgcSzSafeJbxxService.removeByIds(Arrays.asList(ids)));
} }
} }

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

@ -1,8 +1,12 @@
package com.kms.yg.sz.controller; package com.kms.yg.sz.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; 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.controller.BaseController;
import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.utils.poi.ExcelUtil; import com.shuili.common.utils.poi.ExcelUtil;
@ -52,6 +56,42 @@ public class BsSgcSzYhxxController extends BaseController
@Autowired @Autowired
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@GetMapping("/getHistogram")
public HashMap<String, HashMap<String,String>> getHistogram() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
HashMap<String, HashMap<String,String>> dto = bsSgcSzYhxxService.getHistogram(layer, xzqh);
return dto;
}
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
Integer layer = sysXzqhService.getLayer();
String xzqh = sysXzqhService.getXzqh();
List<PieDto> list = bsSgcSzYhxxService.getPie(layer, xzqh);
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> map = new HashMap<>();
for (PieDto pieDto : list) {
map.put(pieDto.getStatus(), pieDto.getNum());
}
listBy.add(map);
return listBy;
}
/** /**
* 查询水闸隐患信息列表 * 查询水闸隐患信息列表
*/ */

13
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<String, List<String>> map;
}

14
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;
}

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

@ -1,6 +1,7 @@
package com.kms.yg.sz.mapper; package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzFzr;
import com.kms.yg.sz.domain.dto.PieDto;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -23,4 +24,13 @@ public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
List<PieDto> getType1(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getType2(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getType3(@Param("layer") Integer layer,
@Param("adcd") String adcd);
} }

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

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper; package com.kms.yg.sz.mapper;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; 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 org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/** /**
* 水闸安全管理基本信息Mapper接口 * 水闸安全管理基本信息Mapper接口
@ -14,4 +18,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Repository @Repository
public interface BsSgcSzSafeJbxxMapper extends BaseMapper<BsSgcSzSafeJbxx> { public interface BsSgcSzSafeJbxxMapper extends BaseMapper<BsSgcSzSafeJbxx> {
List<PieDto> getPie(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getNo(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getFin(@Param("layer") Integer layer,
@Param("adcd") String adcd);
} }

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

@ -1,9 +1,13 @@
package com.kms.yg.sz.mapper; 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 org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.BsSgcSzYhxx;
import java.util.List;
/** /**
* 水闸隐患信息Mapper接口 * 水闸隐患信息Mapper接口
* *
@ -13,4 +17,9 @@ import com.kms.yg.sz.domain.BsSgcSzYhxx;
@Repository @Repository
public interface BsSgcSzYhxxMapper extends BaseMapper<BsSgcSzYhxx> { public interface BsSgcSzYhxxMapper extends BaseMapper<BsSgcSzYhxx> {
List<PieDto> getPie(@Param("layer") Integer layer,
@Param("adcd") String adcd);
List<PieDto> getHistogram(@Param("layer") Integer layer,
@Param("adcd") String xzqh);
} }

42
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.BsSgcSzFxzz;
import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzFzr;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; 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.BsSgcSzFxzzMapper;
import com.kms.yg.sz.mapper.BsSgcSzFzrMapper; import com.kms.yg.sz.mapper.BsSgcSzFzrMapper;
import com.shuili.common.core.domain.SearchParam; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -88,4 +92,42 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
return page; return page;
} }
public HistogramDto getHistogram(Integer layer, String xzqh) {
//获取政府责任人
List<PieDto> listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh));
//获取主管部门责任人
List<PieDto> listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh));
//获取管理单位责任人
List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh));
HistogramDto dto = new HistogramDto();
HashMap<String, List<String>> map = new HashMap<>();
for (PieDto pieDto : listType1) {
ArrayList<String> 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;
}
} }

52
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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.BsSgcSzBzbp;
import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzGcda;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; 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.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService; import com.shuili.common.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -23,11 +29,14 @@ import java.util.Map;
* @date 2024-01-16 * @date 2024-01-16
*/ */
@Service @Service
public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx>{ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx> {
@Resource @Resource
private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper; private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
@Autowired
private SysXzqhService sysXzqhService;
public IPage selectPage(SearchParam<BsSgcSzSafeJbxx> sp, String adcd) { public IPage selectPage(SearchParam<BsSgcSzSafeJbxx> sp, String adcd) {
@ -38,16 +47,16 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
String projectName = projectInfo.getWagaName(); String projectName = projectInfo.getWagaName();
String projectType = projectInfo.getWagaType(); String projectType = projectInfo.getWagaType();
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId()); queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
queryWrapper.like(projectName != null, "waga_name", projectName); queryWrapper.like(projectName != null, "waga_name", projectName);
queryWrapper.like(projectType != null && projectType!="", "waga_type", projectType); queryWrapper.like(projectType != null && projectType != "", "waga_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd); queryWrapper.likeRight(adcd != null, "ADCD", adcd);
} }
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
if (params!=null) { if (params != null) {
//create_time //create_time
if (params.get("orderBy") != null) { if (params.get("orderBy") != null) {
String orderBy = (String) params.get("orderBy"); String orderBy = (String) params.get("orderBy");
@ -56,9 +65,42 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
} }
Page<BsSgcSzSafeJbxx> page = new Page<>(sp.getPageNum(),sp.getPageSize()); Page<BsSgcSzSafeJbxx> page = new Page<>(sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzSafeJbxx> infoPage = bsSgcSzSafeJbxxMapper.selectPage(page, queryWrapper); Page<BsSgcSzSafeJbxx> infoPage = bsSgcSzSafeJbxxMapper.selectPage(page, queryWrapper);
return infoPage; return infoPage;
} }
public List<PieDto> getPie(Integer layer, String xzqh) {
return bsSgcSzSafeJbxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh));
}
public HistogramDto getHistogram(Integer layer, String xzqh) {
//获取未登记的
List<PieDto> listNo = bsSgcSzSafeJbxxMapper.getNo(layer, sysXzqhService.getSubString(xzqh));
//获取已登记的
List<PieDto> listFin = bsSgcSzSafeJbxxMapper.getFin(layer, sysXzqhService.getSubString(xzqh));
HistogramDto dto = new HistogramDto();
HashMap<String, List<String>> map = new HashMap<>();
for (PieDto pieDto : listNo) {
ArrayList<String> 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;
}
} }

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

@ -1,9 +1,18 @@
package com.kms.yg.sz.service; 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.shuili.common.core.service.BaseService;
import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper; import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper;
import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.BsSgcSzYhxx;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/** /**
* 水闸隐患信息Service接口 * 水闸隐患信息Service接口
* *
@ -11,6 +20,38 @@ import org.springframework.stereotype.Service;
* @date 2024-01-16 * @date 2024-01-16
*/ */
@Service @Service
public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYhxx>{ public class BsSgcSzYhxxService extends BaseService<BsSgcSzYhxxMapper, BsSgcSzYhxx> {
@Autowired
private BsSgcSzYhxxMapper bsSgcSzYhxxMapper;
@Autowired
private SysXzqhService sysXzqhService;
public List<PieDto> getPie(Integer layer, String xzqh) {
return bsSgcSzYhxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh));
}
public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
List<PieDto> list = bsSgcSzYhxxMapper.getHistogram(layer, xzqh);
HistogramDto dto = new HistogramDto();
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < list.size(); i++) {
HashMap<String, String> 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;
}
} }

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

@ -12,6 +12,21 @@
</sql> </sql>
<sql id="getHistogram">
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
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="name" column="name"/>
<result property="num" column="num"/>
</resultMap>
<resultMap type="BsSgcSzFzr" id="BsSgcSzFzr"> <resultMap type="BsSgcSzFzr" id="BsSgcSzFzr">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="wagaName" column="waga_name"/> <result property="wagaName" column="waga_name"/>
@ -54,4 +69,52 @@
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select> </select>
<select id="getType1" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='0'
</if>
</select>
<select id="getType2" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='1' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='1'
</if>
</select>
<select id="getType3" resultMap="pieDto">
<include refid="getHistogram"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sf.type='2' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sf.type='2'
</if>
</select>
</mapper> </mapper>

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

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper">
<sql id="info">
select sx.name,
count(1) num
from bs_sgc_sz_safe_jbxx sj
left join sys_xzqh sx on sj.adcd=sx.xzqhdm
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="name" column="name"/>
<result property="num" column="num"/>
</resultMap>
<select id="getPie" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd}
</if>
</select>
<select id="getNo" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status='0'
</if>
</select>
<select id="getFin" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if>
</select>
</mapper>

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

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzYhxxMapper">
<sql id="info">
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
</sql>
<resultMap type="pieDto" id="pieDto">
<result property="status" column="status"/>
<result property="num" column="num"/>
</resultMap>
<select id="getPie" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sy.`status`
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sy.`status`
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} GROUP BY sy.`status`
</if>
</select>
<select id="getNo" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd}
</if>
</select>
<select id="getFin" resultMap="pieDto">
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if>
</select>
<select id="getHistogram" resultMap="pieDto">
select * from (
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd
</if>
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if> ) t GROUP BY t.`status`
</select>
</mapper>
Loading…
Cancel
Save