diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java index 62b8f838..ecb39f66 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java @@ -1,8 +1,14 @@ package com.kms.yg.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.yg.df.domain.BsSgcDfJbxx; +import com.kms.yxgh.df.dto.DfProjectListDto; +import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.Date; /** @@ -14,4 +20,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Repository public interface BsSgcDfJbxxMapper extends BaseMapper { + + @Select(value = "select df.dick_code dick_code, df.dick_name dick_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department " + + "from bs_sgc_df_jbxx df " + + "left join bs_sgc_df_gcgl pj on pj.dick_code = df.dick_code " + + "where dick_name = #{dickName} and dick_type = #{dickType}") + @Results({ + @Result(property = "dickCode", column = "dick_code"), + @Result(property = "dickName", column = "dick_name"), + @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"), + @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"), + @Result(property = "lastTime", column = "dick_code", javaType = Date.class, one = @One(select = "com.example.mapper.DfRecordMapper.getLastInsertTimeByDickCode")) + }) + IPage getDfProjectListWithPage(Page page, @Param("dickName") String dickName, @Param("dickType") String dickType); + + @Select(value = "select count(1) " + + "from bs_sgc_df_jbxx df " + + "left join bs_sgc_df_gcgl pj on pj.dick_code = df.dick_code " + + "where dick_name = #{dickName} and dick_type = #{dickType}") + int getDfProjectListCount(@Param("dickName") String dickName, @Param("dickType") String dickType); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index b2f97834..c0fb4753 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -3,6 +3,7 @@ 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.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfPlanSimpleDto; import com.kms.yxgh.df.dto.DfPointDto; import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.service.DfPlanService; @@ -42,8 +43,8 @@ public class DfPlanController { */ @PostMapping("/list") @ApiOperation("堤防巡视检查计划列表") - public IPage list(@RequestBody SearchParam sp) { - return dfPlanService.selectPage(sp); + public IPage list(@RequestBody SearchParam sp) { + return dfPlanService.search(sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java new file mode 100644 index 00000000..8073e981 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java @@ -0,0 +1,47 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.df.domain.BsSgcDfJbxx; +import com.kms.yxgh.df.dto.DfProjectListDto; +import com.kms.yxgh.df.dto.DfProjectCheckingRelDto; +import com.kms.yxgh.df.service.DfProjectService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName: DfProjectController + * @Description: TODO + * @Date: 2024/1/23 上午10:51 + * * + * @author: hxh + * @version: 1.0 + */ + +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/project") +@Api(tags = "堤防工程运行相关接口") +public class DfProjectController { + + private final DfProjectService dfProjectService; + + @PostMapping("/list") + @ApiOperation("堤防工程运行列表") + public IPage list(@RequestBody SearchParam sp) { + return dfProjectService.getProjectList(sp); + } + + + @PostMapping("/rel-checking") + @ApiOperation("关联检查项") + public void relChecking(@RequestBody DfProjectCheckingRelDto dfProjectCheckingRelDto) { + dfProjectService.relChecking(dfProjectCheckingRelDto); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java index f7dc793d..577e5a9f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java @@ -32,6 +32,9 @@ public class DfPlan extends SyBaseEntity { @ApiModelProperty("巡查ID") private String xcId; + @ApiModelProperty("水库编码") + private String dickCode; + /** * 名称 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java new file mode 100644 index 00000000..27d583a6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java @@ -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_xspj + * + * @author sy + * @date 2023-11-09 + */ +@TableName("bs_sgc_df_xspj") +@Data +@ApiModel("堤防与巡检关联表") +public class DfProjectCheckingRel extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @ApiModelProperty("巡查ID") + private String checkingId; + + @ApiModelProperty("堤防代码") + private String dickCode; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java index 50381318..c64bec35 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecord.java @@ -1,12 +1,10 @@ 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 com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; @@ -21,27 +19,30 @@ import lombok.Data; @ApiModel("堤防巡视检查记录") public class DfRecord extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 巡查计划ID - */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; - - /** - * 巡查记录名称 - */ - @Excel(name = "巡查记录名称") - @ApiModelProperty("巡查记录名称") - private String name; - - /** - * 状态 - */ - @Excel(name = "状态") - @ApiModelProperty("状态") - private Long status; + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; + + /** + * 巡查记录名称 + */ + @Excel(name = "巡查记录名称") + @ApiModelProperty("巡查记录名称") + private String name; + + @ApiModelProperty("堤防代码") + private String dickCode; + + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Long status; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java new file mode 100644 index 00000000..98f919b4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java @@ -0,0 +1,43 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName: DfPlanSimpleDto + * @Description: TODO + * @Date: 2024/1/23 下午3:26 + * * + * @author: hxh + * @version: 1.0 + */ +@ApiModel(value = "巡查计划简单信息") +@Data +public class DfPlanSimpleDto { + + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("巡查ID") + private String xcId; + + @ApiModelProperty("巡查类型") + private Long type; + + @ApiModelProperty("最后巡检时间") + private Date lastTime; + + @ApiModelProperty("最近修改时间") + private Date updateTime; + + @ApiModelProperty("创建时间") + private Date createTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectCheckingRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectCheckingRelDto.java new file mode 100644 index 00000000..921b0754 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectCheckingRelDto.java @@ -0,0 +1,27 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @ClassName: DfPorjectPlanRelDto + * @Description: TODO + * @Date: 2024/1/23 下午2:03 + * * + * @author: hxh + * @version: 1.0 + */ + +@ApiModel(value = "项目计划关联") +@Data +public class DfProjectCheckingRelDto { + + @ApiModelProperty(value = "项目id") + private String dickCode; + + @ApiModelProperty(value = "巡查id") + private List checkings; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java new file mode 100644 index 00000000..69502718 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java @@ -0,0 +1,25 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * DfProjectListDto类是一个数据传输对象,用于表示堤防项目列表的信息。 + * 包含堤防编号、堤防名称、工程管理单位、水务行政部门和最后巡查时间等属性。 + */ +@Data +public class DfProjectListDto { + @ApiModelProperty(value = "堤防编号") + private String dickCode; + @ApiModelProperty(value = "堤防名称") + private String dickName; + @ApiModelProperty(value = "工程管理单位") + private String engineeringManagementUnit; + @ApiModelProperty(value = "水务行政部门") + private String waterAdministrativeDepartment; + @ApiModelProperty(value = "最后巡查时间") + private Date lastTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java index 7a58591f..510eb05b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/StartPlan.java @@ -15,6 +15,8 @@ import lombok.Data; @Data public class StartPlan { - @ApiModelProperty("计划id") - private String planId; + @ApiModelProperty("计划id") + private String planId; + @ApiModelProperty("巡查id") + private String xcId; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index 7ed52585..4eac646e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -1,8 +1,16 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; 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.DfPlan; +import com.kms.yxgh.df.dto.DfPlanSimpleDto; +import com.shuili.common.utils.StringUtils; +import org.apache.ibatis.annotations.*; +import org.apache.ibatis.jdbc.SQL; +import org.springframework.stereotype.Repository; + +import java.util.Map; /** * 堤防巡视检查计划Mapper接口 @@ -13,4 +21,21 @@ import com.kms.yxgh.df.domain.DfPlan; @Repository public interface DfPlanMapper extends BaseMapper { + @SelectProvider(type = DfPlanSqlProvider.class, method = "selectByDickCode") + IPage selectByDickCode(Page page, @Param("dickCode") String dickCode, @Param("planNme") String planName); + + class DfPlanSqlProvider{ + public String selectByDickCode(final Map param) { + return new SQL(){{ + SELECT("p.id, p.name, p.xc_id as xcId, p.type, p.update_time as updateTime, p.create_time as createTime, (SELECT MAX(r.create_time) FROM bs_sgc_df_xsjhjl r WHERE p.id = r.plan_id AND r.dick_code = #{dickCode}) as lastTime"); + FROM("bs_sgc_df_xsjh p"); + + WHERE("p.dick_code = #{dickCode}"); + + if(param.get("planName") != null && StringUtils.isNotBlank(param.get("planName").toString())) { + WHERE("p.name LIKE CONCAT('%', #{planName}, '%')"); + } + }}.toString(); + } + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java new file mode 100644 index 00000000..6bac7e29 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java @@ -0,0 +1,25 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfProjectCheckingRel; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 堤防巡视检查检查记录轨迹Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfProjectCheckingRelMapper extends BaseMapper { + + @Insert("") + void insertBatch(@Param("list") List list); +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index f02ea7fb..7f4cd442 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -1,9 +1,12 @@ package com.kms.yxgh.df.mapper; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfRecord; +import java.util.Date; + /** * 堤防巡视检查记录Mapper接口 * @@ -13,4 +16,7 @@ import com.kms.yxgh.df.domain.DfRecord; @Repository public interface DfRecordMapper extends BaseMapper { + @Select("SELECT MAX(create_time) FROM df_record WHERE dick_code = #{dickCode} and plan_id = #{planId}") + Date getLastInsertTimeByDickCodeAndPlanId(String dickCode,String planId); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index d18a3456..03162b3c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -3,19 +3,24 @@ 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.DfException; import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.domain.DfPlanOperator; import com.kms.yxgh.df.domain.DfPoint; import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto; +import com.kms.yxgh.df.dto.DfPlanSimpleDto; import com.kms.yxgh.df.dto.DfPointDto; +import com.kms.yxgh.df.dto.DfProjectListDto; import com.kms.yxgh.df.mapper.DfPlanMapper; 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.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; import lombok.AllArgsConstructor; @@ -38,6 +43,11 @@ public class DfPlanService extends BaseService { private final DfPlanOperatorMapper dfPlanOperatorMapper; private final DfPointMapper dfPointMapper; + public IPage search(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + return this.baseMapper.selectByDickCode(page,sp.getData().getDickCode(),sp.getData().getName()); + } + public DfPlanDetailDto getDetailById(String id) { DfPlan dfPlan = this.getById(id); DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); @@ -169,4 +179,6 @@ public class DfPlanService extends BaseService { .eq(DfPlan::getId, id); return this.getBaseMapper().selectCount(wp) > 0; } + + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java new file mode 100644 index 00000000..3d4a691a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java @@ -0,0 +1,69 @@ +package com.kms.yxgh.df.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfJbxx; +import com.kms.yg.df.mapper.BsSgcDfJbxxMapper; +import com.kms.yxgh.df.domain.DfProjectCheckingRel; +import com.kms.yxgh.df.dto.DfProjectListDto; +import com.kms.yxgh.df.dto.DfProjectCheckingRelDto; +import com.kms.yxgh.df.mapper.DfProjectCheckingRelMapper; +import com.shuili.common.core.domain.SearchParam; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @ClassName: DfProjectService + * @Description: TODO + * @Date: 2024/1/23 上午10:54 + * * + * @author: hxh + * @version: 1.0 + */ +@Service +@AllArgsConstructor +public class DfProjectService { + + private final BsSgcDfJbxxMapper dfProjectMapper; + private final DfProjectCheckingRelMapper dfProjectCheckingRelMapper; + + + public IPage getProjectList(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + return dfProjectMapper.getDfProjectListWithPage(page, sp.getData().getDikeName(), sp.getData().getDikeType()); + } + + @Transactional(rollbackFor = Exception.class) + public void relChecking(DfProjectCheckingRelDto dfProjectCheckingRelDto) { + String dickCode = dfProjectCheckingRelDto.getDickCode(); + List checkings = dfProjectCheckingRelDto.getCheckings(); + + unbindCheckingsFromDickCode(dickCode); + + bindCheckingsToDickCode(dickCode, checkings); + } + + private void unbindCheckingsFromDickCode(String dickCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(DfProjectCheckingRel::getDickCode, dickCode); + dfProjectCheckingRelMapper.delete(wrapper); + } + + private void bindCheckingsToDickCode(String dickCode, List plans) { + List projectPlanRels = plans.stream() + .map(checking -> { + DfProjectCheckingRel dfProjectCheckingRel = new DfProjectCheckingRel(); + dfProjectCheckingRel.setDickCode(dickCode); + dfProjectCheckingRel.setCheckingId(checking); + return dfProjectCheckingRel; + }) + .collect(Collectors.toList()); + + dfProjectCheckingRelMapper.insertBatch(projectPlanRels); + } +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 443eb158..c90801b3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -85,35 +85,45 @@ public class DfRecordService extends BaseService { @Transactional(rollbackFor = Exception.class) public DfRecordDetailDto start(StartPlan startPlan) { - DfPlanDetailDto planDetailDto = dfPlanService.getDetailById(startPlan.getPlanId()); - if (planDetailDto != null) { - planDetailDto.setId(null); - DfCheckingDetailDto checkingDetailDto = dfCheckingService.getDetailById( - planDetailDto.getXcId()); - if (checkingDetailDto != null) { - DfRecord record = new DfRecord(); - record.setPlanId(startPlan.getPlanId()); - record.setName(planDetailDto.getName() + DateUtils.getTime()); - record.setStatus(RecordStatus.CHECKING.getValue()); - getBaseMapper().insert(record); - String id = record.getId(); - if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { - checkingDetailDto.getItems().forEach(o -> { - DfRecordItem item = new DfRecordItem(); - item.setRecordId(id); - item.setContent(o.getContent()); - item.setParts(String.join(PART_SEPARATOR, o.getParts())); - item.setStatus(CheckingStatus.NORMAL.getValue()); - item.setProblem(""); - dfRecordItemMapper.insert(item); - }); - } - return this.getDetailById(id); - } else { - throw new DfException("查询巡查检查项数据异常"); + if (StringUtils.isEmpty(startPlan.getPlanId())) { + if (StringUtils.isEmpty(startPlan.getXcId())) { + throw new DfException("巡查计划id与巡查id不能都为空"); + } + return initRecord(startPlan, startPlan.getXcId(), null); + } else { + DfPlanDetailDto planDetailDto = dfPlanService.getDetailById(startPlan.getPlanId()); + if (planDetailDto != null) { + planDetailDto.setId(null); + return initRecord(startPlan, planDetailDto.getXcId(), planDetailDto.getName()); + } + throw new DfException("查询巡查计划"); + } + } + + private DfRecordDetailDto initRecord(StartPlan startPlan, String xcId, String name) { + DfCheckingDetailDto checkingDetailDto = dfCheckingService.getDetailById(xcId); + if (checkingDetailDto != null) { + DfRecord record = new DfRecord(); + record.setPlanId(startPlan.getPlanId()); + record.setName(StringUtils.isEmpty(name) ? checkingDetailDto.getName() : name + DateUtils.getTime()); + record.setStatus(RecordStatus.CHECKING.getValue()); + getBaseMapper().insert(record); + String id = record.getId(); + if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) { + checkingDetailDto.getItems().forEach(o -> { + DfRecordItem item = new DfRecordItem(); + item.setRecordId(id); + item.setContent(o.getContent()); + item.setParts(String.join(PART_SEPARATOR, o.getParts())); + item.setStatus(CheckingStatus.NORMAL.getValue()); + item.setProblem(""); + dfRecordItemMapper.insert(item); + }); } + return this.getDetailById(id); + } else { + throw new DfException("查询巡查检查项数据异常"); } - throw new DfException("查询巡查计划"); } public DfRecordDetailDto getDetailById(String id) { diff --git a/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql new file mode 100644 index 00000000..8c712b4b --- /dev/null +++ b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql @@ -0,0 +1,424 @@ +SET NAMES utf8mb4; +CREATE TABLE `bs_sgc_df_xs` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查表'; + +CREATE TABLE `bs_sgc_df_xspj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查与堤防绑定编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查与堤防绑定编号'; + +CREATE TABLE `bs_sgc_df_xsx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查内容编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查项表'; + +CREATE TABLE `bs_sgc_df_xsjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', + `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', + `IS_REMINDER` int COLLATE utf8mb4_general_ci COMMENT '是否提醒', + `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', + `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `FILES` text COLLATE utf8mb4_general_ci COMMENT '巡查依据附件文档', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划表'; + +CREATE TABLE `bs_sgc_df_xsjhzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划执行者编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划执行人表'; + +CREATE TABLE `bs_sgc_df_xsjhdw` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划点位编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划点位表'; + + + + +CREATE TABLE `bs_sgc_df_xsjhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查记录表'; + +CREATE TABLE `bs_sgc_df_xsjhjlz` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录子项编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `STATUS` int NOT NULL COMMENT '状态', + `PROBLEM` varchar(500) COLLATE utf8mb4_general_ci COMMENT '存在问题', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查检查记录子项表'; + +CREATE TABLE `bs_sgc_df_xsjhjgj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录轨迹编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查检查记录轨迹表'; + + +CREATE TABLE `bs_sgc_df_yhjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护计划编号', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `PLAN_TIME` datetime DEFAULT NULL COMMENT '计划时间', + `NATIONAL_SUPPLEMENT` float DEFAULT NULL COMMENT '国补资金', + `SELF_SUPPLEMENT` float DEFAULT NULL COMMENT '自筹资金', + `LOCATION` varchar(500) COLLATE utf8mb4_general_ci COMMENT '具体地点', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '维修养护内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护计划表'; + +CREATE TABLE `bs_sgc_df_yhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护记录编号', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', + `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', + `AFTER` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护结束', + `MAINTENANCE_FUNDS` float DEFAULT NULL COMMENT '养护费用', + `IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护记录表'; + +CREATE TABLE `bs_sgc_df_yhjlzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护执行者编号', + `RECORD_ID` int NOT NULL COMMENT '养护记录ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防维修养护执行人表'; + +CREATE TABLE `bs_sgc_df_hdjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划编号', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '害堤动物防治计划名称', + `TYPE` int DEFAULT NULL COMMENT '防治类型', + `DIKE_LEVEL` varchar(10) COLLATE utf8mb4_general_ci COMMENT '堤防级别', + `DIKE_TYPE` varchar(10) COLLATE utf8mb4_general_ci COMMENT '堤防类型', + `INSTRUCTION` varchar(500) COLLATE utf8mb4_general_ci COMMENT '防治说明', + `MONTH` int COLLATE utf8mb4_general_ci COMMENT '工作月份', + `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', + `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', + `IS_REMINDER` int COLLATE utf8mb4_general_ci COMMENT '是否提醒', + `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', + `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划'; + +CREATE TABLE `bs_sgc_df_hdjhxq` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划详情编号', + `PLAN_ID` int NOT NULL COMMENT '害堤动物防治计划ID', + `JOB_CONTENT` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '工作内容', + `CONSTRUCTION_DATE` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '施工日期', + `PLAN_DAYS` int COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '计划工日', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划详情表'; + + +CREATE TABLE `bs_sgc_df_hdjhzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划执行者编号', + `PLAN_ID` int NOT NULL COMMENT '害堤动物防治计划ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划执行人表'; + +CREATE TABLE `bs_sgc_df_hdjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划执行记录编号', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划名称', + `LOCATION` int COLLATE utf8mb4_general_ci COMMENT '施工地点', + `CONSTRUCTION_STATUS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查施工情况', + `PEST` int COLLATE utf8mb4_general_ci COMMENT '有害生物', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划执行记录表'; + +CREATE TABLE `bs_sgc_df_hdjltp` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划执行记录图片编号', + `RECORD_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '记录代码', + `URL` varchar(500) COLLATE utf8mb4_general_ci COMMENT '图片地址', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划执行记录图片表'; + +CREATE TABLE `bs_sgc_df_hdjlyy` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划执行记录用药编号', + `RECORD_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '记录代码', + `DRUG_NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '药物名称', + `CONCENTRATION` varchar(100) COLLATE utf8mb4_general_ci COMMENT '浓度', + `DOSE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '剂量', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='害堤动物防治计划执行记录用药表'; + + +CREATE TABLE `bs_sgc_sz_xs` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查表'; + + +CREATE TABLE `bs_sgc_sz_xsx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡查内容编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查项表'; + +CREATE TABLE `bs_sgc_sz_xsjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称', + `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', + `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', + `IS_REMINDER` int COLLATE utf8mb4_general_ci COMMENT '是否提醒', + `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', + `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划表'; + +CREATE TABLE `bs_sgc_sz_xsjhzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划执行者编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划执行人表'; + +CREATE TABLE `bs_sgc_sz_xsjhdw` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查计划点位编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查计划点位表'; + + +CREATE TABLE `bs_sgc_sz_xsjhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录编号', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查记录表'; + +CREATE TABLE `bs_sgc_sz_xsjhjlz` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录子项编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `PARTS` varchar(100) COLLATE utf8mb4_general_ci COMMENT '检查部位', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容', + `STATUS` int NOT NULL COMMENT '状态', + `PROBLEM` varchar(500) COLLATE utf8mb4_general_ci COMMENT '存在问题', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查检查记录子项表'; + +CREATE TABLE `bs_sgc_sz_xsjhjgj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查检查记录轨迹编号', + `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', + `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', + `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', + `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸巡视检查检查记录轨迹表'; + +CREATE TABLE `bs_sgc_sz_yhjh` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护计划编号', + `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `PLAN_TIME` datetime DEFAULT NULL COMMENT '计划时间', + `NATIONAL_SUPPLEMENT` float DEFAULT NULL COMMENT '国补资金', + `SELF_SUPPLEMENT` float DEFAULT NULL COMMENT '自筹资金', + `LOCATION` varchar(500) COLLATE utf8mb4_general_ci COMMENT '具体地点', + `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '维修养护内容', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护计划表'; + +CREATE TABLE `bs_sgc_sz_yhjl` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护记录编号', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', + `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', + `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', + `AFTER` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护结束', + `MAINTENANCE_FUNDS` float DEFAULT NULL COMMENT '养护费用', + `IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护记录表'; + +CREATE TABLE `bs_sgc_sz_yhjlzx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护执行者编号', + `RECORD_ID` int NOT NULL COMMENT '养护记录ID', + `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', + `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护执行人表'; diff --git a/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql new file mode 100644 index 00000000..77280954 --- /dev/null +++ b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql @@ -0,0 +1,14 @@ +SET NAMES utf8mb4; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码'; + +CREATE TABLE `bs_sgc_df_xspj` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查与堤防绑定编号', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查与堤防绑定编号';