Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java

@@ -108,7 +108,7 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper<BsSgcDfSafeJbxx> {
     IPage<DfProjectListDto> getDfYhProjectListWithPage(Page<DfProjectListDto> page, @Param("sp") DfYhProjectQueDto sp);
 
     @Select("<script>" +
-            "SELECT df.dike_code as dikeCode, df.dike_name as dikeName, df.dike_grad as dikeGrad, df.dike_type as dikeType, df.dike_len as dikeLen, df.adm_dep as engineeringManagementUnit, df.start_loc as startLoc, df.end_loc as endLoc " +
+            "SELECT df.dike_code as dikeCode, df.dike_name as dikeName, df.dike_grad as dikeGrad, df.dike_type as dikeType, df.dike_len as dikeLen, df.adm_dep as engineeringManagementUnit, df.start_loc as startLoc, df.end_loc as endLoc ,df.adcd " +
             "FROM att_dike_base df " +
             "WHERE 1=1 " +
             "AND df.expr_date is null " +
@@ -121,6 +121,9 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper<BsSgcDfSafeJbxx> {
             "<if test='dfProject.dikeName != null and dfProject.dikeName != \"\"'>" +
             "AND df.dike_name LIKE CONCAT('%', #{dfProject.dikeName}, '%') " +
             "</if>" +
+            "<if test='dfProject.adcd != null and dfProject.adcd != \"\"'>"+
+            "and df.adcd like concat(#{dfProject.adcd}, '%') "+
+            "</if>"+
             "</script>")
     IPage<DfYqProjectListDto> getDfYqProjectListWithPage(Page<DfYqProjectListDto> page, @Param("dfProject") DfYqProjectQueDto dfProject);
 

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java

@@ -1,13 +1,12 @@
 package com.kms.yg.sz.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.system.service.SysXzqhService;
-import com.kms.yg.sz.domain.BsSgcSzBzbp;
-import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
-import com.kms.yg.sz.domain.dto.HistogramDto;
 import com.kms.yg.sz.domain.dto.PieDto;
 import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
 import com.shuili.common.core.domain.SearchParam;
@@ -116,4 +115,11 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
         return map;
 
     }
+
+    public BsSgcSzSafeJbxx selectByWagaCode(String code) {
+        Wrapper<BsSgcSzSafeJbxx> queryWrapper = Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
+                .isNull(BsSgcSzSafeJbxx::getExprDate)
+                .eq(BsSgcSzSafeJbxx::getWagaCode, code);
+        return bsSgcSzSafeJbxxMapper.selectOne(queryWrapper);
+    }
 }

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java

@@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -50,14 +52,14 @@ public class DfYhPlan extends SyBaseEntity {
    */
   @Excel(name = "国补资金")
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @Excel(name = "自筹资金")
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java

@@ -29,6 +29,9 @@ public class DfAnimalPlanSimpleDto {
     @ApiModelProperty("堤防名称")
     private String dikeName;
 
+    @ApiModelProperty("堤防id")
+    private String dikeId;
+
     /**
      * 害堤动物防治计划名称
      */

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java

@@ -81,4 +81,10 @@ public class DfDangerousTaskSearchDto  {
 
     @ApiModelProperty(value = "是否排序")
     private String isOrder;
+
+    /**
+     * 病险工程核查分组ID
+     */
+    @ApiModelProperty(value = "病险工程核查分组ID")
+    private String groupId;
 }

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java

@@ -33,7 +33,8 @@ public class DfProjectListDto {
     private String startLoc;
     @ApiModelProperty(value = "终点位置")
     private String endLoc;
-
+    @ApiModelProperty("行政区划")
+    private String adcd;
     @ApiModelProperty(value = "工程管理单位")
     private String engineeringManagementUnit;
     @ApiModelProperty(value = "水务行政部门")

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java

@@ -3,6 +3,8 @@ package com.kms.yxgh.df.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -26,6 +28,12 @@ public class DfYhPlanDetailDto {
   @ApiModelProperty("堤防代码")
   private String dikeCode;
 
+  /**
+   * 堤防名称
+   */
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
   /**
    * 名称
    */
@@ -43,13 +51,13 @@ public class DfYhPlanDetailDto {
    * 国补资金
    */
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java

@@ -31,6 +31,9 @@ public class DfYhPlanDto {
     @ApiModelProperty("堤防名称")
     private String dikeName;
 
+    @ApiModelProperty("堤防id")
+    private  String dikeId;
+
     /**
      * 名称
      */

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java

@@ -34,5 +34,7 @@ public class DfYqProjectListDto {
     private String adcdStart;
     @ApiModelProperty("终点行政区划")
     private String adcdEnd;
+    @ApiModelProperty("行政区划")
+    private String adcd;
 
 }

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java

@@ -30,4 +30,7 @@ public class DfYqProjectQueDto {
 
     @ApiModelProperty(value = "结束行政区划")
     private String endAdcd;
+
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
 }

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java

@@ -20,11 +20,11 @@ public interface DfAnimalPlanMapper extends BaseMapper<DfAnimalPlan> {
 
 
     @Select("<script>" +
-            "SELECT p.id, p.dike_code AS dikeCode, j.dike_name AS dikeName, p.plan_time, p.name, p.type, j.dike_grad AS dikeGrad, j.dike_type AS dikeType, " +
+            "SELECT p.id, p.dike_code AS dikeCode, j.dike_name AS dikeName, p.plan_time, p.name, p.type, j.dike_grad AS dikeGrad, j.dike_type AS dikeType,j.id as dikeId," +
             "p.instruction, p.month, p.frequency, p.cycle_type AS cycleType, p.is_reminder AS isReminder, p.reminder_time AS reminderTime, " +
             "p.other_config AS otherConfig, p.create_uid AS createUid, p.update_uid AS updateUid, p.create_time as createTime,p.update_time as updateTime " +
             "FROM bs_sgc_df_hdjh p " +
-            "LEFT JOIN bs_sgc_df_gcda j ON p.dike_code = j.dike_code and j.expr_date is null " +
+            "LEFT JOIN att_dike_base j ON p.dike_code = j.dike_code and j.expr_date is null " +
             "WHERE 1=1 " +
             "<if test='dto.dikeCode != null and dto.dikeCode != \"\"'> " +
             "AND p.dike_code = #{dto.dikeCode} " +

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.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," +
-             "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " +
+             "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_df_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " +
              " FROM bs_sgc_df_bxgcfz a " +
              " LEFT JOIN sys_dept b ON a.dept_id = b.id " +
              " order by a.create_time desc")

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java

@@ -56,6 +56,9 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
             "<if test='dto.state != null and dto.state != \"\"'>" +
             "AND rw.state = #{dto.state} " +
             "</if>" +
+            "<if test='dto.groupId != null and dto.groupId != \"\"'>" +
+            "AND rw.GROUP_ID = #{dto.groupId} " +
+            "</if>" +
             "<if test='dto.isOrder != null and dto.isOrder != \"\"'>" +
             "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " +
             "</if>" +

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java

@@ -20,9 +20,9 @@ public interface DfYhPlanMapper extends BaseMapper<DfYhPlan> {
 
     @Select({
             "<script>",
-            "SELECT yh.id, yh.dike_code, yh.name, yh.plan_time, yh.national_supplement, yh.self_supplement, yh.location, yh.content, yh.create_time, yh.update_time, jb.dike_grad, jb.dike_name ",
+            "SELECT yh.id, yh.dike_code, yh.name, yh.plan_time, yh.national_supplement, yh.self_supplement, yh.location, yh.content, yh.create_time, yh.update_time, jb.dike_grad, jb.dike_name,jb.id as dike_id ",
             "FROM bs_sgc_df_yhjh yh ",
-            "LEFT JOIN bs_sgc_df_gcda jb ON yh.dike_code = jb.dike_code and jb.expr_date is null ",
+            "LEFT JOIN att_dike_base jb ON yh.dike_code = jb.dike_code and jb.expr_date is null ",
             "WHERE jb.expr_date is null ",
             "<if test='dto.dikeCode != null and dto.dikeCode != \"\"'>",
             "AND yh.dike_code = #{dto.dikeCode} ",

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

@@ -69,7 +69,7 @@ public class DfAnimalRecordService extends BaseService<DfAnimalRecordMapper, DfA
         DfAnimalRecord dfAnimalRecord = BeanCopyUtils.copy(dto, DfAnimalRecord.class);
         if (dfAnimalRecord != null) {
             dfAnimalRecord.setId(null);
-            if (!existRecord(dto.getPlanId())) {
+            if (existRecord(dto.getPlanId())) {
                 getBaseMapper().insert(dfAnimalRecord);
                 dto.setId(dfAnimalRecord.getId());
                 if (CollectionUtil.isNotEmpty(dto.getImages())) {

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

@@ -32,7 +32,10 @@ public class DfSuperviseTaskService extends BaseService<DfSuperviseTaskMapper, D
 
     public IPage<DfSuperviseTaskDto> list(SearchParam<DfSuperviseTaskDto> sp){
         Page<DfSuperviseTaskDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return this.getBaseMapper().selectPage(page, sp.getData());
+        //根据创建时间倒序排列
+        IPage<DfSuperviseTaskDto> pageData = this.getBaseMapper().selectPage(page, sp.getData());
+        pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
+        return pageData;
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -4,6 +4,8 @@ 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.yg.df.domain.BsSgcDfSafeJbxx;
+import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
 import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.df.domain.DfYhPlan;
 import com.kms.yxgh.df.dto.DfYhPlanDetailDto;
@@ -13,6 +15,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,10 +30,15 @@ import java.util.Optional;
 @Service
 public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> {
 
+    @Autowired
+    private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
 
     public DfYhPlanDetailDto getDetailById(String id) {
         DfYhPlan dfPlan = this.getById(id);
-        return BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class);
+        DfYhPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class);
+        BsSgcDfSafeJbxx dfInfo = bsSgcDfSafeJbxxService.selectByDikeCode(dfPlan.getDikeCode());
+        dto.setDikeName(dfInfo.getDikeName());
+        return dto;
     }
 
 

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

@@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -50,14 +52,14 @@ public class SzYhPlan extends SyBaseEntity {
    */
   @Excel(name = "国补资金")
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @Excel(name = "自筹资金")
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

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

@@ -73,4 +73,10 @@ public class SzDangerousTaskSearchDto {
 
     @ApiModelProperty(value = "是否排序")
     private String isOrder;
+
+    /**
+     * 病险工程核查分组ID
+     */
+    @ApiModelProperty(value = "病险工程核查分组ID")
+    private String groupId;
 }

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

@@ -3,6 +3,8 @@ package com.kms.yxgh.sz.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -26,6 +28,12 @@ public class SzYhPlanDetailDto {
   @ApiModelProperty("水闸代码")
   private String wagaCode;
 
+  /**
+   * 水闸名称
+   */
+    @ApiModelProperty("水闸名称")
+    private String wagaName;
+
   /**
    * 名称
    */
@@ -43,13 +51,13 @@ public class SzYhPlanDetailDto {
    * 国补资金
    */
   @ApiModelProperty("国补资金")
-  private Long nationalSupplement;
+  private BigDecimal nationalSupplement;
 
   /**
    * 自筹资金
    */
   @ApiModelProperty("自筹资金")
-  private Long selfSupplement;
+  private BigDecimal selfSupplement;
 
   /**
    * 具体地点

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

@@ -30,6 +30,9 @@ public class SzYhPlanSearchDto {
     @ApiModelProperty("水闸名称")
     private String wagaName;
 
+    @ApiModelProperty("水闸id")
+    private String wagaId;
+
     /**
      * 名称
      */

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

@@ -56,6 +56,9 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             "<if test='dto.state != null and dto.state != \"\"'>" +
             "AND rw.state = #{dto.state} " +
             "</if>" +
+            "<if test='dto.groupId != null and dto.groupId != \"\"'>" +
+            "AND rw.GROUP_ID = #{dto.groupId} " +
+            "</if>" +
             "<if test='dto.isOrder != null and dto.isOrder != \"\"'>" +
             "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " +
             "</if>" +

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

@@ -30,10 +30,10 @@ public interface SzYhPlanMapper extends BaseMapper<SzYhPlan> {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
                 SELECT("p.id, p.waga_code, j.waga_name as wagaName, p.name, p.plan_time, " +
-                        "p.national_supplement, p.self_supplement, p.location, p.content, j.waga_name," +
+                        "p.national_supplement, p.self_supplement, p.location, p.content, j.waga_name,j.id as waga_id, " +
                         "p.create_time, p.update_time"); // 添加了 p.create_time 和 p.update_time
                 FROM("bs_sgc_sz_yhjh p");
-                LEFT_OUTER_JOIN("bs_sgc_sz_jbxx j ON p.waga_code = j.waga_code and j.expr_date is null ");
+                LEFT_OUTER_JOIN("att_waga_base j ON p.waga_code = j.waga_code and j.expr_date is null ");
                 WHERE("1=1  ");
 
                 SzYhPlanSearchDto dto = (SzYhPlanSearchDto) param.get("dto");

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

@@ -4,7 +4,6 @@ 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.yg.sz.mapper.BsSgcSzGcdaMapper;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.sz.domain.SzSuperviseTask;
 import com.kms.yxgh.sz.dto.SzSuperviseTaskCommonDto;
@@ -33,7 +32,10 @@ public class SzSuperviseTaskService extends BaseService<SzSuperviseTaskMapper, S
 
     public IPage<SzSuperviseTaskDto> list(SearchParam<SzSuperviseTaskDto> sp){
         Page<SzSuperviseTaskDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return this.getBaseMapper().selectPage(page, sp.getData());
+        //根据创建时间倒序排列
+        IPage<SzSuperviseTaskDto> pageData = this.getBaseMapper().selectPage(page, sp.getData());
+        pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
+        return pageData;
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -4,6 +4,8 @@ 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.yg.sz.domain.BsSgcSzSafeJbxx;
+import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.sz.domain.SzYhPlan;
 import com.kms.yxgh.sz.dto.SzYhPlanDetailDto;
@@ -13,6 +15,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,11 +27,15 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class SzYhPlanService extends BaseService<SzYhPlanMapper, SzYhPlan> {
-
+    @Autowired
+    private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
 
     public SzYhPlanDetailDto getDetailById(String id) {
         SzYhPlan szPlan = this.getById(id);
-        return BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
+        SzYhPlanDetailDto dto = BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
+        BsSgcSzSafeJbxx szInfo = bsSgcSzSafeJbxxService.selectByWagaCode(dto.getWagaCode());
+        dto.setWagaName(szInfo.getWagaName());
+        return dto;
     }
 
 

sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql

@@ -179,7 +179,7 @@ CREATE TABLE `bs_sgc_df_yhjlzx` (
 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 '害堤动物防治计划名称',
+  `NAME` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '害堤动物防治计划名称',
   `TYPE` int DEFAULT NULL COMMENT '防治类型',
   `INSTRUCTION` varchar(500) COLLATE utf8mb4_general_ci  COMMENT '防治说明',
   `MONTH` int  COLLATE utf8mb4_general_ci COMMENT '工作月份',
@@ -959,4 +959,123 @@ LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR
 union all
 SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,sz.`DEVICE_ID`,sz.`DEVICE_NAME`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_sz_dtsbr` AS sz
-LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null
+LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null
+
+
+
+CREATE TABLE `bs_sgc_qqjd_dir` (
+                                   `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+                                   `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '目录名称',
+                                   `parent_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '父节点ID',
+                                   `xpath` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '节点路径',
+                                   `dir_seq` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '目录序列',
+                                   `order_nm` decimal(8,0) DEFAULT NULL COMMENT '排序',
+                                   `pub_date` datetime DEFAULT NULL COMMENT '发布时间',
+                                   `create_user` varchar(255) DEFAULT NULL COMMENT '创建人',
+                                   `directory_description` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '图层目录描述',
+                                   `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                   PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+CREATE TABLE `bs_sgc_qqjd_dir_layer` (
+                                         `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+                                         `dir_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '目录id，和sy_dir的主键进行关联',
+                                         `layer_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层id，和sy_layer的主键进行关联',
+                                         `order_nm` decimal(8,0) DEFAULT NULL COMMENT '排序序号值',
+                                         `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                         PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+CREATE TABLE `bs_sgc_qqjd_layer` (
+                                     `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+                                     `service_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层名称',
+                                     `service_name_alias` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层别名',
+                                     `service_url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层服务URL',
+                                     `service_type` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层服务类型',
+                                     `service_index` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层索引，对于iserver发布的wfs服务，索引值为`工作空间:图层名称`',
+                                     `pub_date` datetime DEFAULT NULL COMMENT '发布日期',
+                                     `create_user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
+                                     `layer_3d_type` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '3d图层类型 白膜/BIM/倾斜摄影/点云/人工建模',
+                                     `tile_size` int DEFAULT NULL COMMENT '瓦片大小,wmts服务需要填写',
+                                     `tile_matrix_set` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '矩阵集,wmts服务需要填写',
+                                     `dir_id` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '所属目录id',
+                                     `dir_name` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '所属目录名称',
+                                     `remark` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
+                                     `format` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '后缀名，wmts服务需要填写',
+                                     `data` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层表扩展字段集合的json',
+                                     `annotation_url` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层服务注记URL(底图)',
+                                     `service_token` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图层服务token(底图)',
+                                     `annotation_service_index` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '注记图层服务索引(底图)',
+                                     `tileset_option` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '3D tiles性能调试参数',
+                                     `is_layer_group` tinyint(1) DEFAULT '0' COMMENT '是否为图层组（配置geoserver图层组时需要判断，如果为图层组，则不加载图层组默认的样式）',
+                                     `relation_service_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '0' COMMENT '关联服务id',
+                                     `relation_service_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '0' COMMENT '关联服务名称',
+                                     `relation_style_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '关联图层样式id',
+                                     `relation_style_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '关联图层样式名称',
+                                     `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                     `extend_data` longtext COMMENT '扩展字段，主要用来标识关联关系',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+CREATE TABLE `bs_sgc_qqjd_layer_field` (
+                                           `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键id',
+                                           `layer_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图层id',
+                                           `field` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段名称',
+                                           `field_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段名称',
+                                           `field_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字段类型',
+                                           `is_show` tinyint DEFAULT NULL COMMENT '0：false；1：true',
+                                           `order_nm` int DEFAULT NULL COMMENT '排序',
+                                           PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+CREATE TABLE `bs_sgc_qqjd_layer_style` (
+                                           `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键id',
+                                           `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '样式名称',
+                                           `layer_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图层类型',
+                                           `information` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '样式信息',
+                                           `remark` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '样式备注',
+                                           `style_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '适用类型',
+                                           `view_img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '样式图片Url',
+                                           `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                           `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                           `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                           PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+CREATE TABLE `bs_sgc_qqjd_scene` (
+                                     `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+                                     `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '目录名称',
+                                     `pub_date` datetime DEFAULT NULL COMMENT '发布时间',
+                                     `create_user` varchar(255) DEFAULT NULL COMMENT '创建人',
+                                     `interface_address` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '接口地址',
+                                     `description` longtext COMMENT '描述',
+                                     `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+CREATE TABLE `bs_sgc_qqjd_scene_config_relation` (
+                                                     `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+                                                     `scene_id` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '场景id',
+                                                     `init_time` datetime DEFAULT NULL COMMENT '初始时间',
+                                                     `init_weather` int DEFAULT NULL COMMENT '初始天气，晴天:1、多云:2、阴天:3、小雨:4、中雨:5、暴雨:6、雪天:7、雾天:8',
+                                                     `weather_intensity` int DEFAULT NULL COMMENT '天气强度',
+                                                     `ambient_light_intensity` int DEFAULT NULL COMMENT '环境光强度',
+                                                     `movement_sensitivity` int DEFAULT NULL COMMENT '移动灵敏度',
+                                                     `rotation_sensitivity` int DEFAULT NULL COMMENT '旋转灵敏度',
+                                                     `zoom_sensitivity` int DEFAULT NULL COMMENT '缩放灵敏度\r\n',
+                                                     `view_img` longtext COLLATE utf8mb4_general_ci COMMENT '视点预览图',
+                                                     `layer_id` text COLLATE utf8mb4_general_ci COMMENT '关联图层id',
+                                                     `camera_posture` json DEFAULT NULL COMMENT '相机姿态信息',
+                                                     `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                                     PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+CREATE TABLE `bs_sgc_qqjd_scene_dir_relation` (
+                                                  `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
+                                                  `scene_id` varchar(255) DEFAULT NULL COMMENT '场景id',
+                                                  `dir_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '目录id，和sy_dir的主键进行关联',
+                                                  `relate_date` datetime DEFAULT NULL COMMENT '场景和图层目录关联日期',
+                                                  `is_valid` int DEFAULT NULL COMMENT '数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除',
+                                                  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;

sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

@@ -558,3 +558,4 @@ SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,
 FROM `bs_sgc_sz_dtsbr` AS sz
 LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null
 
+ALTER TABLE `bs_sgc_df_hdjh` MODIFY COLUMN `NAME` varchar(100) COLLATE utf8mb4_general_ci  COMMENT '害堤动物防治计划名称';