立项补充

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());
+//        dfhdm.setId(UUID.randomUUID().toString());
-        bsSgcSzGctxService.save(dfhdm);
+        bsSgcSzGctxService.saveOrUpdate(dfhdm);
         bsSgcSzGctx.setEffDate(new Date());
         bsSgcSzGctx.setExprDate(null);
         return toAjax(bsSgcSzGctxService.updateById(bsSgcSzGctx));

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<BsSgcSzManateam> sp)
+    {
+        return bsSgcSzManateamService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸管理团队管理列表
+     */
+    @Log(title = "水闸管理团队管理导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸管理团队管理导出")
+    public AjaxResult export(@RequestBody BsSgcSzManateam bsSgcSzManateam)
+    {
+        List<BsSgcSzManateam> list = bsSgcSzManateamService.listByIds(bsSgcSzManateam.getIds());
+        ExcelUtil<BsSgcSzManateam> 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)));
+    }
+}

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;
 

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

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<BsSgcSzManateam> {
+
+}

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<BsSgcSzManateamMapper, BsSgcSzManateam>{
+
+}

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<String,String> 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"),

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

@@ -10,13 +10,21 @@
         <result property="wagaName"   column="waga_name"   />
         <result property="adcd"   column="adcd"   />
         <result property="number"   column="number"   />
+        <result property="oneType"   column="oneType"   />
+        <result property="twoType"   column="twoType"   />
+        <result property="threeType"   column="threeType"   />
+        <result property="fourType"   column="fourType"   />
         <result property="wagaCode"   column="waga_code"   />
 
     </resultMap>
 
     <select id="selectList1" resultMap="Result">
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
-        SELECT waga_name, adcd, COUNT(1) number,waga_code
+        SELECT waga_name, adcd, COUNT(1) number,waga_code,
+        COUNT(CASE WHEN type = 0 THEN 1 END) AS oneType,
+        COUNT(CASE WHEN type= 1 THEN 1 END) AS twoType,
+        COUNT(CASE WHEN type = 2 THEN 1 END) AS threeType,
+        COUNT(CASE WHEN type = 3 THEN 1 END) AS fourType
         FROM bs_sgc_sz_bzbp
         <where>
             <if test="wagaName != null and wagaName != ''">