From d630bec0db5fb488d1c9996b04c0813b57a260b2 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Tue, 18 Mar 2025 23:57:10 +0800 Subject: [PATCH 1/2] =?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 --- .../sz/controller/BsSgcSzGctxController.java | 20 ++- .../controller/BsSgcSzManateamController.java | 115 ++++++++++++++++++ .../com/kms/yg/sz/domain/BsSgcSzBzbp.java | 9 ++ .../com/kms/yg/sz/domain/BsSgcSzManateam.java | 77 ++++++++++++ .../yg/sz/mapper/BsSgcSzManateamMapper.java | 16 +++ .../yg/sz/service/BsSgcSzManateamService.java | 16 +++ .../yxgh/common/enums/StaticIndexEnum.java | 4 +- .../mapper/yg/sz/BsSgcSzBzbpMapper.xml | 10 +- 8 files changed, 261 insertions(+), 6 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzManateamController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzManateam.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzManateamMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzManateamService.java 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/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/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/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/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/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 373de75b..fd0dd504 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -9,7 +9,7 @@ import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.sk.service.AttResBaseSkService; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; @@ -347,7 +347,7 @@ public enum StaticIndexEnum { YZT_SK_SUM("水库", sp -> { Map map =new HashMap<>(); - AttResBaseService service = SpringUtils.getBean(AttResBaseService.class); + AttResBaseSkService service = SpringUtils.getBean(AttResBaseSkService.class); map.put("sum",String.valueOf(service.count())); return map; }, "座", "0", "0"), 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..b3d33096 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 @@ + + + + + + + + + + + + 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 b3d33096..325adf8c 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml @@ -38,4 +38,20 @@ ORDER BY create_time DESC LIMIT #{pageNum}, #{pageSize} + + +