工程状况

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

@@ -8,6 +8,7 @@ import com.kms.yg.df.domain.BsSgcDfGcgl;
 import com.kms.yg.df.service.BsSgcDfGcglService;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -102,7 +103,22 @@ public class BsSgcDfGcglController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcDfGcgl bsSgcDfGcgl)
     {
-        return toAjax(bsSgcDfGcglService.updateById(bsSgcDfGcgl));
+        String id = bsSgcDfGcgl.getId();
+        BsSgcDfGcgl byId = bsSgcDfGcglService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        bsSgcDfGcglService.updateById(byId);
+
+        bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcDfGcgl.setRecordLoseEfficacyTime(null);
+        bsSgcDfGcgl.setId("");
+
+        BsSgcDfGcgl gcgl = new BsSgcDfGcgl();
+
+        BeanUtils.copyProperties(bsSgcDfGcgl,gcgl);
+        BaseEntityUtils.preInsert(gcgl);
+
+
+        return toAjax(bsSgcDfGcglService.save(gcgl));
     }
 
     /**

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

@@ -4,10 +4,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.yg.df.domain.BsSgcDfJbxx;
 import com.kms.yg.df.service.BsSgcDfJbxxService;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -88,6 +90,18 @@ public class BsSgcDfJbxxController extends BaseController
     @ApiOperation("堤防基本信息新增")
     public AjaxResult add(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
     {
+        String embankmentCode = bsSgcDfJbxx.getEmbankmentCode();
+
+        QueryWrapper<BsSgcDfJbxx> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.eq("EBANKMENT_CODE", embankmentCode);
+
+        BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper);
+        if (one != null) {
+            return AjaxResult.error("该堤防编码已存在");
+        }
+
+
         BaseEntityUtils.preInsert(bsSgcDfJbxx);
         bsSgcDfJbxx.setRecordTakeEffectTime(new Date());
         return toAjax(bsSgcDfJbxxService.save(bsSgcDfJbxx));
@@ -101,7 +115,23 @@ public class BsSgcDfJbxxController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
     {
-        return toAjax(bsSgcDfJbxxService.updateById(bsSgcDfJbxx));
+        String id = bsSgcDfJbxx.getId();
+        BsSgcDfJbxx byId = bsSgcDfJbxxService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        bsSgcDfJbxxService.updateById(byId);
+
+
+        bsSgcDfJbxx.setRecordTakeEffectTime(new Date());
+        bsSgcDfJbxx.setRecordLoseEfficacyTime(null);
+        bsSgcDfJbxx.setId("");
+
+        BsSgcDfJbxx jbxx = new BsSgcDfJbxx();
+
+        BeanUtils.copyProperties(bsSgcDfJbxx, jbxx);
+        BaseEntityUtils.preInsert(jbxx);
+
+
+        return toAjax(bsSgcDfJbxxService.save(jbxx));
     }
 
     /**

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

@@ -29,9 +29,9 @@ public class BsSgcDfBzbp extends BaseEntity
     private String markName;
 
     /** 堤防id */
-    @Excel(name = "堤防id")
+    @Excel(name = "堤防编码")
-    @ApiModelProperty("堤防id")
+    @ApiModelProperty("堤防编码")
-    private String embankmentId;
+    private String embankmentCode;
 
     /** 标识位置 */
     @Excel(name = "标识位置")

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

@@ -205,4 +205,7 @@ public class BsSgcDfGcgl extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recordLoseEfficacyTime;
 
+
+    private String embankmentCode;
+
 }

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

@@ -4,10 +4,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.kms.yg.sz.service.BsSgcSzGcdaService;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -88,6 +90,16 @@ public class BsSgcSzGcdaController extends BaseController
     @ApiOperation("水闸工程基础信息新增")
     public AjaxResult add(@RequestBody BsSgcSzGcda bsSgcSzGcda)
     {
+        String sluiceCode = bsSgcSzGcda.getSluiceCode();
+
+        QueryWrapper<BsSgcSzGcda> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper);
+        if (one != null){
+            return AjaxResult.error("水闸编码已存在");
+        }
+
         BaseEntityUtils.preInsert(bsSgcSzGcda);
         bsSgcSzGcda.setRecordTakeEffectTime(new Date());
         return toAjax(bsSgcSzGcdaService.save(bsSgcSzGcda));
@@ -101,7 +113,20 @@ public class BsSgcSzGcdaController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcSzGcda bsSgcSzGcda)
     {
-        return toAjax(bsSgcSzGcdaService.updateById(bsSgcSzGcda));
+        String id = bsSgcSzGcda.getId();
+        BsSgcSzGcda byId = bsSgcSzGcdaService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        bsSgcSzGcdaService.updateById(byId);
+
+        bsSgcSzGcda.setRecordTakeEffectTime(new Date());
+        bsSgcSzGcda.setRecordLoseEfficacyTime(null);
+        bsSgcSzGcda.setId("");
+
+        BsSgcSzGcda gcda = new BsSgcSzGcda();
+        BeanUtils.copyProperties(bsSgcSzGcda,gcda);
+
+        BaseEntityUtils.preInsert(gcda);
+        return toAjax(bsSgcSzGcdaService.save(gcda));
     }
 
     /**

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

@@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzGcgl;
 import com.kms.yg.sz.service.BsSgcSzGcglService;
 import com.shuili.common.core.controller.BaseController;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
 import com.shuili.common.utils.poi.ExcelUtil;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -101,7 +102,22 @@ public class BsSgcSzGcglController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcSzGcgl bsSgcSzGcgl)
     {
-        return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl));
+
+        String id = bsSgcSzGcgl.getId();
+        BsSgcSzGcgl byId = bsSgcSzGcglService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        bsSgcSzGcglService.updateById(byId);
+
+        bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcSzGcgl.setRecordLoseEfficacyTime(null);
+        bsSgcSzGcgl.setId("");
+
+        BsSgcSzGcgl gcgl = new BsSgcSzGcgl();
+
+        BeanUtils.copyProperties(bsSgcSzGcgl,gcgl);
+        BaseEntityUtils.preInsert(gcgl);
+
+        return toAjax(bsSgcSzGcglService.save(gcgl));
     }
 
     /**

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

@@ -29,9 +29,9 @@ public class BsSgcSzBzbp extends BaseEntity
     private String markName;
 
     /** 水闸id */
-    @Excel(name = "水闸id")
+    @Excel(name = "水闸编码")
-    @ApiModelProperty("水闸id")
+    @ApiModelProperty("水闸编码")
-    private String suliceId;
+    private String sluiceCode;
 
     /** 标识位置 */
     @Excel(name = "标识位置")

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

@@ -205,4 +205,6 @@ public class BsSgcSzGcgl extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recordLoseEfficacyTime;
 
+    private String sluiceCode;
+
 }