Browse Source

feat: 调整主键生成规则

master_tdsql
hxh 1 year ago
parent
commit
42a50e51c2
  1. 21
      shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java
  2. 21
      shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java
  3. 7
      shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java
  4. 92
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java
  5. 90
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java
  6. 149
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java
  7. 99
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java
  8. 100
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java
  9. 90
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java
  10. 110
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java
  11. 4
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java
  12. 150
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
  13. 99
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java

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

@ -0,0 +1,21 @@
package com.kms.yxgh.base;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.shuili.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @ClassName: SyBaseEntity
* @Description: TODO
* @Date: 2023/11/14 下午6:57 *
* @author: hxh
* @version: 1.0
*/
@Data
public class SyBaseEntity extends BaseEntity {
@TableId(type = IdType.AUTO)
protected String id;
}

21
shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java

@ -52,8 +52,8 @@ public class DfPlanController {
*/ */
@ApiOperation(" 堤防巡视检查计划详情") @ApiOperation(" 堤防巡视检查计划详情")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public Response<DfPlanDetailDto> getInfo(@PathVariable("id") Long id) { public Response<DfPlanDetailDto> getInfo(@PathVariable("id") String id) {
return Response.ok(); return Response.ok(dfPlanService.getDetailById(id));
} }
/** /**
@ -63,8 +63,7 @@ public class DfPlanController {
@PostMapping @PostMapping
@ApiOperation("堤防巡视检查计划新增") @ApiOperation("堤防巡视检查计划新增")
public Response<DfPlanDetailDto> add(@RequestBody DfPlanDetailDto dfPlan) { public Response<DfPlanDetailDto> add(@RequestBody DfPlanDetailDto dfPlan) {
// BaseEntityUtils.preInsert(dfPlan); return Response.ok(dfPlanService.add(dfPlan));
return Response.ok();
} }
/** /**
@ -74,7 +73,7 @@ public class DfPlanController {
@Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public Response<DfPlanDetailDto> edit(@RequestBody DfPlanDetailDto dfPlan) { public Response<DfPlanDetailDto> edit(@RequestBody DfPlanDetailDto dfPlan) {
return Response.ok(); return Response.ok(dfPlanService.update(dfPlan));
} }
/** /**
@ -82,9 +81,9 @@ public class DfPlanController {
*/ */
@ApiOperation("堤防巡视检查计划删除") @ApiOperation("堤防巡视检查计划删除")
@Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{id}")
public Response<Boolean> remove(@PathVariable Long[] ids) { public Response<Boolean> remove(@PathVariable String id) {
return Response.ok(); return Response.ok(dfPlanService.deleteById(id));
} }
@ApiOperation("堤防巡视检查计划巡查点设置") @ApiOperation("堤防巡视检查计划巡查点设置")
@ -92,14 +91,14 @@ public class DfPlanController {
@PostMapping("/points/{id}") @PostMapping("/points/{id}")
public Response<Boolean> addPoints(@PathVariable("id") String id, public Response<Boolean> addPoints(@PathVariable("id") String id,
@RequestBody List<DfPointDto> points) { @RequestBody List<DfPointDto> points) {
return Response.ok(); return Response.ok(dfPlanService.addPoints(id, points));
} }
@ApiOperation("堤防巡视检查计划巡查点位数据") @ApiOperation("堤防巡视检查计划巡查点位数据")
@Log(title = "堤防巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH) @Log(title = "堤防巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH)
@GetMapping("/points/{id}") @GetMapping("/points/{id}")
public Response<Boolean> addPoints(@PathVariable("id") String id) { public Response<List<DfPointDto>> addPoints(@PathVariable("id") String id) {
return Response.ok(); return Response.ok(dfPlanService.getPoints(id));
} }
} }

7
shuili-system/src/main/java/com/kms/yxgh/df/domain/dto/DfPlanDetailDto.java

@ -22,6 +22,9 @@ public class DfPlanDetailDto {
@ApiModelProperty("主键") @ApiModelProperty("主键")
private String id; private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("巡查ID") @ApiModelProperty("巡查ID")
private String xcId; private String xcId;
@ -42,11 +45,11 @@ public class DfPlanDetailDto {
private JSONObject otherConfig; private JSONObject otherConfig;
@ApiModelProperty("执行人") @ApiModelProperty("执行人")
private List<Operator> operators; private List<OperatorDto> operators;
@Data @Data
public static class Operator { public static class OperatorDto {
@ApiModelProperty("主键") @ApiModelProperty("主键")
private String id; private String id;

92
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; 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_df_xs") @TableName("bs_sgc_df_xs")
@Data @Data
@ApiModel("堤防巡视检查") @ApiModel("堤防巡视检查")
public class DfChecking extends BaseEntity public class DfChecking extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查名称 */ /**
@Excel(name = "巡查名称") * 巡查名称
@ApiModelProperty("巡查名称") */
private String name; @Excel(name = "巡查名称")
@ApiModelProperty("巡查名称")
/** 巡查类型 */ private String name;
@Excel(name = "巡查类型")
@ApiModelProperty("巡查类型") /**
private Long type; * 巡查类型
*/
/** 创建人 */ @Excel(name = "巡查类型")
@Excel(name = "创建人") @ApiModelProperty("巡查类型")
@ApiModelProperty("创建人") private Long type;
private String createUid;
/**
/** 创建时间 */ * 创建人
@JsonFormat(pattern = "yyyy-MM-dd") */
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "创建人")
@ApiModelProperty("创建时间") @ApiModelProperty("创建人")
private Date createTime; private String createUid;
/** 最近修改人 */ /**
@Excel(name = "最近修改人") * 创建时间
@ApiModelProperty("最近修改人") */
private String updateUid; @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
/** 最近修改时间 */ @ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") private Date createTime;
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间") /**
private Date updateTime; * 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
} }

90
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; 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_df_xsx") @TableName("bs_sgc_df_xsx")
@Data @Data
@ApiModel("堤防巡视检查项") @ApiModel("堤防巡视检查项")
public class DfCheckingItem extends BaseEntity public class DfCheckingItem extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查ID */ /**
@Excel(name = "巡查ID") * 巡查ID
@ApiModelProperty("巡查ID") */
private String xcId; @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("创建时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime; @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("最近修改时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime; @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
} }

149
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java

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

99
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
/** /**
@ -21,40 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_df_xsjhzx") @TableName("bs_sgc_df_xsjhzx")
@Data @Data
@ApiModel("堤防巡视检查计划执行人") @ApiModel("堤防巡视检查计划执行人")
public class DfPlanOperator extends BaseEntity public class DfPlanOperator extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查计划ID */ /**
@Excel(name = "巡查计划ID") * 巡查计划ID
@ApiModelProperty("巡查计划ID") */
private String planId; @Excel(name = "巡查计划ID")
@ApiModelProperty("巡查计划ID")
/** 执行人 */ private String planId;
@Excel(name = "执行人")
@ApiModelProperty("执行人") /**
private String operatorUid; * 执行人
*/
/** 创建人 */ @Excel(name = "执行人")
@Excel(name = "创建人") @ApiModelProperty("执行人")
@ApiModelProperty("创建人") private String operatorUid;
private String createUid;
/**
/** 创建时间 */ * 执行人
@JsonFormat(pattern = "yyyy-MM-dd") */
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "执行人名称")
@ApiModelProperty("创建时间") @ApiModelProperty("执行人名称")
private Date createTime; private String operatorName;
/** 最近修改人 */ /**
@Excel(name = "最近修改人") * 创建人
@ApiModelProperty("最近修改人") */
private String updateUid; @Excel(name = "创建人")
@ApiModelProperty("创建人")
/** 最近修改时间 */ private String createUid;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") /**
@ApiModelProperty("最近修改时间") * 创建时间
private Date updateTime; */
@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;
} }

100
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; 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_df_xsjhdw") @TableName("bs_sgc_df_xsjhdw")
@Data @Data
@ApiModel("堤防巡视检查计划点位") @ApiModel("堤防巡视检查计划点位")
public class DfPoint extends BaseEntity public class DfPoint extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查计划ID */ /**
@Excel(name = "巡查计划ID") * 巡查计划ID
@ApiModelProperty("巡查计划ID") */
private String planId; @Excel(name = "巡查计划ID")
@ApiModelProperty("巡查计划ID")
private String planId;
/** 经度 */ /**
@Excel(name = "经度") * 经度
@ApiModelProperty("经度") */
private Long longitude; @Excel(name = "经度")
@ApiModelProperty("经度")
private Long longitude;
/** 纬度 */ /**
@Excel(name = "纬度") * 纬度
@ApiModelProperty("纬度") */
private Long latitude; @Excel(name = "纬度")
@ApiModelProperty("纬度")
private Long latitude;
/** 海拔 */ /**
@Excel(name = "海拔") * 海拔
@ApiModelProperty("海拔") */
private Long 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("创建时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime; @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("最近修改时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime; @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
} }

90
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; 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_df_xsjhjl") @TableName("bs_sgc_df_xsjhjl")
@Data @Data
@ApiModel("堤防巡视检查记录") @ApiModel("堤防巡视检查记录")
public class DfRecord extends BaseEntity public class DfRecord extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查计划ID */ /**
@Excel(name = "巡查计划ID") * 巡查计划ID
@ApiModelProperty("巡查计划ID") */
private String planId; @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("创建时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime; @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("最近修改时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime; @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
} }

110
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java

@ -1,15 +1,13 @@
package com.kms.yxgh.df.domain.entity; package com.kms.yxgh.df.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; 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_df_xsjhjlz") @TableName("bs_sgc_df_xsjhjlz")
@Data @Data
@ApiModel("堤防巡视检查检查记录子项") @ApiModel("堤防巡视检查检查记录子项")
public class DfRecordItem extends BaseEntity public class DfRecordItem extends SyBaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查记录ID */ /**
@Excel(name = "巡查记录ID") * 巡查记录ID
@ApiModelProperty("巡查记录ID") */
private String recordId; @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 Integer 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("创建时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime; @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("最近修改时间") @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime; @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
} }

4
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java

@ -2,8 +2,8 @@ package com.kms.yxgh.df.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.base.SyBaseEntity;
import com.shuili.common.annotation.Excel; import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
@ -19,7 +19,7 @@ import lombok.Data;
@TableName("bs_sgc_df_xsjhjgj") @TableName("bs_sgc_df_xsjhjgj")
@Data @Data
@ApiModel("堤防巡视检查检查记录轨迹") @ApiModel("堤防巡视检查检查记录轨迹")
public class DfTrace extends BaseEntity { public class DfTrace extends SyBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

150
shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java

@ -1,11 +1,30 @@
package com.kms.yxgh.df.service; package com.kms.yxgh.df.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.DfException;
import com.kms.yxgh.df.domain.dto.DfPlanDetailDto;
import com.kms.yxgh.df.domain.dto.DfPlanDetailDto.OperatorDto;
import com.kms.yxgh.df.domain.dto.DfPointDto;
import com.kms.yxgh.df.domain.entity.DfPlan; import com.kms.yxgh.df.domain.entity.DfPlan;
import com.kms.yxgh.df.domain.entity.DfPlanOperator;
import com.kms.yxgh.df.domain.entity.DfPoint;
import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfPlanMapper;
import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.kms.yxgh.df.mapper.DfPlanOperatorMapper;
import com.kms.yxgh.df.mapper.DfPointMapper;
import com.kms.yxgh.util.BeanCopyUtils;
import com.kms.yxgh.util.StreamUtils;
import com.shuili.common.core.service.BaseService; 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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/** /**
* 堤防巡视检查计划Service接口 * 堤防巡视检查计划Service接口
@ -18,5 +37,136 @@ import org.springframework.stereotype.Service;
public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> { public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
private final DfPlanOperatorMapper dfPlanOperatorMapper; private final DfPlanOperatorMapper dfPlanOperatorMapper;
private final DfPointMapper dfPointMapper;
public DfPlanDetailDto getDetailById(String id) {
DfPlan dfPlan = this.getById(id);
DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class);
if (dto != null) {
dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig()));
Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery()
.select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid)
.eq(DfPlanOperator::getPlanId, id);
dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.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 DfPlanDetailDto add(DfPlanDetailDto dto) {
DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class);
if (dfPlan != null) {
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preInsert(dfPlan);
getBaseMapper().insert(dfPlan);
String id = dfPlan.getId();
if (CollectionUtil.isNotEmpty(dto.getOperators())) {
dto.getOperators().forEach(insertOperator(id));
}
return this.getDetailById(id);
} else {
throw new DfException("存在相同的名称");
}
}
return null;
}
private Consumer<OperatorDto> insertOperator(String id) {
return (o) -> {
DfPlanOperator item = new DfPlanOperator();
item.setPlanId(id);
item.setOperatorName(o.getName());
item.setOperatorUid(o.getUid());
BaseEntityUtils.preInsert(item);
dfPlanOperatorMapper.insert(item);
};
}
@Transactional(rollbackFor = Exception.class)
public DfPlanDetailDto update(DfPlanDetailDto dto) {
if (exist(dto.getId())) {
DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class);
if (dfPlan != null) {
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preUpdate(dfPlan);
getBaseMapper().updateById(dfPlan);
String id = dfPlan.getId();
deleteItems(id);
if (CollectionUtil.isNotEmpty(dto.getOperators())) {
dto.getOperators().forEach(insertOperator(id));
}
return this.getDetailById(id);
} else {
throw new DfException("存在相同的名称");
}
}
}
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<DfPointDto> points) {
Wrapper<DfPoint> wp = Wrappers.<DfPoint>lambdaQuery()
.eq(DfPoint::getPlanId, id);
dfPointMapper.delete(wp);
if (CollectionUtil.isNotEmpty(points)) {
points.forEach(po -> {
DfPoint point = BeanCopyUtils.copy(po, DfPoint.class);
if (point != null) {
point.setPlanId(id);
BaseEntityUtils.preInsert(point);
dfPointMapper.insert(point);
}
});
}
return true;
}
public List<DfPointDto> getPoints(String id) {
Wrapper<DfPoint> wp = Wrappers.<DfPoint>lambdaQuery()
.eq(DfPoint::getPlanId, id);
return StreamUtils.toList(dfPointMapper.selectList(wp),
(o) -> BeanCopyUtils.copy(o, DfPointDto.class));
}
private void deleteItems(String id) {
Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery()
.eq(DfPlanOperator::getPlanId, id);
dfPlanOperatorMapper.delete(wp);
}
private boolean checkNameDistinct(String id, String name) {
Wrapper<DfPlan> wp = Wrappers.<DfPlan>lambdaQuery()
.eq(DfPlan::getName, name)
.ne(StringUtils.isNotEmpty(id), DfPlan::getId, id);
return this.getBaseMapper().selectCount(wp) <= 0;
}
private boolean exist(String id) {
Wrapper<DfPlan> wp = Wrappers.<DfPlan>lambdaQuery()
.eq(DfPlan::getId, id);
return this.getBaseMapper().selectCount(wp) > 0;
}
} }

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

@ -1,15 +1,13 @@
package com.kms.yxgh.sz.domain.entity; package com.kms.yxgh.sz.domain.entity;
import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data; import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
/** /**
@ -21,40 +19,59 @@ import com.baomidou.mybatisplus.annotation.TableName;
@TableName("bs_sgc_sz_xsjhzx") @TableName("bs_sgc_sz_xsjhzx")
@Data @Data
@ApiModel("水闸巡视检查计划执行人") @ApiModel("水闸巡视检查计划执行人")
public class SzPlanOperator extends BaseEntity public class SzPlanOperator extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡查计划ID */ /**
@Excel(name = "巡查计划ID") * 巡查计划ID
@ApiModelProperty("巡查计划ID") */
private Long planId; @Excel(name = "巡查计划ID")
@ApiModelProperty("巡查计划ID")
/** 执行人 */ private Long planId;
@Excel(name = "执行人")
@ApiModelProperty("执行人") /**
private String operatorUid; * 执行人
*/
/** 创建人 */ @Excel(name = "执行人")
@Excel(name = "创建人") @ApiModelProperty("执行人")
@ApiModelProperty("创建人") private String operatorUid;
private String createUid;
/**
/** 创建时间 */ * 执行人
@JsonFormat(pattern = "yyyy-MM-dd") */
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "执行人名称")
@ApiModelProperty("创建时间") @ApiModelProperty("执行人名称")
private Date createDate; private String operatorName;
/** 最近修改人 */ /**
@Excel(name = "最近修改人") * 创建人
@ApiModelProperty("最近修改人") */
private String updateUid; @Excel(name = "创建人")
@ApiModelProperty("创建人")
/** 最近修改时间 */ private String createUid;
@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 createDate;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateDate;
} }

Loading…
Cancel
Save