caoqi
1 year ago
131 changed files with 4534 additions and 179 deletions
@ -0,0 +1,83 @@ |
|||
package com.kms.yxgh.df.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.df.dto.DfDangerousGroupingDto; |
|||
import com.kms.yxgh.df.service.DfDangerousGroupingService; |
|||
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.*; |
|||
|
|||
/** |
|||
* 堤防病险工程分组 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/df/dangerousGrouping") |
|||
@Api(tags = "堤防病险工程分组") |
|||
public class DfDangerousGroupingController { |
|||
|
|||
private final DfDangerousGroupingService groupingService; |
|||
|
|||
/** |
|||
* 查询堤防病险工程分组列表 |
|||
* @param sp |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程分组列表") |
|||
@PostMapping("/page") |
|||
public Response<IPage<DfDangerousGroupingDto>> page(@RequestBody SearchParam<DfDangerousGroupingDto> sp) { |
|||
return Response.ok(groupingService.getListByPage(sp)); |
|||
} |
|||
|
|||
/** |
|||
* 查询堤防病险工程分组详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程分组详情") |
|||
@GetMapping("/{id}") |
|||
public Response<DfDangerousGroupingDto> detail(@PathVariable String id) { |
|||
return Response.ok(groupingService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增堤防病险工程分组 |
|||
*/ |
|||
@ApiOperation("堤防病险工程分组新增") |
|||
@Log(title = "堤防病险工程分组新增", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<DfDangerousGroupingDto> add(@RequestBody DfDangerousGroupingDto dto) { |
|||
return Response.ok(groupingService.add(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 修改堤防病险工程分组 |
|||
*/ |
|||
@ApiOperation("堤防病险工程分组修改") |
|||
@Log(title = "堤防病险工程分组修改", businessType = BusinessType.UPDATE) |
|||
@PutMapping() |
|||
public Response<DfDangerousGroupingDto> update(@RequestBody DfDangerousGroupingDto dto) { |
|||
return Response.ok(groupingService.modify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除堤防病险工程分组 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程分组删除") |
|||
@Log(title = "堤防病险工程分组删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(groupingService.deleteById(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,124 @@ |
|||
package com.kms.yxgh.df.controller; |
|||
|
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.df.domain.DfDangerousProjectItem; |
|||
import com.kms.yxgh.df.dto.DfDangerousProjectDto; |
|||
import com.kms.yxgh.df.dto.DfDangerousProjectItemDto; |
|||
import com.kms.yxgh.df.service.DfDangerousProjectService; |
|||
import com.shuili.common.annotation.Log; |
|||
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.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/df/dangerousProject") |
|||
@Api(tags = "堤防病险工程核查项目") |
|||
public class DfDangerousProjectController { |
|||
|
|||
private final DfDangerousProjectService dfDangerousProjectService; |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查项目列表 |
|||
* @param dto |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目列表") |
|||
@PostMapping("/list") |
|||
public Response<List<DfDangerousProjectDto>> list(@RequestBody DfDangerousProjectDto dto) { |
|||
return Response.ok(dfDangerousProjectService.getList(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查项目详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目详情") |
|||
@GetMapping("/{id}") |
|||
public Response<DfDangerousProjectDto> detail(@PathVariable String id) { |
|||
return Response.ok(dfDangerousProjectService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增/修改堤防病险工程核查项目 |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目新增/修改") |
|||
@Log(title = "堤防病险工程核查项目新增/修改", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<DfDangerousProjectDto> addOrModify(@RequestBody DfDangerousProjectDto dto) { |
|||
return Response.ok(dfDangerousProjectService.addOrModify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除堤防病险工程核查项目 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目删除") |
|||
@Log(title = "堤防病险工程核查项目删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(dfDangerousProjectService.deleteById(id)); |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 新增/修改堤防病险工程核查项目内容 |
|||
* @param item |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目内容新增/修改") |
|||
@Log(title = "堤防病险工程核查项目内容新增/修改", businessType = BusinessType.INSERT) |
|||
@PostMapping("/item") |
|||
public Response<DfDangerousProjectItemDto> addOrModifyItem(@RequestBody DfDangerousProjectItem item) { |
|||
return Response.ok(dfDangerousProjectService.addOrModifyItem(item)); |
|||
} |
|||
|
|||
/** |
|||
* 删除堤防病险工程核查项目内容 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目内容删除") |
|||
@Log(title = "堤防病险工程核查项目内容删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/item/{id}") |
|||
public Response<Boolean> deleteItem(@PathVariable String id) { |
|||
return Response.ok(dfDangerousProjectService.deleteItemById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查项目内容列表 |
|||
* @param projectId |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目内容列表") |
|||
@GetMapping("/itemList/{projectId}") |
|||
public Response<List<DfDangerousProjectItemDto>> getItemList(@PathVariable String projectId) { |
|||
return Response.ok(dfDangerousProjectService.getItemList(projectId)); |
|||
} |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查项目内容详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查项目内容详情") |
|||
@GetMapping("/itemDetail/{id}") |
|||
public Response<DfDangerousProjectItemDto> getItemDetailById(@PathVariable String id) { |
|||
return Response.ok(dfDangerousProjectService.getItemDetailById(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,105 @@ |
|||
package com.kms.yxgh.df.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.df.dto.*; |
|||
import com.kms.yxgh.df.service.DfDangerousTaskService; |
|||
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.*; |
|||
|
|||
/** |
|||
* 堤防病险工程核查任务 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/df/dangerousTask") |
|||
@Api(tags = "堤防病险工程核查任务") |
|||
public class DfDangerousTaskController { |
|||
|
|||
private final DfDangerousTaskService dangerousTaskService; |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查任务列表 |
|||
* @param sp |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查任务列表") |
|||
@PostMapping("/page") |
|||
public Response<IPage<DfDangerousTaskDto>> listByPage(@RequestBody SearchParam<DfDangerousTaskSearchDto> sp) { |
|||
return Response.ok(dangerousTaskService.getListByPage(sp)); |
|||
} |
|||
|
|||
/** |
|||
* 查询堤防病险工程核查任务详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查任务详情") |
|||
@GetMapping("/{id}") |
|||
public Response<DfDangerousTaskDto> detail(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增堤防病险工程核查任务 |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查任务新增") |
|||
@Log(title = "堤防病险工程核查任务新增", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<DfDangerousTaskDto> add(@RequestBody DfDangerousTaskDto dto) { |
|||
return Response.ok(dangerousTaskService.add(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 修改堤防病险工程核查任务 |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查任务修改") |
|||
@Log(title = "堤防病险工程核查任务修改", businessType = BusinessType.UPDATE) |
|||
@PutMapping() |
|||
public Response<DfDangerousTaskDto> modify(@RequestBody DfDangerousTaskDto dto) { |
|||
return Response.ok(dangerousTaskService.modify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除堤防病险工程核查任务 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防病险工程核查任务删除") |
|||
@Log(title = "堤防病险工程核查任务删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.deleteById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 保存或提交 堤防工程核查 |
|||
*/ |
|||
@ApiOperation("堤防工程核查保存或提交") |
|||
@Log(title = "堤防工程核查保存或提交", businessType = BusinessType.INSERT) |
|||
@PostMapping("/saveOrSubmit") |
|||
public Response<DfDangerousParamDto> saveOrSubmit(@RequestBody DfDangerousParamDto dto) { |
|||
return Response.ok(dangerousTaskService.saveOrSubmit(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 堤防工程核查详情 |
|||
* @param id 任务id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("堤防工程核查详情") |
|||
@GetMapping(value = "/detail/{id}") |
|||
public Response<DfDangerousTaskDetailDto> getDetailByTaskId(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.getDetailByTaskId(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查分组表 bs_sgc_df_bxgcfz |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcfz") |
|||
@Data |
|||
@ApiModel("堤防病险工程核查分组") |
|||
public class DfDangerousGrouping extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
@ApiModelProperty("小组名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 单位id |
|||
*/ |
|||
@ApiModelProperty("单位id") |
|||
private String deptId; |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查分组成员关系表 bs_sgc_df_bxgcfzcy |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcfzcy") |
|||
@Data |
|||
@ApiModel("堤防病险工程核查分组成员关联") |
|||
public class DfDangerousGroupingRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 小组成员ID |
|||
*/ |
|||
@ApiModelProperty("小组成员ID") |
|||
private String groupUid; |
|||
|
|||
/** |
|||
* 小组成员名称 |
|||
*/ |
|||
@ApiModelProperty("小组成员名称") |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 所属单位ID |
|||
*/ |
|||
@ApiModelProperty("所属单位ID") |
|||
private String deptId; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目表 bs_sgc_df_bxgcxm |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcxm") |
|||
@Data |
|||
@ApiModel("堤防病险工程核查项目") |
|||
public class DfDangerousProject extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目内容表 bs_sgc_df_bxgcxmnr |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcxmnr") |
|||
@Data |
|||
@ApiModel("堤防病险工程核查项目内容") |
|||
public class DfDangerousProjectItem extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 病险工程核查项目ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 检查内容 |
|||
*/ |
|||
@ApiModelProperty("检查内容") |
|||
private String content; |
|||
} |
|||
@ -0,0 +1,69 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 堤防病险工程核查任务表 bs_sgc_df_bxgcrw |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcrw") |
|||
@Data |
|||
@ApiModel("堤防病险工程核查任务") |
|||
public class DfDangerousTask extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 堤防代码 |
|||
*/ |
|||
@ApiModelProperty("堤防代码") |
|||
private String dikeCode; |
|||
|
|||
/** |
|||
* 开始时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("开始时间") |
|||
private Date startTime; |
|||
|
|||
/** |
|||
* 结束时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("结束时间") |
|||
private Date doneTime; |
|||
|
|||
/** |
|||
* 检查任务背景 |
|||
*/ |
|||
@ApiModelProperty(value = "检查任务背景") |
|||
private String content; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty(value = "病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 状态（巡查、报告） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
} |
|||
@ -0,0 +1,49 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程任务问题 bs_sgc_df_bxgcnrgl |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcnrgl") |
|||
@Data |
|||
@ApiModel("堤防病险工程任务问题") |
|||
public class DfDangerousTaskItemRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 监督检查任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 监督检查办法项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("问题等级") |
|||
private String level; |
|||
|
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.kms.yxgh.df.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程任务项目关联对象 bs_sgc_df_jdjcgc |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_df_bxgcxmgl") |
|||
@Data |
|||
@ApiModel("堤防病险工程任务项目关联") |
|||
public class DfDangerousTaskProjectRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty(value = "项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
|
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import com.kms.yxgh.df.domain.DfDangerousGroupingRel; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 堤防病险工程核查分组dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查分组") |
|||
public class DfDangerousGroupingDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
@ApiModelProperty("小组名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 单位id |
|||
*/ |
|||
@ApiModelProperty("单位id") |
|||
private String deptId; |
|||
|
|||
/** |
|||
* 创建单位 |
|||
*/ |
|||
@ApiModelProperty("创建单位") |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 小组成员 |
|||
*/ |
|||
@ApiModelProperty("小组成员") |
|||
private String groupNames; |
|||
|
|||
|
|||
/** |
|||
* 小组成员列表 |
|||
*/ |
|||
@ApiModelProperty("小组成员列表") |
|||
private List<DfDangerousGroupingRelDto> itemList; |
|||
|
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查分组成员关系dto对象 |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查分组成员关联") |
|||
public class DfDangerousGroupingRelDto{ |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 小组成员ID |
|||
*/ |
|||
@ApiModelProperty("小组成员ID") |
|||
private String groupUid; |
|||
|
|||
/** |
|||
* 小组成员名称 |
|||
*/ |
|||
@ApiModelProperty("小组成员名称") |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 所属单位ID |
|||
*/ |
|||
@ApiModelProperty("所属单位ID") |
|||
private String deptId; |
|||
|
|||
/** |
|||
* 所属单位名称 |
|||
*/ |
|||
@ApiModelProperty("所属单位名称") |
|||
private String deptName; |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author hry |
|||
* @date 2024/3/2 16:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程参数对象") |
|||
public class DfDangerousParamDto { |
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String id; |
|||
|
|||
/** |
|||
* 状态（保存、提交） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
/** |
|||
* 项目问题列表 |
|||
*/ |
|||
private List<ProblemParam> problemList; |
|||
|
|||
|
|||
@Data |
|||
public static class ProblemParam { |
|||
|
|||
@ApiModelProperty("主键") |
|||
private String id; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
/** |
|||
* 问题填报列表 |
|||
*/ |
|||
private List<ProblemLevelParam> levelList; |
|||
} |
|||
|
|||
@Data |
|||
public static class ProblemLevelParam { |
|||
|
|||
@ApiModelProperty("主键") |
|||
private String id; |
|||
|
|||
/** |
|||
* 项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("等级") |
|||
private String level; |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查项目") |
|||
public class DfDangerousProjectDto{ |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目内容dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查项目内容") |
|||
public class DfDangerousProjectItemDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 病险工程核查项目ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 检查内容 |
|||
*/ |
|||
@ApiModelProperty("检查内容") |
|||
private String content; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Data |
|||
@ApiModel("堤防病险工程任务详情") |
|||
public class DfDangerousTaskDetailDto extends DfDangerousTaskDto{ |
|||
|
|||
/** |
|||
* 问题描述列表 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述列表") |
|||
private List<DfDangerousTaskProjectRelDto> engineeringList; |
|||
|
|||
/** |
|||
* 问题列表 |
|||
*/ |
|||
@ApiModelProperty(value = "问题列表") |
|||
private List<DfDangerousTaskItemRelDto> problemList; |
|||
} |
|||
@ -0,0 +1,89 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 堤防病险工程核查任务dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查任务") |
|||
public class DfDangerousTaskDto extends DfDangerousTaskSearchDto{ |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 堤防代码 |
|||
*/ |
|||
@ApiModelProperty("堤防代码") |
|||
private String dikeCode; |
|||
|
|||
/** |
|||
* 开始时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("开始时间") |
|||
private Date startTime; |
|||
|
|||
/** |
|||
* 结束时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("结束时间") |
|||
private Date doneTime; |
|||
|
|||
/** |
|||
* 检查任务背景 |
|||
*/ |
|||
@ApiModelProperty(value = "检查任务背景") |
|||
private String content; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty(value = "病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 状态（巡查、完成） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("创建时间") |
|||
private String createTime; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("更新时间") |
|||
private String updateTime; |
|||
|
|||
/** |
|||
* 病险工程核查分组名称 |
|||
*/ |
|||
@ApiModelProperty (value = "病险工程核查分组名称") |
|||
private String groupName; |
|||
|
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防监督检查工程问题对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防监督检查工程问题") |
|||
public class DfDangerousTaskItemRelDto { |
|||
|
|||
@ApiModelProperty(value = "id") |
|||
private String id; |
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("问题等级") |
|||
private String level; |
|||
|
|||
/** |
|||
* 核查内容 |
|||
*/ |
|||
@ApiModelProperty("核查内容") |
|||
private String content; |
|||
|
|||
/** |
|||
* 项目名称 |
|||
*/ |
|||
@ApiModelProperty("项目名称") |
|||
private String projectName; |
|||
} |
|||
@ -0,0 +1,44 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程任务项目关联管理 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程任务项目关联管理") |
|||
public class DfDangerousTaskProjectRelDto{ |
|||
|
|||
@ApiModelProperty(value = "id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty(value = "项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
package com.kms.yxgh.df.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 堤防病险工程核查任务检索详情 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("堤防病险工程核查任务检索详情") |
|||
public class DfDangerousTaskSearchDto { |
|||
|
|||
/** |
|||
* 堤防名称 |
|||
*/ |
|||
@ApiModelProperty("堤防名称") |
|||
private String dikeName; |
|||
|
|||
/** |
|||
* 堤防等级 |
|||
*/ |
|||
@ApiModelProperty("堤防等级") |
|||
private String riverLocation; |
|||
|
|||
/** |
|||
* 堤防等级 |
|||
*/ |
|||
@ApiModelProperty("堤防等级") |
|||
private String dikeGrad; |
|||
|
|||
/** |
|||
* 管理单位 |
|||
*/ |
|||
@ApiModelProperty("管理单位") |
|||
private String engineeringManagementUnit; |
|||
|
|||
/** |
|||
* 起点行政区划 |
|||
*/ |
|||
@ApiModelProperty("起点行政区划") |
|||
private String adcdStart; |
|||
|
|||
/** |
|||
* 终点行政区划 |
|||
*/ |
|||
@ApiModelProperty("终点行政区划") |
|||
private String adcdEnd; |
|||
|
|||
/** |
|||
* 堤防型式 |
|||
*/ |
|||
@ApiModelProperty("堤防型式") |
|||
private String dikePatt; |
|||
|
|||
/** |
|||
* 堤防类型 |
|||
*/ |
|||
@ApiModelProperty("堤防类型") |
|||
private String dikeType; |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.kms.yxgh.df.domain.DfDangerousGrouping; |
|||
import com.kms.yxgh.df.dto.DfDangerousGroupingDto; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
/** |
|||
* 堤防病险工程分组Mapper接口 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@Repository |
|||
public interface DfDangerousGroupingMapper extends BaseMapper<DfDangerousGrouping> { |
|||
|
|||
@Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime,GROUP_CONCAT(c.groupName) as groupNames" + |
|||
" FROM bs_sgc_df_bxgcfz a " + |
|||
" LEFT JOIN bs_sgc_df_bxgcfzcy c ON c.groupId = g.id "+ |
|||
" LEFT JOIN sys_dept b ON a.dept_id = b.dept_id" + |
|||
"") |
|||
IPage<DfDangerousGroupingDto> selectByPage(Page<DfDangerousGroupingDto> page, @Param("dto") DfDangerousGroupingDto dto); |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.kms.yxgh.df.domain.DfDangerousGroupingRel; |
|||
import com.kms.yxgh.df.dto.DfDangerousGroupingRelDto; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 堤防病险工程分组关联Mapper接口 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@Repository |
|||
public interface DfDangerousGroupingRelMapper extends BaseMapper<DfDangerousGroupingRel> { |
|||
|
|||
/** |
|||
* 根据groupId删除 |
|||
* @param groupId |
|||
* @return |
|||
*/ |
|||
int deleteByGroupId(String groupId); |
|||
|
|||
/** |
|||
* 根据groupId查询 |
|||
* @param groupId |
|||
* @return |
|||
*/ |
|||
@Select("select dgr.id,dgr.group_id as groupId, dgr.GROUP_UID as groupUid, dgr.GROUP_NAME as groupName,dgr.dept_id as deptId,sd.dept_name as deptName" + |
|||
" from bs_sgc_df_bxgcfzcy dgr " + |
|||
" left join sy_dept sd on dgr.dept_id = sd.dept_id where group_id = #{groupId}") |
|||
List<DfDangerousGroupingRelDto> selectByGroupId(@Param("groupId") String groupId); |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.kms.yxgh.df.domain.DfDangerousProjectItem; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目内容Mapper接口 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@Repository |
|||
public interface DfDangerousProjectItemMapper extends BaseMapper<DfDangerousProjectItem> { |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.kms.yxgh.df.domain.DfDangerousProject; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
/** |
|||
* 堤防病险工程Mapper接口 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@Repository |
|||
public interface DfDangerousProjectMapper extends BaseMapper<DfDangerousProject> { |
|||
} |
|||
@ -0,0 +1,40 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.kms.yxgh.df.domain.DfDangerousTaskItemRel; |
|||
import com.kms.yxgh.df.dto.DfDangerousTaskItemRelDto; |
|||
import org.apache.ibatis.annotations.Insert; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Repository |
|||
public interface DfDangerousTaskItemRelMapper extends BaseMapper<DfDangerousTaskItemRel> { |
|||
|
|||
@Insert({ |
|||
"<script>", |
|||
"insert into bs_sgc_df_bxgcglxm(task_id, project_id, project_item_id, level) values ", |
|||
"<foreach collection='problemList' item='item' index='index' separator=','>", |
|||
"(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level} )", |
|||
"</foreach>", |
|||
"</script>" |
|||
}) |
|||
int insertBatch(@Param(value = "problemList") List<DfDangerousTaskItemRel> itemRels); |
|||
|
|||
|
|||
@Select("<script>" + |
|||
"SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " + |
|||
"wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level "+ |
|||
"FROM bs_sgc_df_bxgcglxm wt " + |
|||
"LEFT JOIN bs_sgc_df_bxgcxm xm on wt.project_id = xm.id " + |
|||
"LEFT JOIN bs_sgc_df_bxgcxmnr nr on wt.project_item_id = nr.id " + |
|||
"WHERE 1=1 " + |
|||
"<if test='dto.taskId != null and dto.taskId != \"\"'>" + |
|||
"AND wt.task_id = #{dto.taskId} " + |
|||
"</if>" + |
|||
"</script>") |
|||
List<DfDangerousTaskItemRelDto> selectByListParam(@Param("dto") DfDangerousTaskItemRelDto dto); |
|||
|
|||
} |
|||
@ -0,0 +1,73 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.kms.yxgh.df.domain.DfDangerousTask; |
|||
import com.kms.yxgh.df.dto.DfDangerousTaskDto; |
|||
import com.kms.yxgh.df.dto.DfDangerousTaskSearchDto; |
|||
import org.apache.ibatis.annotations.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 堤防病险工程任务Mapper接口 |
|||
* |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@Repository |
|||
public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> { |
|||
|
|||
@Select("<script>" + |
|||
"SELECT rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, " + |
|||
"df.dike_name as dikeName, df.river_location as riverLocation, gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd , fz.name as groupName " + |
|||
"FROM bs_sgc_df_bxgcrw rw " + |
|||
"LEFT JOIN bs_sgc_df_gcda df ON df.dike_code = rw.dike_code " + |
|||
"LEFT JOIN bs_sgc_df_gcgl gl ON gl.dike_code = rw.dike_code " + |
|||
"LEFT JOIN bs_sgc_df_bxgcfz fz ON rw.group_id = fz.id " + |
|||
"WHERE df.expr_date is null " + |
|||
"AND gl.expr_date is null " + |
|||
"<if test='dto.dikeName != null and dto.dikeName != \"\"'>" + |
|||
"AND df.dike_name LIKE CONCAT('%', #{dto.dikeName}, '%') " + |
|||
"</if>" + |
|||
"<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>" + |
|||
"AND df.dike_grad = #{dto.dikeGrad} " + |
|||
"</if>" + |
|||
"<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" + |
|||
"AND df.adcd_start = #{dto.adcdStart} " + |
|||
"</if>" + |
|||
"<if test='dto.adcdEnd != null and dto.adcdEnd != \"\"'>" + |
|||
"AND df.adcd_end = #{dto.adcdEnd} " + |
|||
"</if>" + |
|||
"<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>" + |
|||
"AND gl.engineering_management_unit like concat('%', #{dto.engineeringManagementUnit}, '%') " + |
|||
"</if>" + |
|||
"<if test='dto.dikePatt != null and dto.dikePatt != \"\"'>" + |
|||
"AND df.DIKE_PATT = #{dto.dikePatt} " + |
|||
"</if>" + |
|||
"<if test='dto.id != null and dto.id != \"\"'>" + |
|||
"AND rw.id = #{dto.id} " + |
|||
"</if>" + |
|||
"ORDER BY rw.create_time asc" + |
|||
"</script>") |
|||
IPage<DfDangerousTaskDto> selectByPage(Page<DfDangerousTaskDto> page, @Param("dto") DfDangerousTaskSearchDto dto); |
|||
|
|||
|
|||
|
|||
@Select("<script>" + |
|||
"SELECT rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, df.dike_name as dikeName, df.river_location as riverLocation, " + |
|||
"gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd, df.dike_grad as dikeGrad, df.DIKE_PATT as dikePatt, df.DIKE_TYPE as dikeType " + |
|||
"FROM bs_sgc_df_bxgcrw rw " + |
|||
"LEFT JOIN bs_sgc_df_gcda df ON df.dike_code = da.dike_code " + |
|||
"LEFT JOIN bs_sgc_df_gcgl gl ON rw.dike_code = gl.dike_code " + |
|||
"WHERE df.expr_date is null " + |
|||
"AND gl.expr_date is null " + |
|||
"<if test='dto.id != null and dto.id != \"\"'>" + |
|||
"AND rw.id = #{dto.id} " + |
|||
"</if>" + |
|||
"</script>") |
|||
DfDangerousTaskDto selectByIdDetail(Serializable id); |
|||
} |
|||
@ -0,0 +1,9 @@ |
|||
package com.kms.yxgh.df.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel; |
|||
import org.springframework.stereotype.Repository; |
|||
|
|||
@Repository |
|||
public interface DfDangerousTaskProjectRelMapper extends BaseMapper<DfDangerousTaskProjectRel> { |
|||
} |
|||
@ -0,0 +1,84 @@ |
|||
package com.kms.yxgh.df.service; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.kms.yxgh.df.domain.DfDangerousGrouping; |
|||
import com.kms.yxgh.df.domain.DfDangerousGroupingRel; |
|||
import com.kms.yxgh.df.dto.DfDangerousGroupingDto; |
|||
import com.kms.yxgh.df.dto.DfDangerousGroupingRelDto; |
|||
import com.kms.yxgh.df.mapper.DfDangerousGroupingMapper; |
|||
import com.kms.yxgh.df.mapper.DfDangerousGroupingRelMapper; |
|||
import com.kms.yxgh.util.BeanCopyUtils; |
|||
import com.shuili.common.core.domain.SearchParam; |
|||
import com.shuili.common.core.service.BaseService; |
|||
import lombok.AllArgsConstructor; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
/** |
|||
* 堤防病险工程核查分组实现类 |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 14:46 |
|||
*/ |
|||
@Service |
|||
@AllArgsConstructor |
|||
public class DfDangerousGroupingService extends BaseService<DfDangerousGroupingMapper, DfDangerousGrouping> { |
|||
|
|||
private final DfDangerousGroupingRelMapper relMapper; |
|||
|
|||
public IPage<DfDangerousGroupingDto> getListByPage(SearchParam<DfDangerousGroupingDto> sp) { |
|||
Page<DfDangerousGroupingDto> page = new Page<>(sp.getPageNum(), sp.getPageSize()); |
|||
return this.getBaseMapper().selectByPage(page, sp.getData()); |
|||
} |
|||
|
|||
public DfDangerousGroupingDto getDetailById(String id) { |
|||
DfDangerousGrouping dfDangerousGrouping = this.getById(id); |
|||
DfDangerousGroupingDto dfDangerousGroupingDto = BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class); |
|||
dfDangerousGroupingDto.setItemList(relMapper.selectByGroupId(id)); |
|||
return dfDangerousGroupingDto; |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousGroupingDto add(DfDangerousGroupingDto groupingDto) { |
|||
// 新增分组
|
|||
DfDangerousGrouping dfDangerousGrouping = BeanCopyUtils.copy(groupingDto, DfDangerousGrouping.class); |
|||
this.save(dfDangerousGrouping); |
|||
|
|||
// 新增小组成员列表
|
|||
handleGroupingRel(groupingDto, dfDangerousGrouping); |
|||
return BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousGroupingDto modify(DfDangerousGroupingDto groupingDto) { |
|||
// 修改分组
|
|||
DfDangerousGrouping dfDangerousGrouping = BeanCopyUtils.copy(groupingDto, DfDangerousGrouping.class); |
|||
this.updateById(dfDangerousGrouping); |
|||
|
|||
// 批量删除小组成员列表 重新添加
|
|||
relMapper.deleteByGroupId(dfDangerousGrouping.getId()); |
|||
handleGroupingRel(groupingDto, dfDangerousGrouping); |
|||
return BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class); |
|||
} |
|||
|
|||
private void handleGroupingRel(DfDangerousGroupingDto groupingDto, DfDangerousGrouping dfDangerousGrouping) { |
|||
for (DfDangerousGroupingRelDto item : groupingDto.getItemList()) { |
|||
DfDangerousGroupingRel itemEntity = BeanCopyUtils.copy(item, DfDangerousGroupingRel.class); |
|||
itemEntity.setId(null); |
|||
itemEntity.setGroupId(dfDangerousGrouping.getId()); |
|||
relMapper.insert(itemEntity); |
|||
} |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public Boolean deleteById(String id) { |
|||
if (this.removeById(id)){ |
|||
// 除掉所配置的数据项
|
|||
relMapper.delete(Wrappers.<DfDangerousGroupingRel>lambdaQuery().eq(DfDangerousGroupingRel::getGroupId, id)); |
|||
} |
|||
return true; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,87 @@ |
|||
package com.kms.yxgh.df.service; |
|||
|
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|||
import com.kms.yxgh.df.domain.DfDangerousProject; |
|||
import com.kms.yxgh.df.domain.DfDangerousProjectItem; |
|||
import com.kms.yxgh.df.dto.DfDangerousProjectDto; |
|||
import com.kms.yxgh.df.dto.DfDangerousProjectItemDto; |
|||
import com.kms.yxgh.df.mapper.DfDangerousProjectItemMapper; |
|||
import com.kms.yxgh.df.mapper.DfDangerousProjectMapper; |
|||
import com.kms.yxgh.util.BeanCopyUtils; |
|||
import com.shuili.common.core.service.BaseService; |
|||
import lombok.AllArgsConstructor; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 堤防病险工程核查项目实现类 |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 14:46 |
|||
*/ |
|||
@Service |
|||
@AllArgsConstructor |
|||
public class DfDangerousProjectService extends BaseService<DfDangerousProjectMapper, DfDangerousProject> { |
|||
|
|||
private final DfDangerousProjectItemMapper projectItemMapper; |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousProjectDto addOrModify(DfDangerousProjectDto dto) { |
|||
// 新增
|
|||
DfDangerousProject dangerousProject = BeanCopyUtils.copy(dto, DfDangerousProject.class); |
|||
if (dto.getId() == null) { |
|||
this.save(dangerousProject); |
|||
} else { |
|||
// 修改
|
|||
this.updateById(dangerousProject); |
|||
} |
|||
return BeanCopyUtils.copy(dangerousProject, DfDangerousProjectDto.class); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public Boolean deleteById(String id) { |
|||
if (this.removeById(id)) { |
|||
// 除掉所配置的数据项
|
|||
projectItemMapper.delete(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, id)); |
|||
} |
|||
return true; |
|||
} |
|||
|
|||
public List<DfDangerousProjectDto> getList(DfDangerousProjectDto dto) { |
|||
List<DfDangerousProject> list = this.list(); |
|||
return BeanCopyUtils.copyList(list, DfDangerousProjectDto.class); |
|||
} |
|||
|
|||
public DfDangerousProjectDto getDetailById(String id) { |
|||
DfDangerousProject dangerousProject = this.getById(id); |
|||
return BeanCopyUtils.copy(dangerousProject, DfDangerousProjectDto.class); |
|||
} |
|||
|
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousProjectItemDto addOrModifyItem(DfDangerousProjectItem item) { |
|||
if (item.getId() == null) { |
|||
projectItemMapper.insert(item); |
|||
} else { |
|||
projectItemMapper.updateById(item); |
|||
} |
|||
return BeanCopyUtils.copy(item, DfDangerousProjectItemDto.class); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public Boolean deleteItemById(String id) { |
|||
projectItemMapper.deleteById(id); |
|||
return true; |
|||
} |
|||
|
|||
public List<DfDangerousProjectItemDto> getItemList(String projectId) { |
|||
List<DfDangerousProjectItem> itemList = projectItemMapper.selectList(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, projectId)); |
|||
return BeanCopyUtils.copyList(itemList, DfDangerousProjectItemDto.class); |
|||
} |
|||
|
|||
public DfDangerousProjectItemDto getItemDetailById(String id) { |
|||
return BeanCopyUtils.copy(projectItemMapper.selectById(id), DfDangerousProjectItemDto.class); |
|||
} |
|||
} |
|||
@ -0,0 +1,143 @@ |
|||
package com.kms.yxgh.df.service; |
|||
|
|||
import cn.hutool.core.collection.CollectionUtil; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.kms.yxgh.base.SzException; |
|||
import com.kms.yxgh.df.domain.DfDangerousTask; |
|||
import com.kms.yxgh.df.domain.DfDangerousTaskItemRel; |
|||
import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel; |
|||
import com.kms.yxgh.df.dto.*; |
|||
import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper; |
|||
import com.kms.yxgh.df.mapper.DfDangerousTaskMapper; |
|||
import com.kms.yxgh.df.mapper.DfDangerousTaskProjectRelMapper; |
|||
import com.kms.yxgh.util.BeanCopyUtils; |
|||
import com.shuili.common.core.domain.SearchParam; |
|||
import com.shuili.common.core.service.BaseService; |
|||
import com.shuili.common.utils.StringUtils; |
|||
import lombok.AllArgsConstructor; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.List; |
|||
import java.util.stream.Collectors; |
|||
|
|||
/** |
|||
* 堤防病险工程核查任务实现类 |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 14:46 |
|||
*/ |
|||
@Service |
|||
@AllArgsConstructor |
|||
public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, DfDangerousTask> { |
|||
|
|||
private final DfDangerousTaskProjectRelMapper projectRelMapper; |
|||
private final DfDangerousTaskItemRelMapper taskItemRelMapper; |
|||
|
|||
public IPage<DfDangerousTaskDto> getListByPage(SearchParam<DfDangerousTaskSearchDto> sp) { |
|||
Page<DfDangerousTaskDto> page = new Page<>(sp.getPageNum(), sp.getPageSize()); |
|||
return this.getBaseMapper().selectByPage(page, sp.getData()); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousTaskDto add(DfDangerousTaskDto dto) { |
|||
DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class); |
|||
// 根据dikeCode循环分割获取批量新增
|
|||
String[] dikeCodes = dto.getDikeCode().split(","); |
|||
String[] dikeNames = dto.getDikeName().split(","); |
|||
for (int i = 0; i < dikeCodes.length; i++) { |
|||
String name = dto.getName(); |
|||
if (dikeCodes.length > 1) { |
|||
name += "-" + dikeNames[i]; |
|||
} |
|||
dfDangerousTask.setName(name); |
|||
dfDangerousTask.setDikeCode(dikeCodes[i]); |
|||
this.save(dfDangerousTask); |
|||
} |
|||
return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public Boolean deleteById(String id) { |
|||
return this.removeById(id); |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousTaskDto modify(DfDangerousTaskDto dto) { |
|||
DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class); |
|||
this.updateById(dfDangerousTask); |
|||
return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class); |
|||
} |
|||
|
|||
public DfDangerousTaskDto getDetailById(String id) { |
|||
DfDangerousTaskDto dfDangerousTask = this.baseMapper.selectByIdDetail(id); |
|||
return dfDangerousTask; |
|||
} |
|||
|
|||
@Transactional(rollbackFor = Exception.class) |
|||
public DfDangerousParamDto saveOrSubmit(DfDangerousParamDto dto) { |
|||
// 1. 查询任务
|
|||
DfDangerousTask task = this.getById(dto.getId()); |
|||
if (task == null) { |
|||
throw new SzException("堤防病险工程核查任务不存在，请确认id值是否正确"); |
|||
} |
|||
if (CollectionUtil.isEmpty(dto.getProblemList())) { |
|||
return dto; |
|||
} |
|||
// 批量删除
|
|||
List<String> ids = dto.getProblemList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(DfDangerousParamDto.ProblemParam::getId).collect(Collectors.toList()); |
|||
if(!ids.isEmpty()){ |
|||
projectRelMapper.deleteBatchIds(ids); |
|||
} |
|||
|
|||
// 2. 新增填报内容
|
|||
List<DfDangerousTaskItemRel> itemRel = dto.getProblemList().stream().flatMap(v -> { |
|||
// 2.1 删除关联数据
|
|||
List<String> problemIds = v.getLevelList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(DfDangerousParamDto.ProblemLevelParam::getId).collect(Collectors.toList()); |
|||
if (!problemIds.isEmpty()) { |
|||
taskItemRelMapper.deleteBatchIds(problemIds); |
|||
} |
|||
DfDangerousTaskProjectRel engineering = new DfDangerousTaskProjectRel(); |
|||
BeanCopyUtils.copy(v, engineering); |
|||
engineering.setId(null); |
|||
engineering.setTaskId(task.getId()); |
|||
projectRelMapper.insert(engineering); |
|||
|
|||
return v.getLevelList().stream().map(level -> { |
|||
DfDangerousTaskItemRel problem = new DfDangerousTaskItemRel(); |
|||
BeanCopyUtils.copy(level, problem); |
|||
problem.setId(null); |
|||
problem.setTaskId(task.getId()); |
|||
return problem; |
|||
}); |
|||
}).collect(Collectors.toList()); |
|||
|
|||
// 3. 批量新增
|
|||
if (!itemRel.isEmpty()) { |
|||
taskItemRelMapper.insertBatch(itemRel); |
|||
} |
|||
|
|||
// 4. 修改任务状态
|
|||
task.setState(dto.getState()); |
|||
this.updateById(task); |
|||
return dto; |
|||
} |
|||
|
|||
|
|||
public DfDangerousTaskDetailDto getDetailByTaskId(String taskId){ |
|||
DfDangerousTaskDetailDto dto = BeanCopyUtils.copy(getDetailById(taskId), DfDangerousTaskDetailDto.class); |
|||
|
|||
// 1.1 获取堤防任务问题描述列表
|
|||
List<DfDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<DfDangerousTaskProjectRel>lambdaQuery() |
|||
.eq(DfDangerousTaskProjectRel::getTaskId, taskId)); |
|||
dto.setEngineeringList(BeanCopyUtils.copyList(relList, DfDangerousTaskProjectRelDto.class)); |
|||
|
|||
DfDangerousTaskItemRelDto relDto= new DfDangerousTaskItemRelDto(); |
|||
relDto.setTaskId(taskId); |
|||
dto.setProblemList(taskItemRelMapper.selectByListParam(relDto)); |
|||
|
|||
return dto; |
|||
} |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
package com.kms.yxgh.sz.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.sz.dto.SzDangerousGroupingDto; |
|||
import com.kms.yxgh.sz.service.SzDangerousGroupingService; |
|||
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.*; |
|||
|
|||
/** |
|||
* 水闸病险工程分组 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/sz/dangerousGrouping") |
|||
@Api(tags = "水闸病险工程分组") |
|||
public class SzDangerousGroupingController { |
|||
|
|||
private final SzDangerousGroupingService groupingService; |
|||
|
|||
/** |
|||
* 查询水闸病险工程分组列表 |
|||
* @param sp |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程分组列表") |
|||
@PostMapping("/page") |
|||
public Response<IPage<SzDangerousGroupingDto>> page(@RequestBody SearchParam<SzDangerousGroupingDto> sp) { |
|||
return Response.ok(groupingService.getListByPage(sp)); |
|||
} |
|||
|
|||
/** |
|||
* 查询水闸病险工程分组详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程分组详情") |
|||
@GetMapping("/{id}") |
|||
public Response<SzDangerousGroupingDto> detail(@PathVariable String id) { |
|||
return Response.ok(groupingService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增水闸病险工程分组 |
|||
*/ |
|||
@ApiOperation("水闸病险工程分组新增") |
|||
@Log(title = "水闸病险工程分组新增", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<SzDangerousGroupingDto> add(@RequestBody SzDangerousGroupingDto dto) { |
|||
return Response.ok(groupingService.add(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 修改水闸病险工程分组 |
|||
*/ |
|||
@ApiOperation("水闸病险工程分组修改") |
|||
@Log(title = "水闸病险工程分组修改", businessType = BusinessType.UPDATE) |
|||
@PutMapping() |
|||
public Response<SzDangerousGroupingDto> update(@RequestBody SzDangerousGroupingDto dto) { |
|||
return Response.ok(groupingService.modify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除水闸病险工程分组 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程分组删除") |
|||
@Log(title = "水闸病险工程分组删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(groupingService.deleteById(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,123 @@ |
|||
package com.kms.yxgh.sz.controller; |
|||
|
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.sz.dto.SzDangerousProjectDto; |
|||
import com.kms.yxgh.sz.dto.SzDangerousProjectItemDto; |
|||
import com.kms.yxgh.sz.service.SzDangerousProjectService; |
|||
import com.shuili.common.annotation.Log; |
|||
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.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 水闸病险工程核查项目 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/sz/dangerousProject") |
|||
@Api(tags = "水闸病险工程核查项目") |
|||
public class SzDangerousProjectController { |
|||
|
|||
private final SzDangerousProjectService dangerousProjectService; |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查项目列表 |
|||
* @param dto |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目列表") |
|||
@PostMapping("/list") |
|||
public Response<List<SzDangerousProjectDto>> list(@RequestBody SzDangerousProjectDto dto) { |
|||
return Response.ok(dangerousProjectService.getList(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查项目详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目详情") |
|||
@GetMapping("/{id}") |
|||
public Response<SzDangerousProjectDto> detail(@PathVariable String id) { |
|||
return Response.ok(dangerousProjectService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增/修改水闸病险工程核查项目 |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目新增/修改") |
|||
@Log(title = "水闸病险工程核查项目新增/修改", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<SzDangerousProjectDto> addOrModify(@RequestBody SzDangerousProjectDto dto) { |
|||
return Response.ok(dangerousProjectService.addOrModify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除水闸病险工程核查项目 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目删除") |
|||
@Log(title = "水闸病险工程核查项目删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(dangerousProjectService.deleteById(id)); |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 新增/修改水闸病险工程核查项目内容 |
|||
* @param item |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目内容新增/修改") |
|||
@Log(title = "水闸病险工程核查项目内容新增/修改", businessType = BusinessType.INSERT) |
|||
@PostMapping("/item") |
|||
public Response<SzDangerousProjectItemDto> addOrModifyItem(@RequestBody SzDangerousProjectItemDto item) { |
|||
return Response.ok(dangerousProjectService.addOrModifyItem(item)); |
|||
} |
|||
|
|||
/** |
|||
* 删除水闸病险工程核查项目内容 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目内容删除") |
|||
@Log(title = "水闸病险工程核查项目内容删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/item/{id}") |
|||
public Response<Boolean> deleteItem(@PathVariable String id) { |
|||
return Response.ok(dangerousProjectService.deleteItemById(id)); |
|||
} |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查项目内容列表 |
|||
* @param projectId |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目内容列表") |
|||
@GetMapping("/itemList/{projectId}") |
|||
public Response<List<SzDangerousProjectItemDto>> getItemList(@PathVariable String projectId) { |
|||
return Response.ok(dangerousProjectService.getItemList(projectId)); |
|||
} |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查项目内容详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查项目内容详情") |
|||
@GetMapping("/itemDetail/{id}") |
|||
public Response<SzDangerousProjectItemDto> getItemDetailById(@PathVariable String id) { |
|||
return Response.ok(dangerousProjectService.getItemDetailById(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,108 @@ |
|||
package com.kms.yxgh.sz.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.sz.dto.SzDangerousParamDto; |
|||
import com.kms.yxgh.sz.dto.SzDangerousTaskDetailDto; |
|||
import com.kms.yxgh.sz.dto.SzDangerousTaskDto; |
|||
import com.kms.yxgh.sz.dto.SzDangerousTaskSearchDto; |
|||
import com.kms.yxgh.sz.service.SzDangerousTaskService; |
|||
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.*; |
|||
|
|||
/** |
|||
* 水闸病险工程核查任务 |
|||
* @author hry |
|||
* @date 2024/3/12 14:44 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/sz/dangerousTask") |
|||
@Api(tags = "水闸病险工程核查任务") |
|||
public class SzDangerousTaskController { |
|||
|
|||
private final SzDangerousTaskService dangerousTaskService; |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查任务列表 |
|||
* @param sp |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查任务列表") |
|||
@PostMapping("/page") |
|||
public Response<IPage<SzDangerousTaskDto>> listByPage(@RequestBody SearchParam<SzDangerousTaskSearchDto> sp) { |
|||
return Response.ok(dangerousTaskService.getListByPage(sp)); |
|||
} |
|||
|
|||
/** |
|||
* 查询水闸病险工程核查任务详情 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查任务详情") |
|||
@GetMapping("/{id}") |
|||
public Response<SzDangerousTaskDto> detail(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.getDetailById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增水闸病险工程核查任务 |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查任务新增") |
|||
@Log(title = "水闸病险工程核查任务新增", businessType = BusinessType.INSERT) |
|||
@PostMapping() |
|||
public Response<SzDangerousTaskDto> add(@RequestBody SzDangerousTaskDto dto) { |
|||
return Response.ok(dangerousTaskService.add(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 修改水闸病险工程核查任务 |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查任务修改") |
|||
@Log(title = "水闸病险工程核查任务修改", businessType = BusinessType.UPDATE) |
|||
@PutMapping() |
|||
public Response<SzDangerousTaskDto> modify(@RequestBody SzDangerousTaskDto dto) { |
|||
return Response.ok(dangerousTaskService.modify(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 删除水闸病险工程核查任务 |
|||
* @param id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸病险工程核查任务删除") |
|||
@Log(title = "水闸病险工程核查任务删除", businessType = BusinessType.DELETE) |
|||
@DeleteMapping("/{id}") |
|||
public Response<Boolean> deleteData(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.deleteById(id)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 保存或提交 水闸工程核查 |
|||
*/ |
|||
@ApiOperation("水闸工程核查保存或提交") |
|||
@Log(title = "水闸工程核查保存或提交", businessType = BusinessType.INSERT) |
|||
@PostMapping("/saveOrSubmit") |
|||
public Response<SzDangerousParamDto> saveOrSubmit(@RequestBody SzDangerousParamDto dto) { |
|||
return Response.ok(dangerousTaskService.saveOrSubmit(dto)); |
|||
} |
|||
|
|||
/** |
|||
* 水闸工程核查详情 |
|||
* @param id 任务id |
|||
* @return |
|||
*/ |
|||
@ApiOperation("水闸工程核查详情") |
|||
@GetMapping(value = "/detail/{id}") |
|||
public Response<SzDangerousTaskDetailDto> getDetailByTaskId(@PathVariable String id) { |
|||
return Response.ok(dangerousTaskService.getDetailByTaskId(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,65 @@ |
|||
package com.kms.yxgh.sz.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.sz.dto.SzOperaRecordDto; |
|||
import com.kms.yxgh.sz.service.SzOperaRecordService; |
|||
import com.shuili.common.core.domain.SearchParam; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import lombok.AllArgsConstructor; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
/** |
|||
* @ClassName: SzOperaRecordController |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 下午2:46 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
|
|||
@RestController |
|||
@RequestMapping("/run/sz/opera-record") |
|||
@AllArgsConstructor |
|||
@Api(tags = "水闸操作记录管理") |
|||
public class SzOperaRecordController { |
|||
|
|||
private final SzOperaRecordService szOperaRecordService; |
|||
|
|||
//操作记录列表
|
|||
@PostMapping("/list") |
|||
@ApiOperation("操作记录列表") |
|||
public IPage<SzOperaRecordDto> list(@RequestBody SearchParam<SzOperaRecordDto> sp) { |
|||
return szOperaRecordService.search(sp); |
|||
} |
|||
|
|||
//操作记录详情
|
|||
@GetMapping("/{id}") |
|||
@ApiOperation("操作记录详情") |
|||
public Response<SzOperaRecordDto> detail(@PathVariable String id) { |
|||
return Response.ok(szOperaRecordService.detail(id)); |
|||
} |
|||
|
|||
//操作记录新增
|
|||
@PostMapping("") |
|||
@ApiOperation("操作记录新增") |
|||
public Response<SzOperaRecordDto> add(@RequestBody SzOperaRecordDto dto) { |
|||
return Response.ok(szOperaRecordService.add(dto)); |
|||
} |
|||
|
|||
//操作记录修改
|
|||
@PutMapping("") |
|||
@ApiOperation("操作记录修改") |
|||
public Response<SzOperaRecordDto> update(@RequestBody SzOperaRecordDto dto) { |
|||
return Response.ok(szOperaRecordService.modify(dto)); |
|||
} |
|||
//操作记录删除
|
|||
|
|||
@DeleteMapping("/{id}") |
|||
@ApiOperation("操作记录删除") |
|||
public Response<Boolean> delete(@PathVariable String id) { |
|||
return Response.ok(szOperaRecordService.delete(id)); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,67 @@ |
|||
package com.kms.yxgh.sz.controller; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.kms.yxgh.base.Response; |
|||
import com.kms.yxgh.sz.dto.SzSchedulingDto; |
|||
import com.kms.yxgh.sz.service.SzSchedulingService; |
|||
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.*; |
|||
|
|||
/** |
|||
* @ClassName: SzSchedulingController |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 上午11:06 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
@RestController |
|||
@AllArgsConstructor |
|||
@RequestMapping("/run/sz/scheduling") |
|||
@Api(tags = "水闸调度计划管理") |
|||
public class SzSchedulingController { |
|||
|
|||
private final SzSchedulingService szSchedulingService; |
|||
|
|||
//调度计划列表
|
|||
@PostMapping("/list") |
|||
@ApiOperation("调度计划列表") |
|||
public IPage<SzSchedulingDto> list(@RequestBody SearchParam<SzSchedulingDto> sp) { |
|||
return szSchedulingService.search(sp); |
|||
} |
|||
//调度计划详情
|
|||
@GetMapping("/{id}") |
|||
@ApiOperation("调度计划详情") |
|||
public Response<SzSchedulingDto> detail(@PathVariable String id) { |
|||
return Response.ok(szSchedulingService.detail(id)); |
|||
} |
|||
|
|||
//调度计划新增
|
|||
@PostMapping("") |
|||
@ApiOperation("调度计划新增") |
|||
@Log(title = "调度计划新增", businessType = BusinessType.INSERT) |
|||
public Response<SzSchedulingDto> add(@RequestBody SzSchedulingDto dto) { |
|||
return Response.ok(szSchedulingService.add(dto)); |
|||
} |
|||
|
|||
//调度计划修改
|
|||
@PutMapping("") |
|||
@ApiOperation("调度计划修改") |
|||
@Log(title = "调度计划修改", businessType = BusinessType.UPDATE) |
|||
public Response<SzSchedulingDto> update(@RequestBody SzSchedulingDto dto) { |
|||
return Response.ok(szSchedulingService.modify(dto)); |
|||
} |
|||
|
|||
//调度计划删除
|
|||
@DeleteMapping("/{id}") |
|||
@ApiOperation("调度计划删除") |
|||
@Log(title = "调度计划删除", businessType = BusinessType.DELETE) |
|||
public Response<Boolean> delete(@PathVariable String id) { |
|||
return Response.ok(szSchedulingService.delete(id)); |
|||
} |
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查分组表 bs_sgc_sz_bxgcfz |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcfz") |
|||
@Data |
|||
@ApiModel("水闸病险工程核查分组") |
|||
public class SzDangerousGrouping extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
@ApiModelProperty("小组名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 单位id |
|||
*/ |
|||
@ApiModelProperty("单位id") |
|||
private String deptId; |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查分组成员关系表 bs_sgc_sz_bxgcfzcy |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcfzcy") |
|||
@Data |
|||
@ApiModel("水闸病险工程核查分组成员关联") |
|||
public class SzDangerousGroupingRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 小组成员ID |
|||
*/ |
|||
@ApiModelProperty("小组成员ID") |
|||
private String groupUid; |
|||
|
|||
/** |
|||
* 小组成员名称 |
|||
*/ |
|||
@ApiModelProperty("小组成员名称") |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 所属单位ID |
|||
*/ |
|||
@ApiModelProperty("所属单位ID") |
|||
private String deptId; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查项目表 bs_sgc_sz_bxgcxm |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcxm") |
|||
@Data |
|||
@ApiModel("水闸病险工程核查项目") |
|||
public class SzDangerousProject extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查项目内容表 bs_sgc_sz_bxgcxmnr |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcxmnr") |
|||
@Data |
|||
@ApiModel("水闸病险工程核查项目内容") |
|||
public class SzDangerousProjectItem extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 病险工程核查项目ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 检查内容 |
|||
*/ |
|||
@ApiModelProperty("检查内容") |
|||
private String content; |
|||
} |
|||
@ -0,0 +1,69 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 水闸病险工程核查任务表 bs_sgc_sz_bxgcrw |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcrw") |
|||
@Data |
|||
@ApiModel("水闸病险工程核查任务") |
|||
public class SzDangerousTask extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 水闸代码 |
|||
*/ |
|||
@ApiModelProperty("水闸代码") |
|||
private String wagaCode; |
|||
|
|||
/** |
|||
* 开始时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("开始时间") |
|||
private Date startTime; |
|||
|
|||
/** |
|||
* 结束时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("结束时间") |
|||
private Date doneTime; |
|||
|
|||
/** |
|||
* 检查任务背景 |
|||
*/ |
|||
@ApiModelProperty(value = "检查任务背景") |
|||
private String content; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty(value = "病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 状态（巡查、报告） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
} |
|||
@ -0,0 +1,49 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程任务问题 bs_sgc_sz_bxgcnrgl |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcnrgl") |
|||
@Data |
|||
@ApiModel("水闸病险工程任务问题") |
|||
public class SzDangerousTaskItemRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 监督检查任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("问题等级") |
|||
private String level; |
|||
|
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程任务项目关联对象 bs_sgc_sz_jdjcgc |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@TableName("bs_sgc_sz_bxgcxmgl") |
|||
@Data |
|||
@ApiModel("水闸病险工程任务项目关联") |
|||
public class SzDangerousTaskProjectRel extends SyBaseEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 监督检查任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty(value = "项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
|
|||
} |
|||
@ -0,0 +1,59 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @ClassName: SzOperaRecord |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 下午2:43 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
@TableName("bs_sgc_sz_czjl") |
|||
@Data |
|||
@ApiModel("水闸操作记录") |
|||
public class SzOperaRecord extends SyBaseEntity { |
|||
@ApiModelProperty(value = "水闸编码") |
|||
private String wagaCode; |
|||
|
|||
@ApiModelProperty(value = "闸门") |
|||
private String gate; |
|||
|
|||
@ApiModelProperty(value = "闸号") |
|||
private String gateNum; |
|||
|
|||
@ApiModelProperty(value = "指令号") |
|||
private String commandNum; |
|||
|
|||
@ApiModelProperty(value = "控制水位") |
|||
private Float controlLevel; |
|||
|
|||
@ApiModelProperty(value = "左干") |
|||
private Float leftDry; |
|||
|
|||
@ApiModelProperty(value = "右干") |
|||
private Float rightDry; |
|||
|
|||
@ApiModelProperty(value = "上游水位") |
|||
private Float upstreamLevel; |
|||
|
|||
@ApiModelProperty(value = "下游水位") |
|||
private Float downstreamLevel; |
|||
|
|||
@ApiModelProperty(value = "开度") |
|||
private Float opening; |
|||
|
|||
@ApiModelProperty(value = "操作时间") |
|||
private Date operatorTime; |
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.kms.yxgh.sz.domain; |
|||
|
|||
/** |
|||
* @ClassName: SzScheduling |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 上午10:02 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.kms.yxgh.base.SyBaseEntity; |
|||
import io.swagger.annotations.ApiModel; |
|||
import lombok.Data; |
|||
|
|||
@TableName("bs_sgc_sz_ddjh") |
|||
@Data |
|||
@ApiModel("水闸调度计划") |
|||
public class SzScheduling extends SyBaseEntity { |
|||
|
|||
private String wagaCode; |
|||
private String name; |
|||
private String doc; |
|||
|
|||
@TableField(exist = false) |
|||
private String remark; |
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 水闸病险工程核查分组dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查分组") |
|||
public class SzDangerousGroupingDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
@ApiModelProperty("小组名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 单位id |
|||
*/ |
|||
@ApiModelProperty("单位id") |
|||
private String deptId; |
|||
|
|||
/** |
|||
* 创建单位 |
|||
*/ |
|||
@ApiModelProperty("创建单位") |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 小组成员 |
|||
*/ |
|||
@ApiModelProperty("小组成员") |
|||
private String groupNames; |
|||
|
|||
|
|||
/** |
|||
* 小组成员列表 |
|||
*/ |
|||
@ApiModelProperty("小组成员列表") |
|||
private List<SzDangerousGroupingRelDto> itemList; |
|||
|
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查分组成员关系dto对象 |
|||
* |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查分组成员关联") |
|||
public class SzDangerousGroupingRelDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 小组成员ID |
|||
*/ |
|||
@ApiModelProperty("小组成员ID") |
|||
private String groupUid; |
|||
|
|||
/** |
|||
* 小组成员名称 |
|||
*/ |
|||
@ApiModelProperty("小组成员名称") |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 所属单位ID |
|||
*/ |
|||
@ApiModelProperty("所属单位ID") |
|||
private String deptId; |
|||
|
|||
/** |
|||
* 所属单位名称 |
|||
*/ |
|||
@ApiModelProperty("所属单位名称") |
|||
private String deptName; |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author hry |
|||
* @date 2024/3/2 16:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程参数对象") |
|||
public class SzDangerousParamDto { |
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String id; |
|||
|
|||
/** |
|||
* 状态（保存、提交） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
/** |
|||
* 项目问题列表 |
|||
*/ |
|||
private List<ProblemParam> problemList; |
|||
|
|||
|
|||
@Data |
|||
public static class ProblemParam { |
|||
|
|||
@ApiModelProperty("主键") |
|||
private String id; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
/** |
|||
* 问题填报列表 |
|||
*/ |
|||
private List<ProblemLevelParam> levelList; |
|||
} |
|||
|
|||
@Data |
|||
public static class ProblemLevelParam { |
|||
|
|||
@ApiModelProperty("主键") |
|||
private String id; |
|||
|
|||
/** |
|||
* 项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("等级") |
|||
private String level; |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查项目dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查项目") |
|||
public class SzDangerousProjectDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查项目内容dto对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查项目内容") |
|||
public class SzDangerousProjectItemDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 病险工程核查项目ID |
|||
*/ |
|||
@ApiModelProperty("病险工程核查项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 检查内容 |
|||
*/ |
|||
@ApiModelProperty("检查内容") |
|||
private String content; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Data |
|||
@ApiModel("堤防病险工程任务详情") |
|||
public class SzDangerousTaskDetailDto extends SzDangerousTaskDto { |
|||
|
|||
/** |
|||
* 问题描述列表 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述列表") |
|||
private List<SzDangerousTaskProjectRelDto> engineeringList; |
|||
|
|||
/** |
|||
* 问题列表 |
|||
*/ |
|||
@ApiModelProperty(value = "问题列表") |
|||
private List<SzDangerousTaskItemRelDto> problemList; |
|||
} |
|||
@ -0,0 +1,89 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 水闸病险工程核查任务dto |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查任务") |
|||
public class SzDangerousTaskDto extends SzDangerousTaskSearchDto { |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
@ApiModelProperty("id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 名称 |
|||
*/ |
|||
@ApiModelProperty("名称") |
|||
private String name; |
|||
|
|||
/** |
|||
* 水闸代码 |
|||
*/ |
|||
@ApiModelProperty("水闸代码") |
|||
private String wagaCode; |
|||
|
|||
/** |
|||
* 开始时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("开始时间") |
|||
private Date startTime; |
|||
|
|||
/** |
|||
* 结束时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("结束时间") |
|||
private Date doneTime; |
|||
|
|||
/** |
|||
* 检查任务背景 |
|||
*/ |
|||
@ApiModelProperty(value = "检查任务背景") |
|||
private String content; |
|||
|
|||
/** |
|||
* 病险工程核查分组ID |
|||
*/ |
|||
@ApiModelProperty(value = "病险工程核查分组ID") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 状态（巡查、报告） |
|||
*/ |
|||
@ApiModelProperty(value = "状态") |
|||
private String state; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("创建时间") |
|||
private String createTime; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@ApiModelProperty("更新时间") |
|||
private String updateTime; |
|||
|
|||
/** |
|||
* 病险工程核查分组名称 |
|||
*/ |
|||
@ApiModelProperty (value = "病险工程核查分组名称") |
|||
private String groupName; |
|||
|
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸监督检查工程问题对象 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸监督检查工程问题") |
|||
public class SzDangerousTaskItemRelDto { |
|||
|
|||
@ApiModelProperty(value = "id") |
|||
private String id; |
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty("项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 项目内容ID |
|||
*/ |
|||
@ApiModelProperty("项目内容ID") |
|||
private String projectItemId; |
|||
|
|||
/** |
|||
* 问题等级 |
|||
*/ |
|||
@ApiModelProperty("问题等级") |
|||
private String level; |
|||
|
|||
/** |
|||
* 核查内容 |
|||
*/ |
|||
@ApiModelProperty("核查内容") |
|||
private String content; |
|||
|
|||
/** |
|||
* 项目名称 |
|||
*/ |
|||
@ApiModelProperty("项目名称") |
|||
private String projectName; |
|||
} |
|||
@ -0,0 +1,44 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程任务项目关联管理 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程任务项目关联管理") |
|||
public class SzDangerousTaskProjectRelDto { |
|||
|
|||
@ApiModelProperty(value = "id") |
|||
private String id; |
|||
|
|||
/** |
|||
* 任务ID |
|||
*/ |
|||
@ApiModelProperty(value = "任务ID") |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
@ApiModelProperty(value = "项目ID") |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 问题描述 |
|||
*/ |
|||
@ApiModelProperty(value = "问题描述") |
|||
private String problemDescribe; |
|||
|
|||
/** |
|||
* 现场记录情况 |
|||
*/ |
|||
@ApiModelProperty(value = "现场记录情况") |
|||
private String siteSituationRecords; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,57 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 水闸病险工程核查任务检索详情 |
|||
* @author hry |
|||
* @date 2024/2/29 13:57 |
|||
*/ |
|||
@Data |
|||
@ApiModel("水闸病险工程核查任务检索详情") |
|||
public class SzDangerousTaskSearchDto { |
|||
|
|||
/** |
|||
* 水闸名称 |
|||
*/ |
|||
@ApiModelProperty("水闸名称") |
|||
private String wagaName; |
|||
|
|||
/** |
|||
* 水闸等级 |
|||
*/ |
|||
@ApiModelProperty("水闸等级") |
|||
private String riverLocation; |
|||
|
|||
/** |
|||
* 水闸等级 |
|||
*/ |
|||
@ApiModelProperty("水闸等级") |
|||
private String dikeGrad; |
|||
|
|||
/** |
|||
* 管理单位 |
|||
*/ |
|||
@ApiModelProperty("管理单位") |
|||
private String engineeringManagementUnit; |
|||
|
|||
/** |
|||
* 行政区划 |
|||
*/ |
|||
@ApiModelProperty("行政区划") |
|||
private String adcd; |
|||
|
|||
/** |
|||
* 工程规模 |
|||
*/ |
|||
@ApiModelProperty("工程规模") |
|||
private String engScal; |
|||
|
|||
/** |
|||
* 水闸类型 |
|||
*/ |
|||
@ApiModelProperty("水闸类型") |
|||
private String wagaType; |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @ClassName: SzOperaRecordDto |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 下午2:49 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
|
|||
@Data |
|||
@ApiModel(value = "操作记录") |
|||
public class SzOperaRecordDto { |
|||
|
|||
@ApiModelProperty(value = "主键") |
|||
private String id; |
|||
@ApiModelProperty(value = "水闸编码") |
|||
private String wagaCode; |
|||
@ApiModelProperty(value = "闸门") |
|||
private String gate; |
|||
@ApiModelProperty(value = "闸号") |
|||
private String gateNum; |
|||
@ApiModelProperty(value = "指令号") |
|||
private String commandNum; |
|||
@ApiModelProperty(value = "控制水位") |
|||
private Float controlLevel; |
|||
@ApiModelProperty(value = "左干") |
|||
private Float leftDry; |
|||
@ApiModelProperty(value = "右干") |
|||
private Float rightDry; |
|||
@ApiModelProperty(value = "上游水位") |
|||
private Float upstreamLevel; |
|||
@ApiModelProperty(value = "下游水位") |
|||
private Float downstreamLevel; |
|||
@ApiModelProperty(value = "开度") |
|||
private Float opening; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
@ApiModelProperty(value = "操作时间") |
|||
private Date operatorTime; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
@ApiModelProperty(value = "创建时间") |
|||
private Date createTime; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
@ApiModelProperty(value = "更新时间") |
|||
private Date updateTime; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,75 @@ |
|||
package com.kms.yxgh.sz.dto; |
|||
|
|||
import com.alibaba.fastjson.annotation.JSONField; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import io.swagger.annotations.ApiModel; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @ClassName: SzSchedulingDto |
|||
* @Description: TODO |
|||
* @Date: 2024/3/12 上午11:19 |
|||
* * |
|||
* @author: hxh |
|||
* @version: 1.0 |
|||
*/ |
|||
|
|||
@Data |
|||
@ApiModel(value = "水闸调度计划管理") |
|||
public class SzSchedulingDto { |
|||
|
|||
@ApiModelProperty(value = "调度计划id") |
|||
private String id; |
|||
|
|||
@ApiModelProperty(value = "水闸编码") |
|||
private String wagaCode; |
|||
|
|||
@ApiModelProperty(value = "计划名称") |
|||
private String planName; |
|||
//水闸名称
|
|||
@ApiModelProperty(value = "水闸名称") |
|||
private String wagaName; |
|||
//主管单位
|
|||
@ApiModelProperty(value = "主管单位") |
|||
private String engineeringManagementUnit; |
|||
|
|||
@ApiModelProperty(value = "文件") |
|||
private List<Doc> docs; |
|||
|
|||
@JSONField(serialize = false) |
|||
@JsonIgnore |
|||
private String docStr; |
|||
|
|||
@ApiModelProperty(value = "创建时间") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private String createTime; |
|||
|
|||
@ApiModelProperty(value = "更新时间") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private String updateTime; |
|||
|
|||
//责任人
|
|||
@ApiModelProperty(value = "责任人") |
|||
private List<Person> chargePerson; |
|||
|
|||
@Data |
|||
public static class Person { |
|||
@ApiModelProperty(value = "人员id") |
|||
private String id; |
|||
@ApiModelProperty(value = "人员名称") |
|||
private String name; |
|||
} |
|||
|
|||
@ApiModel(value = "调度管理文档文档") |
|||
@Data |
|||
public static class Doc { |
|||
@ApiModelProperty(value = "文档名称") |
|||
private String name; |
|||
@ApiModelProperty(value = "文档url") |
|||
private String url; |
|||
} |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue