运管开发

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

@@ -40,7 +40,7 @@ import com.kms.yg.sz.service.BsSgcSzAqrwService;
  * @date 2024-01-16
  */
 @RestController
-@RequestMapping("/aqrw/aqrw")
+@RequestMapping("/aqrw")
 @Api(tags = "水闸安全鉴定任务信息")
 public class BsSgcSzAqrwController extends BaseController
 {
@@ -95,7 +95,8 @@ public class BsSgcSzAqrwController extends BaseController
     public AjaxResult add(@RequestBody BsSgcSzAqrw bsSgcSzAqrw)
     {
         BaseEntityUtils.preInsert(bsSgcSzAqrw);
-        return toAjax(bsSgcSzAqrwService.save(bsSgcSzAqrw));
+        bsSgcSzAqrwService.saveOther(bsSgcSzAqrw);
+        return AjaxResult.success();
     }
 
     /**
@@ -106,7 +107,8 @@ public class BsSgcSzAqrwController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcSzAqrw bsSgcSzAqrw)
     {
-        return toAjax(bsSgcSzAqrwService.updateById(bsSgcSzAqrw));
+        bsSgcSzAqrwService.updateOther(bsSgcSzAqrw);
+        return AjaxResult.success();
     }
 
     /**

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

@@ -0,0 +1,122 @@
+package com.kms.yg.sz.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+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.BsSgcSzBydy;
+import com.kms.yg.sz.service.BsSgcSzBydyService;
+
+
+/**
+ * 水闸备用电源信息Controller
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/sz/bydy")
+@Api(tags = "水闸备用电源信息")
+public class BsSgcSzBydyController extends BaseController
+{
+    @Autowired
+    private BsSgcSzBydyService bsSgcSzBydyService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询水闸备用电源信息列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸备用电源信息列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzBydy> sp)
+    {
+        return bsSgcSzBydyService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸备用电源信息列表
+     */
+    @Log(title = "水闸备用电源信息导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸备用电源信息导出")
+    public AjaxResult export(@RequestBody BsSgcSzBydy bsSgcSzBydy)
+    {
+        List<BsSgcSzBydy> list = bsSgcSzBydyService.listByIds(bsSgcSzBydy.getIds());
+        ExcelUtil<BsSgcSzBydy> util = new ExcelUtil<>(BsSgcSzBydy.class);
+        return util.exportExcel(list, "bydy");
+    }
+
+    /**
+     * 获取水闸备用电源信息详细信息
+     */
+    @ApiOperation(" 水闸备用电源信息详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzBydyService.getById(id));
+    }
+
+    /**
+     * 新增水闸备用电源信息
+     */
+    @Log(title = "水闸备用电源信息新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸备用电源信息新增")
+    public AjaxResult add(@RequestBody BsSgcSzBydy bsSgcSzBydy)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzBydy);
+        return toAjax(bsSgcSzBydyService.save(bsSgcSzBydy));
+    }
+
+    /**
+     * 修改水闸备用电源信息
+     */
+    @ApiOperation("水闸备用电源信息修改")
+    @Log(title = "水闸备用电源信息修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzBydy bsSgcSzBydy)
+    {
+        return toAjax(bsSgcSzBydyService.updateById(bsSgcSzBydy));
+    }
+
+    /**
+     * 删除水闸备用电源信息
+     */
+    @ApiOperation("水闸备用电源信息删除")
+    @Log(title = "水闸备用电源信息删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzBydyService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.kms.yg.sz.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.kms.yg.sz.domain.BsSgcSzBydyzb;
+import com.kms.yg.sz.service.BsSgcSzBydyzbService;
+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;
+
+
+
+/**
+ * 水闸备用电源主Controller
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/bydyzb")
+@Api(tags = "水闸备用电源主")
+public class BsSgcSzBydyzbController extends BaseController
+{
+    @Autowired
+    private BsSgcSzBydyzbService bsSgcSzBydyzbService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询水闸备用电源主列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸备用电源主列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzBydyzb> sp)
+    {
+        return bsSgcSzBydyzbService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸备用电源主列表
+     */
+    @Log(title = "水闸备用电源主导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸备用电源主导出")
+    public AjaxResult export(@RequestBody BsSgcSzBydyzb bsSgcSzBydyzb)
+    {
+        List<BsSgcSzBydyzb> list = bsSgcSzBydyzbService.listByIds(bsSgcSzBydyzb.getIds());
+        ExcelUtil<BsSgcSzBydyzb> util = new ExcelUtil<>(BsSgcSzBydyzb.class);
+        return util.exportExcel(list, "bydyzb");
+    }
+
+    /**
+     * 获取水闸备用电源主详细信息
+     */
+    @ApiOperation(" 水闸备用电源主详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzBydyzbService.getById(id));
+    }
+
+    /**
+     * 新增水闸备用电源主
+     */
+    @Log(title = "水闸备用电源主新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸备用电源主新增")
+    public AjaxResult add(@RequestBody BsSgcSzBydyzb bsSgcSzBydyzb)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzBydyzb);
+        return toAjax(bsSgcSzBydyzbService.save(bsSgcSzBydyzb));
+    }
+
+    /**
+     * 修改水闸备用电源主
+     */
+    @ApiOperation("水闸备用电源主修改")
+    @Log(title = "水闸备用电源主修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzBydyzb bsSgcSzBydyzb)
+    {
+        return toAjax(bsSgcSzBydyzbService.updateById(bsSgcSzBydyzb));
+    }
+
+    /**
+     * 删除水闸备用电源主
+     */
+    @ApiOperation("水闸备用电源主删除")
+    @Log(title = "水闸备用电源主删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzBydyzbService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.kms.yg.sz.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+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.BsSgcSzFxzzcy;
+import com.kms.yg.sz.service.BsSgcSzFxzzcyService;
+
+
+/**
+ * 水闸防汛组织成员Controller
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/sz/fxzzcy")
+@Api(tags = "水闸防汛组织成员")
+public class BsSgcSzFxzzcyController extends BaseController
+{
+    @Autowired
+    private BsSgcSzFxzzcyService bsSgcSzFxzzcyService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询水闸防汛组织成员列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸防汛组织成员列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzFxzzcy> sp)
+    {
+        return bsSgcSzFxzzcyService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸防汛组织成员列表
+     */
+    @Log(title = "水闸防汛组织成员导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸防汛组织成员导出")
+    public AjaxResult export(@RequestBody BsSgcSzFxzzcy bsSgcSzFxzzcy)
+    {
+        List<BsSgcSzFxzzcy> list = bsSgcSzFxzzcyService.listByIds(bsSgcSzFxzzcy.getIds());
+        ExcelUtil<BsSgcSzFxzzcy> util = new ExcelUtil<>(BsSgcSzFxzzcy.class);
+        return util.exportExcel(list, "fxzzcy");
+    }
+
+    /**
+     * 获取水闸防汛组织成员详细信息
+     */
+    @ApiOperation(" 水闸防汛组织成员详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzFxzzcyService.getById(id));
+    }
+
+    /**
+     * 新增水闸防汛组织成员
+     */
+    @Log(title = "水闸防汛组织成员新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸防汛组织成员新增")
+    public AjaxResult add(@RequestBody BsSgcSzFxzzcy bsSgcSzFxzzcy)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzFxzzcy);
+        return toAjax(bsSgcSzFxzzcyService.save(bsSgcSzFxzzcy));
+    }
+
+    @PostMapping("/saveBatch")
+    public AjaxResult saveBatch(@RequestBody List<BsSgcSzFxzzcy> list) {
+        for (BsSgcSzFxzzcy bsSgcSzFxzzcy : list) {
+            BaseEntityUtils.preInsert(bsSgcSzFxzzcy);
+        }
+        return toAjax(bsSgcSzFxzzcyService.saveBatch(list));
+    }
+
+    /**
+     * 修改水闸防汛组织成员
+     */
+    @ApiOperation("水闸防汛组织成员修改")
+    @Log(title = "水闸防汛组织成员修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzFxzzcy bsSgcSzFxzzcy)
+    {
+        return toAjax(bsSgcSzFxzzcyService.updateById(bsSgcSzFxzzcy));
+    }
+
+    /**
+     * 删除水闸防汛组织成员
+     */
+    @ApiOperation("水闸防汛组织成员删除")
+    @Log(title = "水闸防汛组织成员删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzFxzzcyService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -65,25 +65,6 @@ public class BsSgcSzFzrController extends BaseController
     private SysDeptService sysDeptService;
 
 
-    /**
-     * 根据水闸id查询责任人
-     * @param sluiceId
-     * @return
-     */
-    @GetMapping("/{sluiceId}")
-    private AjaxResult getById(@PathVariable("sluiceId") String sluiceId) {
-
-        List<BsSgcSzFzr> list = bsSgcSzFzrService.list(Wrappers.lambdaQuery(BsSgcSzFzr.class).eq(BsSgcSzFzr::getSluiceId, sluiceId));
-        List<BsSgcSzFzr> collect = list.stream().filter(x -> x.getResponsibility() == "0").collect(Collectors.toList());
-        List<BsSgcSzFzr> collect1 = list.stream().filter(x -> x.getResponsibility() == "1").collect(Collectors.toList());
-
-        FzrDto fzrDto = new FzrDto();
-        fzrDto.setFxzzList(collect);
-        fzrDto.setFzrList(collect1);
-        return AjaxResult.success(fzrDto);
-    }
-
-
 
     /**
      * 查询水闸负责人列表

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

@@ -0,0 +1,122 @@
+package com.kms.yg.sz.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+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.BsSgcSzSzrw;
+import com.kms.yg.sz.service.BsSgcSzSzrwService;
+
+
+/**
+ * 水闸鉴定任务关联Controller
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@RestController
+@RequestMapping("/sz/szrw")
+@Api(tags = "水闸鉴定任务关联")
+public class BsSgcSzSzrwController extends BaseController
+{
+    @Autowired
+    private BsSgcSzSzrwService bsSgcSzSzrwService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询水闸鉴定任务关联列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸鉴定任务关联列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzSzrw> sp)
+    {
+        return bsSgcSzSzrwService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸鉴定任务关联列表
+     */
+    @Log(title = "水闸鉴定任务关联导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸鉴定任务关联导出")
+    public AjaxResult export(@RequestBody BsSgcSzSzrw bsSgcSzSzrw)
+    {
+        List<BsSgcSzSzrw> list = bsSgcSzSzrwService.listByIds(bsSgcSzSzrw.getIds());
+        ExcelUtil<BsSgcSzSzrw> util = new ExcelUtil<>(BsSgcSzSzrw.class);
+        return util.exportExcel(list, "szrw");
+    }
+
+    /**
+     * 获取水闸鉴定任务关联详细信息
+     */
+    @ApiOperation(" 水闸鉴定任务关联详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzSzrwService.getById(id));
+    }
+
+    /**
+     * 新增水闸鉴定任务关联
+     */
+    @Log(title = "水闸鉴定任务关联新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸鉴定任务关联新增")
+    public AjaxResult add(@RequestBody BsSgcSzSzrw bsSgcSzSzrw)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzSzrw);
+        return toAjax(bsSgcSzSzrwService.save(bsSgcSzSzrw));
+    }
+
+    /**
+     * 修改水闸鉴定任务关联
+     */
+    @ApiOperation("水闸鉴定任务关联修改")
+    @Log(title = "水闸鉴定任务关联修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzSzrw bsSgcSzSzrw)
+    {
+        return toAjax(bsSgcSzSzrwService.updateById(bsSgcSzSzrw));
+    }
+
+    /**
+     * 删除水闸鉴定任务关联
+     */
+    @ApiOperation("水闸鉴定任务关联删除")
+    @Log(title = "水闸鉴定任务关联删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzSzrwService.removeByIds(Arrays.asList(ids)));
+    }
+}

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java

@@ -50,6 +50,8 @@ public class BsSgcSzAqrw extends BaseEntity
     @ApiModelProperty("未完成水闸数量")
     private Long incompletionNumber;
 
+    private String adcd;
+
     /** 任务状态 */
     @Excel(name = "任务状态")
     @ApiModelProperty("任务状态")
@@ -87,4 +89,12 @@ public class BsSgcSzAqrw extends BaseEntity
     @ApiModelProperty("完成时间")
     private String relation;
 
+    public void setSluiceIds(String[] idArray) {
+        this.sluiceIds = String.join(",", idArray);
+    }
+
+    public String[] getSluiceIds() {
+        return this.sluiceIds.split(",");
+    }
+
 }

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydy.java

@@ -0,0 +1,87 @@
+package com.kms.yg.sz.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸备用电源信息对象 bs_sgc_sz_bydy
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@TableName("bs_sgc_sz_bydy")
+@Data
+@ApiModel("水闸备用电源信息")
+public class BsSgcSzBydy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 水闸id */
+    private String bydyzbId;
+
+    /** 备用电源名称 */
+    @Excel(name = "备用电源名称")
+    @ApiModelProperty("备用电源名称")
+    private String backupPowerName;
+
+    /** 水闸名称 */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String sluiceName;
+
+    /** 电源功率 */
+    @Excel(name = "电源功率")
+    @ApiModelProperty("电源功率")
+    private String powerSupplyPower;
+
+    /** 采购时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "采购时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("采购时间")
+    private Date procurementTime;
+
+    /** 负责人名称 */
+    @Excel(name = "负责人名称")
+    @ApiModelProperty("负责人名称")
+    private String personName;
+
+    /** 负责人电话 */
+    @Excel(name = "负责人电话")
+    @ApiModelProperty("负责人电话")
+    private String personPhone;
+
+    /** 负责人职务 */
+    @Excel(name = "负责人职务")
+    @ApiModelProperty("负责人职务")
+    private String personLevel;
+
+    /** $column.columnComment */
+    @Excel(name = "负责人职务")
+    @ApiModelProperty("负责人职务")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "负责人职务")
+    @ApiModelProperty("负责人职务")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "负责人职务")
+    @ApiModelProperty("负责人职务")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "负责人职务")
+    @ApiModelProperty("负责人职务")
+    private String relation;
+
+}

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java

@@ -0,0 +1,66 @@
+package com.kms.yg.sz.domain;
+
+import com.shuili.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸备用电源主对象 bs_sgc_sz_bydyzb
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@TableName("bs_sgc_sz_bydyzb")
+@Data
+@ApiModel("水闸备用电源主")
+public class BsSgcSzBydyzb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 水闸id */
+    @Excel(name = "水闸id")
+    @ApiModelProperty("水闸id")
+    private String sluiceId;
+
+    /** 电源种类 */
+    @Excel(name = "电源种类")
+    @ApiModelProperty("电源种类")
+    private String powerType;
+
+    /** 电源型号 */
+    @Excel(name = "电源型号")
+    @ApiModelProperty("电源型号")
+    private String powerModel;
+
+    /** 水闸名称 */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String sluiceName;
+
+    /** $column.columnComment */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String relation;
+
+}

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java

@@ -88,7 +88,6 @@ public class BsSgcSzFxzz extends BaseEntity
     @ApiModelProperty("成员")
     private String relation;
 
-    private String responsibility;
 
     private String sluiceName;
 

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzzcy.java

@@ -0,0 +1,66 @@
+package com.kms.yg.sz.domain;
+
+import com.shuili.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸防汛组织成员对象 bs_sgc_sz_fxzzcy
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@TableName("bs_sgc_sz_fxzzcy")
+@Data
+@ApiModel("水闸防汛组织成员")
+public class BsSgcSzFxzzcy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 组织id */
+    @Excel(name = "组织id")
+    @ApiModelProperty("组织id")
+    private String organizationId;
+
+    /** 组织人员名称 */
+    @Excel(name = "组织人员名称")
+    @ApiModelProperty("组织人员名称")
+    private String name;
+
+    /** 职务 */
+    @Excel(name = "职务")
+    @ApiModelProperty("职务")
+    private String duites;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String phone;
+
+    /** $column.columnComment */
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "电话")
+    @ApiModelProperty("电话")
+    private String relation;
+
+}

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@@ -101,8 +101,6 @@ public class BsSgcSzFzr extends BaseEntity
     @ApiModelProperty("类型")
     private String type;
 
-    private String responsibility;
-
     private String sluiceName;
 
     private String sluiceType;
@@ -112,35 +110,9 @@ public class BsSgcSzFzr extends BaseEntity
     private String adcd;
 
 
-    /** 组织名称 */
-    @Excel(name = "组织名称")
-    @ApiModelProperty("组织名称")
-    private String organizationName;
 
 
 
-    /** 负责人名称 */
-    @Excel(name = "负责人名称")
-    @ApiModelProperty("负责人名称")
-    private String chargePersonName;
-
-    /** 负责人电话 */
-    @Excel(name = "负责人电话")
-    @ApiModelProperty("负责人电话")
-    private String chargePersonPhone;
-
-    /** 负责人职务 */
-    @Excel(name = "负责人职务")
-    @ApiModelProperty("负责人职务")
-    private String chargePersonDuites;
-
-    /** 负责人类型 */
-    @Excel(name = "负责人类型")
-    @ApiModelProperty("负责人类型")
-    private String chargePersonType;
-
-    /** 成员 */
-    @Excel(name = "成员")
-    @ApiModelProperty("成员")
-    private String member;
+
+
 }

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@@ -159,6 +159,8 @@ public class BsSgcSzSafeJbxx extends BaseEntity
     @ApiModelProperty("水闸概况")
     private String owerDept;
 
+
+
     /** $column.columnComment */
     @Excel(name = "水闸概况")
     @ApiModelProperty("水闸概况")
@@ -174,10 +176,6 @@ public class BsSgcSzSafeJbxx extends BaseEntity
     @ApiModelProperty("安全类别")
     private String securityCategory;
 
-    /** 安全鉴定状态 */
-    @Excel(name = "安全鉴定状态")
-    @ApiModelProperty("安全鉴定状态")
-    private String securityStatus;
 
     private String hzStatus;
 

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java

@@ -0,0 +1,75 @@
+package com.kms.yg.sz.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 水闸鉴定任务关联对象 bs_sgc_sz_szrw
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@TableName("bs_sgc_sz_szrw")
+@Data
+@ApiModel("水闸鉴定任务关联")
+@AllArgsConstructor
+@NoArgsConstructor
+public class BsSgcSzSzrw extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 水闸id */
+    @Excel(name = "水闸id")
+    @ApiModelProperty("水闸id")
+    private String wagaId;
+
+    /** 任务id */
+    @Excel(name = "任务id")
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    /** 计划完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("计划完成时间")
+    private Date planTime;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("完成时间")
+    private Date completionTime;
+
+    /** $column.columnComment */
+    @Excel(name = "完成时间")
+    @ApiModelProperty("完成时间")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "完成时间")
+    @ApiModelProperty("完成时间")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "完成时间")
+    @ApiModelProperty("完成时间")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "完成时间")
+    @ApiModelProperty("完成时间")
+    private String relation;
+
+    private String status;
+
+}

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyMapper.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.BsSgcSzBydy;
+
+/**
+ * 水闸备用电源信息Mapper接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Repository
+public interface BsSgcSzBydyMapper extends BaseMapper<BsSgcSzBydy> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.kms.yg.sz.mapper;
+
+import com.kms.yg.sz.domain.BsSgcSzBydyzb;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 水闸备用电源主Mapper接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Repository
+public interface BsSgcSzBydyzbMapper extends BaseMapper<BsSgcSzBydyzb> {
+
+}

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.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.BsSgcSzFxzzcy;
+
+/**
+ * 水闸防汛组织成员Mapper接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Repository
+public interface BsSgcSzFxzzcyMapper extends BaseMapper<BsSgcSzFxzzcy> {
+
+}

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSzrwMapper.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.BsSgcSzSzrw;
+
+/**
+ * 水闸鉴定任务关联Mapper接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Repository
+public interface BsSgcSzSzrwMapper extends BaseMapper<BsSgcSzSzrw> {
+
+}

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

@@ -1,9 +1,25 @@
 package com.kms.yg.sz.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
+import com.kms.yg.sz.domain.BsSgcSzSzrw;
+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.service.BaseService;
 import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper;
 import com.kms.yg.sz.domain.BsSgcSzAqrw;
+import com.shuili.common.mybaitsplus.BeanToWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 水闸安全鉴定任务信息Service接口
  *
@@ -13,4 +29,86 @@ import org.springframework.stereotype.Service;
 @Service
 public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAqrw>{
 
+    @Autowired
+    private BsSgcSzAqrwMapper bsSgcSzAqrwMapper;
+
+    @Autowired
+    private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
+
+    @Autowired
+    private BsSgcSzSzrwMapper bsSgcSzSzrwMapper;
+
+    @Autowired
+    private BsSgcSzSzrwService bsSgcSzSzrwService;
+
+    public IPage selectPage(SearchParam<BsSgcSzAqrw> sp) {
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+
+        List<BsSgcSzAqrw> records = page.getRecords();
+        //获取未完成的
+        List<BsSgcSzAqrw> noFin = records.stream().filter(x -> x.getTaskStatus().equals("0")).collect(Collectors.toList());
+        //获取已完成
+        List<BsSgcSzAqrw> fin = records.stream().filter(x -> x.getTaskStatus().equals("1")).collect(Collectors.toList());
+
+       /* for (BsSgcSzAqrw bsSgcSzAqrw : noFin) {
+            List<BsSgcSzSafeJbxx> jbxxList = bsSgcSzSafeJbxxMapper.selectBatchIds(Arrays.asList(bsSgcSzAqrw.getSluiceIds()));
+
+//            List<BsSgcSzSafeJbxx> no = jbxxList.stream().filter(x -> x.getSecurityStatus().equals("0")).collect(Collectors.toList());
+
+            bsSgcSzAqrw.setIncompletionNumber((long) no.size());
+
+            bsSgcSzAqrw.setCompletionNumber(bsSgcSzAqrw.getTaskSluiceNumber()-no.size());
+
+
+        }
+
+        ArrayList<BsSgcSzAqrw> bsSgcSzAqrws = new ArrayList<>();
+
+        bsSgcSzAqrws.addAll(noFin);
+        bsSgcSzAqrws.addAll(fin);
+        page.setRecords(bsSgcSzAqrws);*/
+        return page;
+
+    }
+
+    public void saveOther(BsSgcSzAqrw bsSgcSzAqrw) {
+        //获取水闸ids
+        String[] sluiceIds = bsSgcSzAqrw.getSluiceIds();
+        //设置总数
+        bsSgcSzAqrw.setTaskSluiceNumber((long) sluiceIds.length);
+        List<String> ids = Arrays.asList(sluiceIds);
+        bsSgcSzAqrwMapper.insert(bsSgcSzAqrw);
+        //存关联表
+        String id = bsSgcSzAqrw.getId();
+        List<BsSgcSzSzrw> collect = ids.stream().map(x ->
+                        new BsSgcSzSzrw(x, id, bsSgcSzAqrw.getPlanCompletionTime(), null, null, null, null, null,"0"))
+                .collect(Collectors.toList());
+        bsSgcSzSzrwService.saveBatch(collect);
+
+
+    }
+
+    public void updateOther(BsSgcSzAqrw bsSgcSzAqrw) {
+        //多的新增，少的删除
+        String id = bsSgcSzAqrw.getId();
+        //原来的
+        BsSgcSzAqrw szAqrw = bsSgcSzAqrwMapper.selectById(id);
+
+        //获取原来的水闸id
+        String[] sluiceIds = szAqrw.getSluiceIds();
+        List<String> strings = Arrays.asList(sluiceIds);
+
+        //现在de
+        String[] ids = bsSgcSzAqrw.getSluiceIds();
+        List<String> list = Arrays.asList(ids);
+        //获取新增的
+        List<String> addList = list.stream().filter(x -> !strings.contains(x)).collect(Collectors.toList());
+        //获取删除的
+        List<String> delList = strings.stream().filter(x -> !list.contains(x)).collect(Collectors.toList());
+
+        if (CollectionUtil.isNotEmpty(addList)) {
+
+        }
+
+    }
 }

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

@@ -0,0 +1,17 @@
+package com.kms.yg.sz.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.sz.mapper.BsSgcSzBydyMapper;
+import com.kms.yg.sz.domain.BsSgcSzBydy;
+import org.springframework.stereotype.Service;
+
+/**
+ * 水闸备用电源信息Service接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Service
+public class BsSgcSzBydyService extends BaseService<BsSgcSzBydyMapper, BsSgcSzBydy>{
+
+}

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

@@ -0,0 +1,18 @@
+package com.kms.yg.sz.service;
+
+import com.kms.yg.sz.domain.BsSgcSzBydyzb;
+import com.kms.yg.sz.mapper.BsSgcSzBydyzbMapper;
+import com.shuili.common.core.service.BaseService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 水闸备用电源主Service接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Service
+public class BsSgcSzBydyzbService extends BaseService<BsSgcSzBydyzbMapper, BsSgcSzBydyzb>{
+
+}

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

@@ -0,0 +1,17 @@
+package com.kms.yg.sz.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.sz.mapper.BsSgcSzFxzzcyMapper;
+import com.kms.yg.sz.domain.BsSgcSzFxzzcy;
+import org.springframework.stereotype.Service;
+
+/**
+ * 水闸防汛组织成员Service接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Service
+public class BsSgcSzFxzzcyService extends BaseService<BsSgcSzFxzzcyMapper, BsSgcSzFxzzcy>{
+
+}

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

@@ -0,0 +1,17 @@
+package com.kms.yg.sz.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper;
+import com.kms.yg.sz.domain.BsSgcSzSzrw;
+import org.springframework.stereotype.Service;
+
+/**
+ * 水闸鉴定任务关联Service接口
+ *
+ * @author kms
+ * @date 2024-01-17
+ */
+@Service
+public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSzrw>{
+
+}