feat: 添加水闸巡检相关接口

shuili-system/src/main/java/com/kms/yxgh/base/SzException.java

@@ -0,0 +1,17 @@
+package com.kms.yxgh.base;
+
+import com.shuili.common.exception.BaseException;
+
+/**
+ * 用户信息异常类
+ *
+ * @author shuili
+ */
+public class SzException extends BaseException {
+
+  private static final long serialVersionUID = 1L;
+
+  public SzException(String message) {
+    super("SZ", "500", null, message);
+  }
+}

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java

@@ -1,16 +1,24 @@
 package com.kms.yxgh.sz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.kms.yxgh.df.domain.entity.DfChecking;
-import com.kms.yxgh.df.service.DfCheckingService;
-import com.shuili.common.core.domain.AjaxResult;
+import com.kms.yxgh.base.Response;
+import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto;
+import com.kms.yxgh.sz.domain.dto.SimpleSzCheckingDto;
+import com.kms.yxgh.sz.domain.entity.SzChecking;
+import com.kms.yxgh.sz.service.SzCheckingService;
+import com.kms.yxgh.util.BeanCopyUtils;
+import com.shuili.common.annotation.Log;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.enums.BusinessType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import java.util.List;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,25 +37,59 @@ import org.springframework.web.bind.annotation.RestController;
 public class SzCheckingController {
 
 
-  private final DfCheckingService dfCheckingService;
+  private final SzCheckingService szCheckingService;
 
   /**
-   * 查询堤防巡视检查列表
+   * 查询水闸巡视检查列表
    */
   @PostMapping("/list")
   @ApiOperation("水闸巡视检查列表")
-  public IPage<DfChecking> list(@RequestBody SearchParam<DfChecking> sp) {
-    return dfCheckingService.selectPage(sp);
+  public IPage<SzChecking> list(@RequestBody SearchParam<SzChecking> sp) {
+    return szCheckingService.selectPage(sp);
+  }
+
+  @PostMapping("/list-simple")
+  @ApiOperation("水闸巡视检查列表-简略信息")
+  public Response<List<SimpleSzCheckingDto>> listSimple(SearchParam<SzChecking> sp) {
+    return Response.ok(
+        BeanCopyUtils.copyList(szCheckingService.selectSimple(sp), SimpleSzCheckingDto.class));
   }
 
 
   /**
-   * 获取堤防巡视检查详细信息
+   * 获取水闸巡视检查详细信息
    */
-  @ApiOperation("水闸巡视检查详情")
+  @ApiOperation(" 水闸巡视检查详情")
   @GetMapping(value = "/{id}")
-  public AjaxResult getInfo(@PathVariable("id") Long id) {
-    return AjaxResult.success(dfCheckingService.getById(id));
+  public Response<SzCheckingDetailDto> getInfo(@PathVariable("id") String id) {
+    return Response.ok(szCheckingService.getDetailById(id));
+  }
+
+  @ApiOperation("水闸巡视检查新增")
+  @Log(title = "水闸巡视检查新增", businessType = BusinessType.INSERT)
+  @PostMapping
+  public Response<SzCheckingDetailDto> add(@RequestBody SzCheckingDetailDto SzChecking) {
+    return Response.ok(szCheckingService.add(SzChecking));
+  }
+
+  /**
+   * 修改水闸巡视检查
+   */
+  @ApiOperation("水闸巡视检查修改")
+  @Log(title = "水闸巡视检查修改", businessType = BusinessType.UPDATE)
+  @PutMapping
+  public Response<SzCheckingDetailDto> edit(@RequestBody SzCheckingDetailDto SzChecking) {
+    return Response.ok(szCheckingService.update(SzChecking));
+  }
+
+  /**
+   * 删除水闸巡视检查
+   */
+  @ApiOperation("水闸巡视检查删除")
+  @Log(title = "水闸巡视检查删除", businessType = BusinessType.DELETE)
+  @DeleteMapping("/{id}")
+  public Response<Boolean> remove(@PathVariable("id") String id) {
+    return Response.ok(szCheckingService.deleteById(id));
   }
 
 

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzPlanController.java

@@ -0,0 +1,104 @@
+package com.kms.yxgh.sz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kms.yxgh.base.Response;
+import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto;
+import com.kms.yxgh.sz.domain.dto.SzPointDto;
+import com.kms.yxgh.sz.domain.entity.SzPlan;
+import com.kms.yxgh.sz.service.SzPlanService;
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 水闸巡视检查计划Controller
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/run/sz/plan")
+@Api(tags = "水闸巡视检查计划")
+public class SzPlanController {
+
+  private final SzPlanService szPlanService;
+
+  /**
+   * 查询水闸巡视检查计划列表
+   */
+  @PostMapping("/list")
+  @ApiOperation("水闸巡视检查计划列表")
+  public IPage<SzPlan> list(@RequestBody SearchParam<SzPlan> sp) {
+    return szPlanService.selectPage(sp);
+  }
+
+
+  /**
+   * 获取水闸巡视检查计划详细信息
+   */
+  @ApiOperation(" 水闸巡视检查计划详情")
+  @GetMapping(value = "/{id}")
+  public Response<SzPlanDetailDto> getInfo(@PathVariable("id") String id) {
+    return Response.ok(szPlanService.getDetailById(id));
+  }
+
+  /**
+   * 新增水闸巡视检查计划
+   */
+  @Log(title = "水闸巡视检查计划新增", businessType = BusinessType.INSERT)
+  @PostMapping
+  @ApiOperation("水闸巡视检查计划新增")
+  public Response<SzPlanDetailDto> add(@RequestBody SzPlanDetailDto SzPlan) {
+    return Response.ok(szPlanService.add(SzPlan));
+  }
+
+  /**
+   * 修改水闸巡视检查计划
+   */
+  @ApiOperation("水闸巡视检查计划修改")
+  @Log(title = "水闸巡视检查计划修改", businessType = BusinessType.UPDATE)
+  @PutMapping
+  public Response<SzPlanDetailDto> edit(@RequestBody SzPlanDetailDto SzPlan) {
+    return Response.ok(szPlanService.update(SzPlan));
+  }
+
+  /**
+   * 删除水闸巡视检查计划
+   */
+  @ApiOperation("水闸巡视检查计划删除")
+  @Log(title = "水闸巡视检查计划删除", businessType = BusinessType.DELETE)
+  @DeleteMapping("/{id}")
+  public Response<Boolean> remove(@PathVariable String id) {
+    return Response.ok(szPlanService.deleteById(id));
+  }
+
+  @ApiOperation("水闸巡视检查计划巡查点设置")
+  @Log(title = "水闸巡视检查计划巡查点设置", businessType = BusinessType.UPDATE)
+  @PostMapping("/points/{id}")
+  public Response<Boolean> addPoints(@PathVariable("id") String id,
+      @RequestBody List<SzPointDto> points) {
+    return Response.ok(szPlanService.addPoints(id, points));
+  }
+
+
+  @ApiOperation("水闸巡视检查计划巡查点位数据")
+  @Log(title = "水闸巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH)
+  @GetMapping("/points/{id}")
+  public Response<List<SzPointDto>> addPoints(@PathVariable("id") String id) {
+    return Response.ok(szPlanService.getPoints(id));
+  }
+}

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java

@@ -0,0 +1,88 @@
+package com.kms.yxgh.sz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kms.yxgh.base.Response;
+import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto;
+import com.kms.yxgh.sz.domain.dto.StartPlan;
+import com.kms.yxgh.sz.domain.entity.SzRecord;
+import com.kms.yxgh.sz.service.SzRecordService;
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 水闸巡视检查记录Controller
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/run/sz/record")
+@Api(tags = "水闸巡视检查记录")
+public class SzRecordController {
+
+  private final SzRecordService szRecordService;
+
+  /**
+   * 查询水闸巡视检查记录列表
+   */
+  @PostMapping("/list")
+  @ApiOperation("水闸巡视检查记录列表")
+  public IPage<SzRecord> list(@RequestBody SearchParam<SzRecord> sp) {
+    return szRecordService.selectPage(sp);
+  }
+
+
+  /**
+   * 获取水闸巡视检查记录详细信息
+   */
+  @ApiOperation(" 水闸巡视检查记录详情")
+  @GetMapping(value = "/{id}")
+  public Response<SzRecordDetailDto> getInfo(@PathVariable("id") String id) {
+    return Response.ok(szRecordService.getDetailById(id));
+  }
+
+  /**
+   * 新增水闸巡视检查记录
+   */
+  @Log(title = "水闸巡视检查记录新增", businessType = BusinessType.INSERT)
+  @PostMapping
+  @ApiOperation("水闸巡视检查记录新增")
+  public Response<SzRecordDetailDto> add(@RequestBody StartPlan startPlan) {
+    return Response.ok(szRecordService.start(startPlan));
+  }
+
+  /**
+   * 修改水闸巡视检查记录
+   */
+  @ApiOperation("水闸巡视检查记录修改")
+  @Log(title = "水闸巡视检查记录修改", businessType = BusinessType.UPDATE)
+  @PutMapping
+  public Response<SzRecordDetailDto> edit(@RequestBody SzRecordDetailDto SzRecord) {
+    return Response.ok(szRecordService.update(SzRecord));
+  }
+
+  /**
+   * 删除水闸巡视检查记录
+   */
+  @ApiOperation("水闸巡视检查记录删除")
+  @Log(title = "水闸巡视检查记录删除", businessType = BusinessType.DELETE)
+  @DeleteMapping("/{id}")
+  public Response<Boolean> remove(@PathVariable String id) {
+    return Response.ok(szRecordService.deleteById(id));
+  }
+
+}

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java

@@ -0,0 +1,56 @@
+package com.kms.yxgh.sz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kms.common.utils.BaseEntityUtils;
+import com.kms.yxgh.base.Response;
+import com.kms.yxgh.sz.domain.entity.SzTrace;
+import com.kms.yxgh.sz.service.SzTraceService;
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 水闸巡视检查检查记录轨迹Controller
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@RestController
+@RequestMapping("/run/sz/trace")
+@Api(tags = "水闸巡视检查检查记录轨迹")
+public class SzTraceController extends BaseController {
+
+  @Autowired
+  private SzTraceService szTraceService;
+
+  /**
+   * 查询水闸巡视检查检查记录轨迹列表
+   */
+  @PostMapping("/list")
+  @ApiOperation("水闸巡视检查检查记录轨迹列表")
+  public IPage list(@RequestBody SearchParam<SzTrace> sp) {
+    return szTraceService.selectPage(sp);
+  }
+
+  /**
+   * 新增水闸巡视检查检查记录轨迹
+   */
+  @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT)
+  @PostMapping
+  @ApiOperation("水闸巡视检查检查记录轨迹新增")
+  public Response<Boolean> add(@RequestBody SzTrace SzTrace) {
+    BaseEntityUtils.preInsert(SzTrace);
+    szTraceService.save(SzTrace);
+    return Response.ok();
+  }
+
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SimpleSzCheckingDto.java

@@ -0,0 +1,23 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 水闸巡视检查简短信息
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@Data
+@ApiModel("水闸巡视检查")
+public class SimpleSzCheckingDto {
+
+  @ApiModelProperty("主键")
+  private String id;
+
+  @ApiModelProperty("巡查名称")
+  private String name;
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/StartPlan.java

@@ -0,0 +1,20 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: StartPlan
+ * @Description: TODO
+ * @Date: 2023/11/15 上午10:43 *
+ * @author: hxh
+ * @version: 1.0
+ */
+@ApiModel("开启水闸巡视检查计划")
+@Data
+public class StartPlan {
+
+  @ApiModelProperty("计划id")
+  private String planId;
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzCheckingDetailDto.java

@@ -0,0 +1,45 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @ClassName: CheckingVo
+ * @Description: TODO
+ * @Date: 2023/11/10 上午11:56 *
+ * @author: hxh
+ * @version: 1.0
+ */
+@Data
+@ApiModel("水闸巡视检查详情")
+public class SzCheckingDetailDto {
+
+  @ApiModelProperty("主键")
+  private String id;
+
+  @ApiModelProperty("巡查名称")
+  private String name;
+
+  @ApiModelProperty("巡查类型")
+  private Long type;
+
+  @ApiModelProperty("检查项")
+  private List<SzCheckingItemDto> items;
+
+
+  @Data
+  public static class SzCheckingItemDto {
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("检查部位")
+    private List<String> parts;
+
+    @ApiModelProperty("检查内容")
+    private String content;
+  }
+
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPlanDetailDto.java

@@ -0,0 +1,64 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+
+/**
+ * 水闸巡视检查计划详情
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@Data
+@ApiModel("水闸巡视检查计划详情")
+public class SzPlanDetailDto {
+
+  @ApiModelProperty("主键")
+  private String id;
+
+  @ApiModelProperty("名称")
+  private String name;
+
+  @ApiModelProperty("巡查ID")
+  private String xcId;
+
+  @ApiModelProperty("巡查类型")
+  private Long type;
+
+  @ApiModelProperty("检查次数")
+  private Long frequency;
+
+  @ApiModelProperty("周期")
+  private Long cycleType;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @ApiModelProperty("提醒时间")
+  private Date reminderTime;
+
+  @ApiModelProperty("附加配置")
+  private JSONObject otherConfig;
+
+  @ApiModelProperty("执行人")
+  private List<OperatorDto> operators;
+
+
+  @Data
+  public static class OperatorDto {
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("用户id")
+    private String uid;
+    @ApiModelProperty("用户名称")
+    private String name;
+
+  }
+
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzPointDto.java

@@ -0,0 +1,29 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 水闸巡视检查计划点位
+ *
+ * @author sy
+ * @date 2023-11-09
+ */
+@Data
+@ApiModel("水闸巡视检查计划点位")
+public class SzPointDto {
+
+  @ApiModelProperty("主键")
+  private String id;
+
+  @ApiModelProperty("经度")
+  private Double longitude;
+
+  @ApiModelProperty("纬度")
+  private Double latitude;
+
+  @ApiModelProperty("海拔")
+  private Double altitude;
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/dto/SzRecordDetailDto.java

@@ -0,0 +1,54 @@
+package com.kms.yxgh.sz.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @ClassName: SzRecordDetailDto
+ * @Description: TODO
+ * @Date: 2023/11/15 上午10:36 *
+ * @author: hxh
+ * @version: 1.0
+ */
+
+@Data
+@ApiModel("水闸巡视检查记录详情")
+public class SzRecordDetailDto {
+
+  @ApiModelProperty("巡查记录")
+  private String id;
+
+  @ApiModelProperty("巡查计划ID")
+  private String planId;
+
+  @ApiModelProperty("巡查记录名称")
+  private String name;
+
+  @ApiModelProperty("状态")
+  private Long status;
+
+  @ApiModelProperty("巡查项")
+  private List<SzRecordItemDto> items;
+
+  @Data
+
+  public static class SzRecordItemDto {
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("检查部位")
+    private List<String> parts;
+
+    @ApiModelProperty("检查内容")
+    private String content;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @ApiModelProperty("存在问题")
+    private String problem;
+  }
+}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,40 +19,52 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xs")
 @Data
 @ApiModel("水闸巡视检查")
-public class SzChecking extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 巡查名称 */
-    @Excel(name = "巡查名称")
-    @ApiModelProperty("巡查名称")
-    private String name;
-
-    /** 巡查类型 */
-    @Excel(name = "巡查类型")
-    @ApiModelProperty("巡查类型")
-    private Long type;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
-
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+public class SzChecking extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 巡查名称
+   */
+  @Excel(name = "巡查名称")
+  @ApiModelProperty("巡查名称")
+  private String name;
+
+  /**
+   * 巡查类型
+   */
+  @Excel(name = "巡查类型")
+  @ApiModelProperty("巡查类型")
+  private Long type;
+
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
+
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
+
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
+
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsx")
 @Data
 @ApiModel("水闸巡视检查项")
-public class SzCheckingItem extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
+public class SzCheckingItem extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
 
-    /** 巡查ID */
-    @Excel(name = "巡查ID")
-    @ApiModelProperty("巡查ID")
-    private Long xcId;
+  /**
+   * 巡查ID
+   */
+  @Excel(name = "巡查ID")
+  @ApiModelProperty("巡查ID")
+  private String xcId;
 
-    /** 检查部位 */
-    @Excel(name = "检查部位")
-    @ApiModelProperty("检查部位")
-    private String parts;
+  /**
+   * 检查部位
+   */
+  @Excel(name = "检查部位")
+  @ApiModelProperty("检查部位")
+  private String parts;
 
-    /** 检查内容 */
-    @Excel(name = "检查内容")
-    @ApiModelProperty("检查内容")
-    private String content;
+  /**
+   * 检查内容
+   */
+  @Excel(name = "检查内容")
+  @ApiModelProperty("检查内容")
+  private String content;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
 
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
 
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,61 +19,88 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsjh")
 @Data
 @ApiModel("水闸巡视检查计划")
-public class SzPlan extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 巡查ID */
-    @Excel(name = "巡查ID")
-    @ApiModelProperty("巡查ID")
-    private Long xcId;
-
-    /** 巡查类型 */
-    @Excel(name = "巡查类型")
-    @ApiModelProperty("巡查类型")
-    private Long type;
-
-    /** 检查次数 */
-    @Excel(name = "检查次数")
-    @ApiModelProperty("检查次数")
-    private Long frequency;
-
-    /** 周期 */
-    @Excel(name = "周期")
-    @ApiModelProperty("周期")
-    private Long cycleType;
-
-    /** 提醒时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("提醒时间")
-    private Date reminderTime;
-
-    /** 附加配置 */
-    @Excel(name = "附加配置")
-    @ApiModelProperty("附加配置")
-    private String otherConfig;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
-
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+public class SzPlan extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 巡查ID
+   */
+  @Excel(name = "巡查ID")
+  @ApiModelProperty("巡查ID")
+  private String xcId;
+
+  /**
+   * 名称
+   */
+  @Excel(name = "名称")
+  @ApiModelProperty("名称")
+  private String name;
+
+  /**
+   * 巡查类型
+   */
+  @Excel(name = "巡查类型")
+  @ApiModelProperty("巡查类型")
+  private Long type;
+
+  /**
+   * 检查次数
+   */
+  @Excel(name = "检查次数")
+  @ApiModelProperty("检查次数")
+  private Long frequency;
+
+  /**
+   * 周期
+   */
+  @Excel(name = "周期")
+  @ApiModelProperty("周期")
+  private Long cycleType;
+
+  /**
+   * 提醒时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("提醒时间")
+  private Date reminderTime;
+
+  /**
+   * 附加配置
+   */
+  @Excel(name = "附加配置")
+  @ApiModelProperty("附加配置")
+  private String otherConfig;
+
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
+
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
+
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
+
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java

@@ -2,8 +2,8 @@ package com.kms.yxgh.sz.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
-import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -19,7 +19,7 @@ import lombok.Data;
 @TableName("bs_sgc_sz_xsjhzx")
 @Data
 @ApiModel("水闸巡视检查计划执行人")
-public class SzPlanOperator extends BaseEntity {
+public class SzPlanOperator extends SyBaseEntity {
 
   private static final long serialVersionUID = 1L;
 
@@ -28,7 +28,7 @@ public class SzPlanOperator extends BaseEntity {
    */
   @Excel(name = "巡查计划ID")
   @ApiModelProperty("巡查计划ID")
-  private Long planId;
+  private String planId;
 
   /**
    * 执行人
@@ -57,7 +57,7 @@ public class SzPlanOperator extends BaseEntity {
   @JsonFormat(pattern = "yyyy-MM-dd")
   @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
   @ApiModelProperty("创建时间")
-  private Date createDate;
+  private Date createTime;
 
   /**
    * 最近修改人
@@ -72,6 +72,6 @@ public class SzPlanOperator extends BaseEntity {
   @JsonFormat(pattern = "yyyy-MM-dd")
   @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
   @ApiModelProperty("最近修改时间")
-  private Date updateDate;
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,50 +19,66 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsjhdw")
 @Data
 @ApiModel("水闸巡视检查计划点位")
-public class SzPoint extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
+public class SzPoint extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
 
-    /** 巡查计划ID */
-    @Excel(name = "巡查计划ID")
-    @ApiModelProperty("巡查计划ID")
-    private Long planId;
+  /**
+   * 巡查计划ID
+   */
+  @Excel(name = "巡查计划ID")
+  @ApiModelProperty("巡查计划ID")
+  private String planId;
 
-    /** 经度 */
-    @Excel(name = "经度")
-    @ApiModelProperty("经度")
-    private Double longitude;
+  /**
+   * 经度
+   */
+  @Excel(name = "经度")
+  @ApiModelProperty("经度")
+  private Long longitude;
 
-    /** 纬度 */
-    @Excel(name = "纬度")
-    @ApiModelProperty("纬度")
-    private Double latitude;
+  /**
+   * 纬度
+   */
+  @Excel(name = "纬度")
+  @ApiModelProperty("纬度")
+  private Long latitude;
 
-    /** 海拔 */
-    @Excel(name = "海拔")
-    @ApiModelProperty("海拔")
-    private Double altitude;
+  /**
+   * 海拔
+   */
+  @Excel(name = "海拔")
+  @ApiModelProperty("海拔")
+  private Long altitude;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
 
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
 
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,45 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsjhjl")
 @Data
 @ApiModel("水闸巡视检查记录")
-public class SzRecord extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
+public class SzRecord extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
 
-    /** 巡查计划ID */
-    @Excel(name = "巡查计划ID")
-    @ApiModelProperty("巡查计划ID")
-    private Long planId;
+  /**
+   * 巡查计划ID
+   */
+  @Excel(name = "巡查计划ID")
+  @ApiModelProperty("巡查计划ID")
+  private String planId;
 
-    /** 巡查记录名称 */
-    @Excel(name = "巡查记录名称")
-    @ApiModelProperty("巡查记录名称")
-    private String name;
+  /**
+   * 巡查记录名称
+   */
+  @Excel(name = "巡查记录名称")
+  @ApiModelProperty("巡查记录名称")
+  private String name;
 
-    /** 状态 */
-    @Excel(name = "状态")
-    @ApiModelProperty("状态")
-    private Long status;
+  /**
+   * 状态
+   */
+  @Excel(name = "状态")
+  @ApiModelProperty("状态")
+  private Long status;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
 
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
 
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,55 +19,73 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsjhjlz")
 @Data
 @ApiModel("水闸巡视检查检查记录子项")
-public class SzRecordItem extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
+public class SzRecordItem extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
 
-    /** 巡查记录ID */
-    @Excel(name = "巡查记录ID")
-    @ApiModelProperty("巡查记录ID")
-    private Long recordId;
+  /**
+   * 巡查记录ID
+   */
+  @Excel(name = "巡查记录ID")
+  @ApiModelProperty("巡查记录ID")
+  private String recordId;
 
-    /** 检查部位 */
-    @Excel(name = "检查部位")
-    @ApiModelProperty("检查部位")
-    private String parts;
+  /**
+   * 检查部位
+   */
+  @Excel(name = "检查部位")
+  @ApiModelProperty("检查部位")
+  private String parts;
 
-    /** 检查内容 */
-    @Excel(name = "检查内容")
-    @ApiModelProperty("检查内容")
-    private String content;
+  /**
+   * 检查内容
+   */
+  @Excel(name = "检查内容")
+  @ApiModelProperty("检查内容")
+  private String content;
 
-    /** 状态 */
-    @Excel(name = "状态")
-    @ApiModelProperty("状态")
-    private Long status;
+  /**
+   * 状态
+   */
+  @Excel(name = "状态")
+  @ApiModelProperty("状态")
+  private Integer status;
 
-    /** 存在问题 */
-    @Excel(name = "存在问题")
-    @ApiModelProperty("存在问题")
-    private String problem;
+  /**
+   * 存在问题
+   */
+  @Excel(name = "存在问题")
+  @ApiModelProperty("存在问题")
+  private String problem;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
 
-    /** 最近修改人 */
-    @Excel(name = "最近修改人")
-    @ApiModelProperty("最近修改人")
-    private String updateUid;
+  /**
+   * 最近修改人
+   */
+  @Excel(name = "最近修改人")
+  @ApiModelProperty("最近修改人")
+  private String updateUid;
 
-    /** 最近修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("最近修改时间")
-    private Date updateDate;
+  /**
+   * 最近修改时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("最近修改时间")
+  private Date updateTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java

@@ -1,15 +1,13 @@
 package com.kms.yxgh.sz.domain.entity;
 
-import com.shuili.common.core.domain.BaseEntity;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.base.SyBaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
 
 
 /**
@@ -21,39 +19,51 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_sz_xsjhjgj")
 @Data
 @ApiModel("水闸巡视检查检查记录轨迹")
-public class SzTrace extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 巡查记录ID */
-    @Excel(name = "巡查记录ID")
-    @ApiModelProperty("巡查记录ID")
-    private Long recordId;
-
-    /** 经度 */
-    @Excel(name = "经度")
-    @ApiModelProperty("经度")
-    private Double longitude;
-
-    /** 纬度 */
-    @Excel(name = "纬度")
-    @ApiModelProperty("纬度")
-    private Double latitude;
-
-    /** 海拔 */
-    @Excel(name = "海拔")
-    @ApiModelProperty("海拔")
-    private Double altitude;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    @ApiModelProperty("创建人")
-    private String createUid;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
+public class SzTrace extends SyBaseEntity {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 巡查记录ID
+   */
+  @Excel(name = "巡查记录ID")
+  @ApiModelProperty("巡查记录ID")
+  private String recordId;
+
+  /**
+   * 经度
+   */
+  @Excel(name = "经度")
+  @ApiModelProperty("经度")
+  private Long longitude;
+
+  /**
+   * 纬度
+   */
+  @Excel(name = "纬度")
+  @ApiModelProperty("纬度")
+  private Long latitude;
+
+  /**
+   * 海拔
+   */
+  @Excel(name = "海拔")
+  @ApiModelProperty("海拔")
+  private Long altitude;
+
+  /**
+   * 创建人
+   */
+  @Excel(name = "创建人")
+  @ApiModelProperty("创建人")
+  private String createUid;
+
+  /**
+   * 创建时间
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+  @ApiModelProperty("创建时间")
+  private Date createTime;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingItemMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzCheckingItem;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查项Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzChecking;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzPlan;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查计划Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPlanOperatorMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzPlanOperator;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查计划执行人Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzPointMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzPoint;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查计划点位Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordItemMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzRecordItem;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查检查记录子项Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzRecord;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查记录Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzTraceMapper.java

@@ -1,8 +1,8 @@
 package com.kms.yxgh.sz.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.sz.domain.entity.SzTrace;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 水闸巡视检查检查记录轨迹Mapper接口

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java

@@ -1,9 +1,29 @@
 package com.kms.yxgh.sz.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.common.utils.BaseEntityUtils;
+import com.kms.yxgh.base.SzException;
+import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto.SzCheckingItemDto;
+import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto;
 import com.kms.yxgh.sz.domain.entity.SzChecking;
+import com.kms.yxgh.sz.domain.entity.SzCheckingItem;
+import com.kms.yxgh.sz.mapper.SzCheckingItemMapper;
 import com.kms.yxgh.sz.mapper.SzCheckingMapper;
+import com.kms.yxgh.util.BeanCopyUtils;
+import com.kms.yxgh.util.StreamUtils;
+import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.exception.BaseException;
+import com.shuili.common.utils.StringUtils;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 水闸巡视检查Service接口
@@ -12,6 +32,124 @@ import org.springframework.stereotype.Service;
  * @date 2023-11-09
  */
 @Service
-public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>{
+@AllArgsConstructor
+public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking> {
+
+  private final SzCheckingItemMapper SzCheckingItemMapper;
+  public final static String PART_SEPARATOR = ":";
+
+  public List<SzChecking> selectSimple(SearchParam<SzChecking> sp) {
+    Wrapper<SzChecking> wp = Wrappers.<SzChecking>lambdaQuery()
+        .select(SzChecking::getId, SzChecking::getName)
+        .eq(SzChecking::getType, sp.getData().getType());
+    return getBaseMapper().selectList(wp);
+  }
+
+
+  public SzCheckingDetailDto getDetailById(String id) {
+    SzChecking checking = this.getById(id);
+    SzCheckingDetailDto dto = BeanCopyUtils.copy(checking, SzCheckingDetailDto.class);
+    if (dto != null) {
+      Wrapper<SzCheckingItem> wp = Wrappers.<SzCheckingItem>lambdaQuery()
+          .select(SzCheckingItem::getId, SzCheckingItem::getParts, SzCheckingItem::getContent)
+          .eq(SzCheckingItem::getXcId, id);
+      dto.setItems(StreamUtils.toList(SzCheckingItemMapper.selectList(wp), (o) -> {
+        SzCheckingItemDto itemDto = new SzCheckingItemDto();
+        itemDto.setContent(o.getContent());
+        itemDto.setId(o.getId());
+        itemDto.setParts(Arrays.stream(StringUtils.split(o.getParts(), PART_SEPARATOR))
+            .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()));
+        return itemDto;
+      }));
+    }
+    return dto;
+  }
+
+
+  @Transactional(rollbackFor = Exception.class)
+  public SzCheckingDetailDto add(SzCheckingDetailDto dto) {
+    SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class);
+    if (checking != null) {
+      if (checkNameDistinct(checking.getId(), checking.getName())) {
+        BaseEntityUtils.preInsert(checking);
+        getBaseMapper().insert(checking);
+        String id = checking.getId();
+        if (CollectionUtil.isNotEmpty(dto.getItems())) {
+          dto.getItems().forEach((o) -> {
+            SzCheckingItem item = new SzCheckingItem();
+            item.setXcId(id);
+            item.setContent(o.getContent());
+            item.setParts(String.join(PART_SEPARATOR, o.getParts()));
+            BaseEntityUtils.preInsert(item);
+            SzCheckingItemMapper.insert(item);
+          });
+        }
+        return this.getDetailById(id);
+      } else {
+        throw new SzException("存在相同的名称");
+      }
+
+    }
+    return null;
+  }
+
+  @Transactional(rollbackFor = Exception.class)
+  public SzCheckingDetailDto update(SzCheckingDetailDto dto) {
+    if (exist(dto.getId())) {
+      SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class);
+      if (checking != null) {
+        if (checkNameDistinct(checking.getId(), checking.getName())) {
+          BaseEntityUtils.preUpdate(checking);
+          getBaseMapper().updateById(checking);
+          String id = checking.getId();
+          deleteItems(id);
+          if (CollectionUtil.isNotEmpty(dto.getItems())) {
+            dto.getItems().forEach((o) -> {
+              SzCheckingItem item = new SzCheckingItem();
+              item.setXcId(id);
+              item.setContent(o.getContent());
+              item.setParts(String.join(PART_SEPARATOR, o.getParts()));
+              BaseEntityUtils.preInsert(item);
+              SzCheckingItemMapper.insert(item);
+            });
+          }
+          return this.getDetailById(id);
+        } else {
+          throw new SzException("存在相同的名称");
+        }
+      }
+    }
+    throw new BaseException("源数据不存在，请确认id值是否正确");
+
+  }
+
+
+  @Transactional(rollbackFor = Exception.class)
+  public Boolean deleteById(String id) {
+    boolean rt = removeById(id);
+    if (rt) {
+      deleteItems(id);
+    }
+    return rt;
+  }
+
+  private void deleteItems(String id) {
+    Wrapper<SzCheckingItem> wp = Wrappers.<SzCheckingItem>lambdaQuery()
+        .eq(SzCheckingItem::getXcId, id);
+    SzCheckingItemMapper.delete(wp);
+  }
+
+  private boolean checkNameDistinct(String id, String name) {
+    Wrapper<SzChecking> wp = Wrappers.<SzChecking>lambdaQuery()
+        .eq(SzChecking::getName, name)
+        .ne(StringUtils.isNotEmpty(id), SzChecking::getId, id);
+    return this.getBaseMapper().selectCount(wp) <= 0;
+  }
+
+  private boolean exist(String id) {
+    Wrapper<SzChecking> wp = Wrappers.<SzChecking>lambdaQuery()
+        .eq(SzChecking::getId, id);
+    return this.getBaseMapper().selectCount(wp) > 0;
+  }
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java

@@ -1,9 +1,30 @@
 package com.kms.yxgh.sz.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.common.utils.BaseEntityUtils;
+import com.kms.yxgh.base.SzException;
+import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto.OperatorDto;
+import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto;
+import com.kms.yxgh.sz.domain.dto.SzPointDto;
 import com.kms.yxgh.sz.domain.entity.SzPlan;
+import com.kms.yxgh.sz.domain.entity.SzPlanOperator;
+import com.kms.yxgh.sz.domain.entity.SzPoint;
 import com.kms.yxgh.sz.mapper.SzPlanMapper;
+import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper;
+import com.kms.yxgh.sz.mapper.SzPointMapper;
+import com.kms.yxgh.util.BeanCopyUtils;
+import com.kms.yxgh.util.StreamUtils;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.exception.BaseException;
+import com.shuili.common.utils.StringUtils;
+import java.util.List;
+import java.util.function.Consumer;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 水闸巡视检查计划Service接口
@@ -12,6 +33,140 @@ import org.springframework.stereotype.Service;
  * @date 2023-11-09
  */
 @Service
-public class SzPlanService extends BaseService<SzPlanMapper, SzPlan>{
+@AllArgsConstructor
+public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
 
+  private final SzPlanOperatorMapper SzPlanOperatorMapper;
+  private final SzPointMapper SzPointMapper;
+
+  public SzPlanDetailDto getDetailById(String id) {
+    SzPlan SzPlan = this.getById(id);
+    SzPlanDetailDto dto = BeanCopyUtils.copy(SzPlan, SzPlanDetailDto.class);
+    if (dto != null) {
+      dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig()));
+      Wrapper<SzPlanOperator> wp = Wrappers.<SzPlanOperator>lambdaQuery()
+          .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid)
+          .eq(SzPlanOperator::getPlanId, id);
+      dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> {
+        OperatorDto itemDto = new OperatorDto();
+        itemDto.setId(o.getId());
+        itemDto.setUid(o.getOperatorUid());
+        itemDto.setName(o.getOperatorName());
+        return itemDto;
+      }));
+    }
+    return dto;
+  }
+
+
+  @Transactional(rollbackFor = Exception.class)
+  public SzPlanDetailDto add(SzPlanDetailDto dto) {
+    SzPlan SzPlan = BeanCopyUtils.copy(dto, SzPlan.class);
+    if (SzPlan != null) {
+      if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) {
+        SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
+        BaseEntityUtils.preInsert(SzPlan);
+        getBaseMapper().insert(SzPlan);
+        String id = SzPlan.getId();
+        if (CollectionUtil.isNotEmpty(dto.getOperators())) {
+          dto.getOperators().forEach(insertOperator(id));
+        }
+        return this.getDetailById(id);
+      } else {
+        throw new SzException("存在相同的名称");
+      }
+
+    }
+    return null;
+  }
+
+  private Consumer<OperatorDto> insertOperator(String id) {
+    return (o) -> {
+      SzPlanOperator item = new SzPlanOperator();
+      item.setPlanId(id);
+      item.setOperatorName(o.getName());
+      item.setOperatorUid(o.getUid());
+      BaseEntityUtils.preInsert(item);
+      SzPlanOperatorMapper.insert(item);
+    };
+  }
+
+  @Transactional(rollbackFor = Exception.class)
+  public SzPlanDetailDto update(SzPlanDetailDto dto) {
+    if (exist(dto.getId())) {
+      SzPlan SzPlan = BeanCopyUtils.copy(dto, SzPlan.class);
+      if (SzPlan != null) {
+        if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) {
+          SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
+          BaseEntityUtils.preUpdate(SzPlan);
+          getBaseMapper().updateById(SzPlan);
+          String id = SzPlan.getId();
+          deleteItems(id);
+          if (CollectionUtil.isNotEmpty(dto.getOperators())) {
+            dto.getOperators().forEach(insertOperator(id));
+          }
+          return this.getDetailById(id);
+        } else {
+          throw new SzException("存在相同的名称");
+        }
+      }
+    }
+    throw new BaseException("源数据不存在，请确认id值是否正确");
+
+  }
+
+
+  @Transactional(rollbackFor = Exception.class)
+  public Boolean deleteById(String id) {
+    boolean rt = removeById(id);
+    if (rt) {
+      deleteItems(id);
+    }
+    return rt;
+  }
+
+  @Transactional(rollbackFor = Exception.class)
+  public Boolean addPoints(String id, List<SzPointDto> points) {
+    Wrapper<SzPoint> wp = Wrappers.<SzPoint>lambdaQuery()
+        .eq(SzPoint::getPlanId, id);
+    SzPointMapper.delete(wp);
+    if (CollectionUtil.isNotEmpty(points)) {
+      points.forEach(po -> {
+        SzPoint point = BeanCopyUtils.copy(po, SzPoint.class);
+        if (point != null) {
+          point.setPlanId(id);
+          BaseEntityUtils.preInsert(point);
+          SzPointMapper.insert(point);
+        }
+      });
+    }
+    return true;
+  }
+
+
+  public List<SzPointDto> getPoints(String id) {
+    Wrapper<SzPoint> wp = Wrappers.<SzPoint>lambdaQuery()
+        .eq(SzPoint::getPlanId, id);
+    return StreamUtils.toList(SzPointMapper.selectList(wp),
+        (o) -> BeanCopyUtils.copy(o, SzPointDto.class));
+  }
+
+  private void deleteItems(String id) {
+    Wrapper<SzPlanOperator> wp = Wrappers.<SzPlanOperator>lambdaQuery()
+        .eq(SzPlanOperator::getPlanId, id);
+    SzPlanOperatorMapper.delete(wp);
+  }
+
+  private boolean checkNameDistinct(String id, String name) {
+    Wrapper<SzPlan> wp = Wrappers.<SzPlan>lambdaQuery()
+        .eq(SzPlan::getName, name)
+        .ne(StringUtils.isNotEmpty(id), SzPlan::getId, id);
+    return this.getBaseMapper().selectCount(wp) <= 0;
+  }
+
+  private boolean exist(String id) {
+    Wrapper<SzPlan> wp = Wrappers.<SzPlan>lambdaQuery()
+        .eq(SzPlan::getId, id);
+    return this.getBaseMapper().selectCount(wp) > 0;
+  }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

@@ -1,9 +1,35 @@
 package com.kms.yxgh.sz.service;
 
+import static com.kms.yxgh.sz.service.SzCheckingService.PART_SEPARATOR;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.common.utils.BaseEntityUtils;
+import com.kms.yxgh.base.enums.CheckingStatus;
+import com.kms.yxgh.base.enums.RecordStatus;
+import com.kms.yxgh.sz.domain.dto.StartPlan;
+import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto;
+import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto;
+import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto;
+import com.kms.yxgh.sz.domain.dto.SzRecordDetailDto.SzRecordItemDto;
 import com.kms.yxgh.sz.domain.entity.SzRecord;
+import com.kms.yxgh.sz.domain.entity.SzRecordItem;
+import com.kms.yxgh.sz.mapper.SzRecordItemMapper;
 import com.kms.yxgh.sz.mapper.SzRecordMapper;
+import com.kms.yxgh.util.BeanCopyUtils;
+import com.kms.yxgh.util.StreamUtils;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.exception.BaseException;
+import com.shuili.common.utils.DateUtils;
+import com.shuili.common.utils.StringUtils;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 水闸巡视检查记录Service接口
@@ -12,6 +38,95 @@ import org.springframework.stereotype.Service;
  * @date 2023-11-09
  */
 @Service
-public class SzRecordService extends BaseService<SzRecordMapper, SzRecord>{
+@AllArgsConstructor
+public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
+
+  private final SzRecordItemMapper SzRecordItemMapper;
+  private final SzCheckingService SzCheckingService;
+  private final SzPlanService SzPlanService;
+
+  @Transactional(rollbackFor = Exception.class)
+  public SzRecordDetailDto start(StartPlan startPlan) {
+    SzPlanDetailDto planDetailDto = SzPlanService.getDetailById(startPlan.getPlanId());
+    if (planDetailDto != null) {
+      SzCheckingDetailDto checkingDetailDto = SzCheckingService.getDetailById(
+          planDetailDto.getXcId());
+      if (checkingDetailDto != null) {
+        SzRecord record = new SzRecord();
+        record.setPlanId(startPlan.getPlanId());
+        record.setName(planDetailDto.getName() + DateUtils.dateTimeNow());
+        record.setStatus(RecordStatus.CHECKING.getValue());
+        BaseEntityUtils.preInsert(record);
+        String id = record.getId();
+        if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) {
+          checkingDetailDto.getItems().forEach(o -> {
+            SzRecordItem item = new SzRecordItem();
+            item.setRecordId(id);
+            item.setContent(o.getContent());
+            item.setParts(String.join(PART_SEPARATOR, o.getParts()));
+            item.setStatus(CheckingStatus.NORMAL.getValue());
+            item.setRecordId("");
+            BaseEntityUtils.preInsert(item);
+            SzRecordItemMapper.insert(item);
+          });
+        }
+        return this.getDetailById(id);
+      } else {
+        throw new BaseException("查询巡查检查项数据异常");
+      }
+    }
+    throw new BaseException("查询巡查计划");
+  }
+
+  public SzRecordDetailDto getDetailById(String id) {
+    SzRecord record = this.getBaseMapper().selectById(id);
+    if (record != null) {
+      SzRecordDetailDto dto = BeanCopyUtils.copy(record, SzRecordDetailDto.class);
+      Wrapper<SzRecordItem> wp = Wrappers.<SzRecordItem>lambdaQuery()
+          .eq(SzRecordItem::getRecordId, id);
+      List<SzRecordItem> items = SzRecordItemMapper.selectList(wp);
+      if (CollectionUtil.isNotEmpty(items) && dto != null) {
+        dto.setItems(StreamUtils.toList(items, r -> {
+          SzRecordItemDto itemDto = BeanCopyUtils.copy(r, SzRecordItemDto.class);
+          if (itemDto != null) {
+            itemDto.setParts(Arrays.stream(StringUtils.split(r.getParts(), PART_SEPARATOR))
+                .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()));
+          }
+          return itemDto;
+        }));
+        return dto;
+      }
+    }
+    return null;
+  }
+
+  public SzRecordDetailDto update(SzRecordDetailDto SzRecord) {
+    if (CollectionUtil.isNotEmpty(SzRecord.getItems())) {
+      SzRecord.getItems().forEach(o -> {
+        SzRecordItem item = new SzRecordItem();
+        item.setRecordId(SzRecord.getId());
+        item.setContent(o.getContent());
+        item.setParts(String.join(PART_SEPARATOR, o.getParts()));
+        item.setStatus(o.getStatus());
+        item.setProblem(o.getProblem());
+        BaseEntityUtils.preUpdate(item);
+        SzRecordItemMapper.updateById(item);
+      });
+    }
+    return SzRecord;
+  }
+
+  public Boolean deleteById(String id) {
+    boolean rt = removeById(id);
+    if (rt) {
+      deleteItems(id);
+    }
+    return rt;
+  }
 
+  private void deleteItems(String id) {
+    Wrapper<SzRecordItem> wp = Wrappers.<SzRecordItem>lambdaQuery()
+        .eq(SzRecordItem::getRecordId, id);
+    SzRecordItemMapper.delete(wp);
+  }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzTraceService.java

@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-11-09
  */
 @Service
-public class SzTraceService extends BaseService<SzTraceMapper, SzTrace> {
+public class SzTraceService extends BaseService<SzTraceMapper, SzTrace>{
 
 }