diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java index da4918ae..4dec8ced 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java @@ -62,6 +62,11 @@ public class BsSgcDfAqrwController extends BaseController return AjaxResult.success(list); } + @GetMapping("/warn") + public AjaxResult getWarn(){ + return AjaxResult.success(bsSgcSzAqrwService.getWarnList()); + } + @GetMapping("/getList/{taskId}") public AjaxResult getList(@PathVariable String taskId) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java index f8e5f042..cb6fd5d6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Map; /** @@ -119,9 +120,79 @@ public class BsSgcDfBzbpController extends BaseController } return bsSgcDfBzbpService.selectPage(sp, adcd); } -// return bsSgcDfBzbpService.selectPage(sp); } + + @PostMapping("/statistics") + @ApiOperation("堤防标识标牌列表") + public Map getStatistics(@RequestBody SearchParam sp) + { + + BsSgcDfBzbp projectInfo = sp.getData(); + String adcd = null; + if (projectInfo != null) { + adcd = projectInfo.getAdcd(); + } + + SysUser sysUser = UserUtils.getUser(); + if (sysUser.getUserName().equals("admin")) { + if (projectInfo != null && projectInfo.getAdcd() != null) { + String infoAdcd = projectInfo.getAdcd(); + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer()==5) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + infoAdcd = xzqh.getXzqhdm(); + } + return bsSgcDfBzbpService.getStatistics(sp,infoAdcd); + }else { + return bsSgcDfBzbpService.getStatistics(sp,null); + } + + }else if (adcd == null) { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + SysXzqh xzqh = sysXzqhService.getById(xzqhId); + String substring = ""; + if (xzqh.getLayer()==5) { + substring = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + substring = xzqh.getXzqhdm().substring(0, 4); + + }else { + substring = xzqh.getXzqhdm(); + } + + return bsSgcDfBzbpService.getStatistics(sp,substring); + }else { + + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", adcd); + + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer()==5) { + adcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + adcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + adcd = xzqh.getXzqhdm(); + } + return bsSgcDfBzbpService.getStatistics(sp, adcd); + } + } + + /** * 导出堤防标识标牌列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java index 02cf9c39..f508f9c1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java @@ -1,5 +1,6 @@ package com.kms.yg.df.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.df.domain.BsSgcDfDagl; @@ -112,4 +113,15 @@ public class BsSgcDfJfglController extends BaseController { return AjaxResult.success(bsSgcDfDaglMapper.deleteById(ids)); } + + + @ApiOperation("经费管理删除") + @Log(title = "经费管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/all/{dikeCode}") + public AjaxResult removeAll(@PathVariable String dikeCode) + { + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + + return AjaxResult.success(bsSgcDfJfglService.remove(lw.eq(BsSgcDfJfgl::getDikeCode,dikeCode))); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java index 53cba1d6..2d48afe2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java @@ -107,4 +107,11 @@ public class BsSgcDfQqhj extends BaseEntity @TableField(exist = false) private String adcd; + + private String pointLatitudeLongitudeList; + private String lineLatitudeLongitudeList; + private String allLatitudeLongitudeList; + private String pointLatitudeLongitudeListV2; + private String lineLatitudeLongitudeListV2; + private String allLatitudeLongitudeListV2; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java index ea107c09..600e4f66 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqrwMapper.java @@ -1,6 +1,7 @@ package com.kms.yg.df.mapper; import com.kms.yg.df.domain.BsSgcDfAqrw; +import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.dto.NumDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -52,4 +53,7 @@ public interface BsSgcDfAqrwMapper extends BaseMapper { Map getStatistics(@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("adcd")String xzqh, @Param("layer")String layer); + + List getList(@Param("adcd")String xzqh, @Param("layer")String layer); + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java index 0e1b5d81..14e564f1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBzbp; import java.util.List; +import java.util.Map; /** * 堤防标识标牌Mapper接口 @@ -17,4 +18,5 @@ import java.util.List; public interface BsSgcDfBzbpMapper extends BaseMapper { List selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd); + List> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index 1fed75ea..3917750b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -6,16 +6,21 @@ 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.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfAqrw; import com.kms.yg.df.domain.BsSgcDfDfrw; import com.kms.yg.df.mapper.BsSgcDfAqrwMapper; import com.kms.yg.df.mapper.BsSgcDfDfrwMapper; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; +import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.dto.AqrwDto; import com.kms.yg.sz.domain.dto.NumDto; import com.shuili.common.core.domain.SearchParam; +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.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,6 +58,9 @@ public class BsSgcDfAqrwService extends BaseService sp, String adcd) { @@ -87,6 +95,19 @@ public class BsSgcDfAqrwService extends BaseServicegetWarnList(){ + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + SysXzqh xzqh = sysXzqhService.getById(xzqhId); + Integer layer =xzqh.getLayer(); + List list = bsSgcDfAqrwMapper.getList(xzqh.getXzqhdm(), String.valueOf(layer)); + return list; + + } + + public void saveOther(BsSgcDfAqrw bsSgcDfAqrw) { //获取水闸ids String[] sluiceIds = bsSgcDfAqrw.getDikeCodes(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java index 07356fbb..384449ec 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -10,6 +10,7 @@ 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; @@ -61,4 +62,17 @@ public class BsSgcDfBzbpService extends BaseServicegetStatistics(SearchParam sp, String adcd){ + BsSgcDfBzbp projectInfo = sp.getData(); + + List> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd); + Mapmap=new HashMap<>(); + for ( MapintegerMap:statistics){ + map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num"))); + } + + return map; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java index 268a949b..04477af6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java @@ -188,6 +188,11 @@ public class BsSgcSzAqrwController extends BaseController return AjaxResult.success(); } + @GetMapping("/warn") + public AjaxResult getWarn(){ + return AjaxResult.success(bsSgcSzAqrwService.getWarnList()); + } + /** * 删除水闸安全鉴定任务信息 */ diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java index f2e6766e..d1c1f042 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -131,6 +132,71 @@ public class BsSgcSzBzbpController extends BaseController } } + @PostMapping("/statistics") + @ApiOperation("水闸标识标牌列表") + public Map getStatistics(@RequestBody SearchParam sp) + { + BsSgcSzBzbp projectInfo = sp.getData(); + String adcd = null; + if (projectInfo != null) { + adcd = projectInfo.getAdcd(); + } + + SysUser sysUser = UserUtils.getUser(); + if (sysUser.getUserName().equals("admin")) { + if (projectInfo != null && projectInfo.getAdcd() != null) { + String infoAdcd = projectInfo.getAdcd(); + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer()==5) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + infoAdcd = xzqh.getXzqhdm(); + } + return bsSgcSzBzbpService.getStatistics(sp,infoAdcd); + }else { + return bsSgcSzBzbpService.getStatistics(sp,null); + } + + }else if (adcd == null) { + SysUser user = UserUtils.getUser(); + SysDept dept = user.getDept(); + SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId()); + String substring = ""; + if (xzqh.getLayer()==5) { + substring = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + substring = xzqh.getXzqhdm().substring(0, 4); + + }else { + substring = xzqh.getXzqhdm(); + } + + return bsSgcSzBzbpService.getStatistics(sp,substring); + }else { + + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", adcd); + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer()==5) { + adcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer()==4) { + adcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + adcd = xzqh.getXzqhdm(); + } + return bsSgcSzBzbpService.getStatistics(sp, adcd); + } + } + /** * 导出水闸标识标牌列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java index 1ad76499..149a2979 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java @@ -1,6 +1,7 @@ package com.kms.yg.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.BaseEntityUtils; @@ -77,7 +78,20 @@ public class BsSgcSzGctxController extends BaseController @GetMapping(value = "/{wagaCode}") public AjaxResult getInfo(@PathVariable("wagaCode") String wagaCode) { - return AjaxResult.success(bsSgcSzGctxService.getById(wagaCode)); + BsSgcSzGctx byId = bsSgcSzGctxService.getById(wagaCode); + if (ObjectUtils.isNotEmpty(byId)) { + return AjaxResult.success(byId); + }else { + BsSgcSzGctx bsSgcSzGctx=new BsSgcSzGctx(); + bsSgcSzGctx.setId(wagaCode); + bsSgcSzGctx.setWagaCode(wagaCode); + boolean save = bsSgcSzGctxService.save(bsSgcSzGctx); + if (save){ + byId = bsSgcSzGctxService.getById(wagaCode); + return AjaxResult.success(byId); + } + } + return AjaxResult.error(); } /** @@ -108,8 +122,8 @@ public class BsSgcSzGctxController extends BaseController String id = bsSgcSzGctx.getId(); BsSgcSzGctx dfhdm = bsSgcSzGctxService.getById(id); dfhdm.setExprDate(new Date()); - dfhdm.setId(UUID.randomUUID().toString()); - bsSgcSzGctxService.save(dfhdm); +// dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGctxService.saveOrUpdate(dfhdm); bsSgcSzGctx.setEffDate(new Date()); bsSgcSzGctx.setExprDate(null); return toAjax(bsSgcSzGctxService.updateById(bsSgcSzGctx)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java index ece8a12b..d5bfa3fb 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java @@ -1,5 +1,6 @@ package com.kms.yg.sz.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sz.domain.BsSgcSzJfgl; @@ -107,4 +108,14 @@ public class BsSgcSzJfglController extends BaseController { return toAjax(bsSgcSzJfglService.removeByIds(Arrays.asList(ids))); } + + + @ApiOperation("经费管理删除") + @Log(title = "经费管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/all/{wagaCode}") + public AjaxResult removeBySzId(@PathVariable String wagaCode) + { + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + return toAjax(bsSgcSzJfglService.remove(lw.eq(BsSgcSzJfgl::getWagaCode,wagaCode))); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzManateamController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzManateamController.java new file mode 100644 index 00000000..be24151f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzManateamController.java @@ -0,0 +1,115 @@ +package com.kms.yg.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +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 com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; +import com.kms.yg.sz.domain.BsSgcSzManateam; +import com.kms.yg.sz.service.BsSgcSzManateamService; + + +/** + * 水闸管理团队管理Controller + * + * @author kms + * @date 2025-03-18 + */ +@RestController +@RequestMapping("/sz/manateam") +@Api(tags = "水闸管理团队管理") +public class BsSgcSzManateamController extends BaseController +{ + @Autowired + private BsSgcSzManateamService bsSgcSzManateamService; + + + /** + * 查询水闸管理团队管理列表 + */ + @PostMapping("/list") + @ApiOperation("水闸管理团队管理列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzManateamService.selectPage(sp); + } + + /** + * 导出水闸管理团队管理列表 + */ + @Log(title = "水闸管理团队管理导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸管理团队管理导出") + public AjaxResult export(@RequestBody BsSgcSzManateam bsSgcSzManateam) + { + List list = bsSgcSzManateamService.listByIds(bsSgcSzManateam.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcSzManateam.class); + return util.exportExcel(list, "manateam"); + } + + /** + * 获取水闸管理团队管理详细信息 + */ + @ApiOperation(" 水闸管理团队管理详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzManateamService.getById(id)); + } + + /** + * 新增水闸管理团队管理 + */ + @Log(title = "水闸管理团队管理新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸管理团队管理新增") + public AjaxResult add(@RequestBody BsSgcSzManateam bsSgcSzManateam) + { + BaseEntityUtils.preInsert(bsSgcSzManateam); + return toAjax(bsSgcSzManateamService.save(bsSgcSzManateam)); + } + + /** + * 修改水闸管理团队管理 + */ + @ApiOperation("水闸管理团队管理修改") + @Log(title = "水闸管理团队管理修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcSzManateam bsSgcSzManateam) + { + return toAjax(bsSgcSzManateamService.updateById(bsSgcSzManateam)); + } + + /** + * 删除水闸管理团队管理 + */ + @ApiOperation("水闸管理团队管理删除") + @Log(title = "水闸管理团队管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzManateamService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java index cf708910..73ef7af8 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java @@ -95,6 +95,9 @@ public class BsSgcSzAqrw extends BaseEntity private String taskName; + @TableField(exist = false) + private String total; + /* public void setWagaIds(String[] idArray) { this.wagaIds = String.join(",", idArray); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java index e20d0d45..073d0d8b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java @@ -93,6 +93,15 @@ public class BsSgcSzBzbp extends BaseEntity @TableField(exist = false) private String number; + @TableField(exist = false) + private String oneType; + @TableField(exist = false) + private String twoType; + @TableField(exist = false) + private String threeType; + @TableField(exist = false) + private String fourType; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8") private Date sortTime; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzManateam.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzManateam.java new file mode 100644 index 00000000..3f5d06f8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzManateam.java @@ -0,0 +1,77 @@ +package com.kms.yg.sz.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水闸管理团队管理对象 bs_sgc_sz_manateam + * + * @author kms + * @date 2025-03-18 + */ +@TableName("bs_sgc_sz_manateam") +@Data +@ApiModel("水闸管理团队管理") +public class BsSgcSzManateam extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String wagaName; + + /** 人员类型 */ + @Excel(name = "人员类型") + @ApiModelProperty("人员类型") + private String personType; + + /** 水闸代码 */ + @Excel(name = "水闸代码") + @ApiModelProperty("水闸代码") + private String wagaCode; + + /** 账户或或手机号 */ + @Excel(name = "账户或或手机号") + @ApiModelProperty("账户或或手机号") + private String phone; + + /** 人员名称 */ + @Excel(name = "人员名称") + @ApiModelProperty("人员名称") + private String personName; + + /** 身份证号 */ + @Excel(name = "身份证号") + @ApiModelProperty("身份证号") + private String idNo; + + /** 职务 */ + @Excel(name = "职务") + @ApiModelProperty("职务") + private String post; + + /** 部门 */ + @Excel(name = "部门") + @ApiModelProperty("部门") + private String department; + + /** $column.columnComment */ + @ApiModelProperty("部门") + private String createUid; + + /** $column.columnComment */ + @ApiModelProperty("部门") + private String updateUid; + + /** $column.columnComment */ + @ApiModelProperty("部门") + private String owerDept; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java index 4671cfcd..7e078c54 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java @@ -54,4 +54,6 @@ public interface BsSgcSzAqrwMapper extends BaseMapper { Map getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate, @Param("adcd")String xzqh,@Param("layer")String layer); + + List getList( @Param("adcd")String xzqh,@Param("layer")String layer); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java index 20c21beb..b78e8a42 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzBzbp; import java.util.List; +import java.util.Map; /** * 水闸标识标牌Mapper接口 @@ -17,4 +18,6 @@ import java.util.List; public interface BsSgcSzBzbpMapper extends BaseMapper { List selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd); + List> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd); + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzManateamMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzManateamMapper.java new file mode 100644 index 00000000..82ecd570 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzManateamMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sz.domain.BsSgcSzManateam; + +/** + * 水闸管理团队管理Mapper接口 + * + * @author kms + * @date 2025-03-18 + */ +@Repository +public interface BsSgcSzManateamMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 37753b6c..8635b7c7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfAqrw; import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.domain.dto.AqrwDto; @@ -17,6 +20,8 @@ import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; +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; @@ -51,6 +56,9 @@ public class BsSgcSzAqrwService extends BaseService sp, String adcd) { @@ -142,6 +150,17 @@ public class BsSgcSzAqrwService extends BaseServicegetWarnList(){ + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + SysXzqh xzqh = sysXzqhService.getById(xzqhId); + Integer layer =xzqh.getLayer(); + List list = bsSgcSzAqrwMapper.getList(xzqh.getXzqhdm(), String.valueOf(layer)); + return list; + } public List getList(String taskId) { diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java index a2519ca3..e25e9275 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java @@ -3,6 +3,7 @@ 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.yg.df.domain.BsSgcDfBzbp; import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper; import com.shuili.common.core.domain.SearchParam; @@ -10,6 +11,7 @@ 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; @@ -63,4 +65,16 @@ public class BsSgcSzBzbpService extends BaseServicegetStatistics(SearchParam sp, String adcd){ + BsSgcSzBzbp projectInfo = sp.getData(); + + List> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd); + Mapmap=new HashMap<>(); + + for ( MapintegerMap:statistics){ + map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num"))); + } + return map; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzManateamService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzManateamService.java new file mode 100644 index 00000000..63927be1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzManateamService.java @@ -0,0 +1,16 @@ +package com.kms.yg.sz.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yg.sz.mapper.BsSgcSzManateamMapper; +import com.kms.yg.sz.domain.BsSgcSzManateam; +import org.springframework.stereotype.Service; +/** + * 水闸管理团队管理Service接口 + * + * @author kms + * @date 2025-03-18 + */ +@Service +public class BsSgcSzManateamService extends BaseService{ + +} diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index 719a38c8..e484ce40 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -129,5 +129,34 @@ + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml index 183d8d83..7b7f5ebb 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml @@ -38,4 +38,20 @@ ORDER BY create_time DESC LIMIT #{pageNum}, #{pageSize} + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index 2b829768..ff606d80 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -130,5 +130,34 @@ + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml index bc250932..325adf8c 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml @@ -10,13 +10,21 @@ + + + + + + +