Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java

@@ -1,6 +1,10 @@
 package com.kms.yg.df.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.common.utils.BaseEntityUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
@@ -15,12 +19,14 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -59,6 +65,18 @@ public class BsSgcDfAqjdxxController extends BaseController
     @ApiOperation("水闸安全鉴定信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcDfAqjdxx> sp)
     {
+
+        BsSgcDfAqjdxx data = sp.getData();
+        if (StringUtils.isNotEmpty(data.getDikeCode())){
+            LambdaQueryWrapper<BsSgcDfAqjdxx>lw=new LambdaQueryWrapper<>();
+            lw.eq(BsSgcDfAqjdxx::getRemark,data.getDikeCode());
+            if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){
+                lw.eq(BsSgcDfAqjdxx::getIdentifyTime,data.getIdentifyTime());
+            }
+            Page<BsSgcDfAqjdxx>pa=new Page<>(sp.getPageNum(),sp.getPageSize());
+            Page<BsSgcDfAqjdxx> page = bsSgcSzAqjdxxService.page(pa, lw);
+            return page;
+        }
         return bsSgcSzAqjdxxService.selectPage(sp);
     }
 

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java

@@ -35,7 +35,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/df/bydyzb")
-@Api(tags = "水闸备用电源主")
+@Api(tags = "堤防备用电源主")
 public class BsSgcDfBydyzbController extends BaseController
 {
     @Autowired
@@ -52,7 +52,7 @@ public class BsSgcDfBydyzbController extends BaseController
      * 查询水闸备用电源主列表
      */
     @PostMapping("/list")
-    @ApiOperation("水闸备用电源主列表")
+    @ApiOperation("堤防备用电源主列表")
     public IPage list(@RequestBody SearchParam<BsSgcDfBydyzb> sp)
     {
         IPage<BsSgcDfBydyzb> bsSgcDfBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp);

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java

@@ -1,5 +1,6 @@
 package com.kms.yg.df.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.annotation.Excel;
@@ -136,4 +137,16 @@ public class BsSgcDfAqjdxx extends BaseEntity
     @ApiModelProperty("安全鉴定意见")
     private String relation;
 
+    private String remark;
+
+
+    @TableField(exist = false)
+    private String dikeCode;
+
+
+    @TableField(exist = false)
+    private Date startTime;
+
+    @TableField(exist = false)
+    private Date endDateTime;
 }

shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java

@@ -15,6 +15,7 @@ public class DfrwDto {
     private String  taskName;
 
     private String dikeName;
+    private String dikeCode;
 
     private String dikeType;
 

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java

@@ -64,6 +64,7 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
             szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
             szrwDto.setStatus(record.getStatus());
+            szrwDto.setDikeCode(record.getDikeCode());
             szrwDto.setRemark(record.getRemark());
 
             szrwDto.setPlanTime(record.getPlanTime());

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

@@ -0,0 +1,114 @@
+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.annotation.Log;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.enums.BusinessType;
+import com.kms.yg.sz.domain.BsSgcAssessmentCriteria;
+import com.kms.yg.sz.service.BsSgcAssessmentCriteriaService;
+
+
+/**
+ * 奖惩管理Controller
+ *
+ * @author kms
+ * @date 2025-03-26
+ */
+@RestController
+@RequestMapping("/system/criteria")
+@Api(tags = "奖惩管理")
+public class BsSgcAssessmentCriteriaController extends BaseController
+{
+    @Autowired
+    private BsSgcAssessmentCriteriaService bsSgcAssessmentCriteriaService;
+
+
+    /**
+     * 查询奖惩管理列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("奖惩管理列表")
+    public IPage list(@RequestBody SearchParam<BsSgcAssessmentCriteria> sp)
+    {
+        return bsSgcAssessmentCriteriaService.selectPage(sp);
+    }
+
+    /**
+     * 导出奖惩管理列表
+     */
+    @Log(title = "奖惩管理导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("奖惩管理导出")
+    public AjaxResult export(@RequestBody BsSgcAssessmentCriteria bsSgcAssessmentCriteria)
+    {
+        List<BsSgcAssessmentCriteria> list = bsSgcAssessmentCriteriaService.listByIds(bsSgcAssessmentCriteria.getIds());
+        ExcelUtil<BsSgcAssessmentCriteria> util = new ExcelUtil<>(BsSgcAssessmentCriteria.class);
+        return util.exportExcel(list, "criteria");
+    }
+
+    /**
+     * 获取奖惩管理详细信息
+     */
+    @ApiOperation(" 奖惩管理详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcAssessmentCriteriaService.getById(id));
+    }
+
+    /**
+     * 新增奖惩管理
+     */
+    @Log(title = "奖惩管理新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("奖惩管理新增")
+    public AjaxResult add(@RequestBody BsSgcAssessmentCriteria bsSgcAssessmentCriteria)
+    {
+        BaseEntityUtils.preInsert(bsSgcAssessmentCriteria);
+        return toAjax(bsSgcAssessmentCriteriaService.save(bsSgcAssessmentCriteria));
+    }
+
+    /**
+     * 修改奖惩管理
+     */
+    @ApiOperation("奖惩管理修改")
+    @Log(title = "奖惩管理修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcAssessmentCriteria bsSgcAssessmentCriteria)
+    {
+        return toAjax(bsSgcAssessmentCriteriaService.updateById(bsSgcAssessmentCriteria));
+    }
+
+    /**
+     * 删除奖惩管理
+     */
+    @ApiOperation("奖惩管理删除")
+    @Log(title = "奖惩管理删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcAssessmentCriteriaService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -1,9 +1,13 @@
 package com.kms.yg.sz.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.BaseEntityUtils;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfAqjdxx;
 import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
 import com.kms.yg.sz.domain.BsSgcSzAqrw;
 import com.kms.yg.sz.domain.BsSgcSzSzrw;
@@ -15,6 +19,7 @@ import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.AjaxResult;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.enums.BusinessType;
+import com.shuili.common.utils.StringUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,6 +64,18 @@ public class BsSgcSzAqjdxxController extends BaseController
     @ApiOperation("水闸安全鉴定信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcSzAqjdxx> sp)
     {
+
+        BsSgcSzAqjdxx data = sp.getData();
+        if (StringUtils.isNotEmpty(data.getWagaCode())){
+            LambdaQueryWrapper<BsSgcSzAqjdxx> lw=new LambdaQueryWrapper<>();
+            if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){
+                lw.eq(BsSgcSzAqjdxx::getIdentifyTime,data.getIdentifyTime());
+            }
+            lw.eq(BsSgcSzAqjdxx::getRemark,data.getWagaCode());
+            Page<BsSgcSzAqjdxx> pa=new Page<>(sp.getPageNum(),sp.getPageSize());
+            Page<BsSgcSzAqjdxx> page = bsSgcSzAqjdxxService.page(pa, lw);
+            return page;
+        }
         return bsSgcSzAqjdxxService.selectPage(sp);
     }
 

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.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.BsSgcSzGzsc;
+import com.kms.yg.sz.service.BsSgcSzGzscService;
+
+
+/**
+ * 水闸工作手册Controller
+ *
+ * @author kms
+ * @date 2025-03-13
+ */
+@RestController
+@RequestMapping("/sz/gzsc")
+@Api(tags = "水闸工作手册")
+public class BsSgcSzGzscController extends BaseController
+{
+    @Autowired
+    private BsSgcSzGzscService bsSgcSzGzscService;
+
+
+    /**
+     * 查询水闸工作手册列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸工作手册列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzGzsc> sp)
+    {
+        return bsSgcSzGzscService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸工作手册列表
+     */
+    @Log(title = "水闸工作手册导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸工作手册导出")
+    public AjaxResult export(@RequestBody BsSgcSzGzsc bsSgcSzGzsc)
+    {
+        List<BsSgcSzGzsc> list = bsSgcSzGzscService.listByIds(bsSgcSzGzsc.getIds());
+        ExcelUtil<BsSgcSzGzsc> util = new ExcelUtil<>(BsSgcSzGzsc.class);
+        return util.exportExcel(list, "gzsc");
+    }
+
+    /**
+     * 获取水闸工作手册详细信息
+     */
+    @ApiOperation(" 水闸工作手册详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzGzscService.getById(id));
+    }
+
+    /**
+     * 新增水闸工作手册
+     */
+    @Log(title = "水闸工作手册新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸工作手册新增")
+    public AjaxResult add(@RequestBody BsSgcSzGzsc bsSgcSzGzsc)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzGzsc);
+        return toAjax(bsSgcSzGzscService.save(bsSgcSzGzsc));
+    }
+
+    /**
+     * 修改水闸工作手册
+     */
+    @ApiOperation("水闸工作手册修改")
+    @Log(title = "水闸工作手册修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzGzsc bsSgcSzGzsc)
+    {
+        return toAjax(bsSgcSzGzscService.updateById(bsSgcSzGzsc));
+    }
+
+    /**
+     * 删除水闸工作手册
+     */
+    @ApiOperation("水闸工作手册删除")
+    @Log(title = "水闸工作手册删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzGzscService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,56 @@
+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_assessment_criteria
+ *
+ * @author kms
+ * @date 2025-03-26
+ */
+@TableName("bs_sgc_assessment_criteria")
+@Data
+@ApiModel("奖惩管理")
+public class BsSgcAssessmentCriteria extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 奖励机制 */
+    @Excel(name = "奖励机制")
+    @ApiModelProperty("奖励机制")
+    private String rewardSystem;
+
+    /** 惩处措施 */
+    @Excel(name = "惩处措施")
+    @ApiModelProperty("惩处措施")
+    private String punishmentMeasures;
+
+    /** $column.columnComment */
+    @Excel(name = "惩处措施")
+    @ApiModelProperty("惩处措施")
+    private String remake;
+    /**
+     * 1 水闸 2 堤防
+     */
+    @Excel(name = "类型")
+    @ApiModelProperty("类型")
+    private String type;
+
+    /** $column.columnComment */
+    @Excel(name = "惩处措施")
+    @ApiModelProperty("惩处措施")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "惩处措施")
+    @ApiModelProperty("惩处措施")
+    private String updateUid;
+
+}

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

@@ -1,6 +1,8 @@
 package com.kms.yg.sz.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -138,4 +140,15 @@ public class BsSgcSzAqjdxx extends BaseEntity
     @ApiModelProperty("安全鉴定意见")
     private String relation;
 
+    private String remark;
+
+    @TableField(exist = false)
+    private String wagaCode;
+
+    @TableField(exist = false)
+    private Date startTime;
+
+    @TableField(exist = false)
+    private Date endDateTime;
+
 }

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

@@ -16,6 +16,8 @@ public class SzrwDto {
 
     private String wagaName;
 
+    private String wagaCode;
+
     private String wagaType;
 
     private String adcd;

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcAssessmentCriteriaMapper.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.BsSgcAssessmentCriteria;
+
+/**
+ * 奖惩管理Mapper接口
+ *
+ * @author kms
+ * @date 2025-03-26
+ */
+@Repository
+public interface BsSgcAssessmentCriteriaMapper extends BaseMapper<BsSgcAssessmentCriteria> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.kms.yg.sz.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.sz.mapper.BsSgcAssessmentCriteriaMapper;
+import com.kms.yg.sz.domain.BsSgcAssessmentCriteria;
+import org.springframework.stereotype.Service;
+/**
+ * 奖惩管理Service接口
+ *
+ * @author kms
+ * @date 2025-03-26
+ */
+@Service
+public class BsSgcAssessmentCriteriaService extends BaseService<BsSgcAssessmentCriteriaMapper, BsSgcAssessmentCriteria>{
+
+}

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

@@ -62,6 +62,7 @@ public class BsSgcSzSzrwService extends BaseService<BsSgcSzSzrwMapper, BsSgcSzSz
             szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
             szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
+            szrwDto.setWagaCode(bsSgcSzSafeJbxx.getWagaCode());
             szrwDto.setStatus(record.getStatus());
             szrwDto.setRemark(record.getRemark());
 

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@@ -43,7 +43,7 @@
     <select id="getStatistics" resultType="java.util.Map">
         SELECT qh.NAME as name,count(1) as num
         FROM bs_sgc_df_bzbp bp
-        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
         <where>
             <if test="embankmentName != null and embankmentName != ''">
                 embankment_name like concat('%', #{embankmentName}, '%')

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

@@ -43,7 +43,7 @@
     <select id="getStatistics" resultType="java.util.Map">
         SELECT qh.NAME as name,count(1) as num
         FROM bs_sgc_sz_bzbp bp
-        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000'
+        inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 4) = '00000000'
         <where>
             <if test="wagaName != null and wagaName != ''">
                 waga_name like concat('%', #{wagaName}, '%')