Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
master_tdsql
ljf 11 months ago
parent
commit
67fa02f48b
  1. 51
      shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
  2. 4
      shuili-common/pom.xml
  3. 2
      shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java
  4. 12
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  5. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
  6. 6
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java
  7. 277
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
  8. 2
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java
  9. 5
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java
  10. 3
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java
  11. 6
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
  12. 2
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java
  13. 4
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java
  14. 2
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
  15. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java
  16. 11
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  17. 3
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
  18. 4
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
  19. 3
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java
  20. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java
  21. 2
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java
  22. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java
  23. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java
  24. 4
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  25. 4
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
  26. 6
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml
  27. 9
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml
  28. 4
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
  29. 7
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
  30. 5
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml
  31. 11
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml
  32. 6
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

51
shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java

@ -9,6 +9,10 @@ import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.kms.yg.dd.domain.AttDiscBase;
import com.kms.yg.dd.service.AttDiscBaseService;
import com.kms.yg.df.domain.BsSgcDfJbxx;
import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
import com.kms.yg.df.service.BsSgcDfJbxxService;
import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
import com.kms.yg.ly.domain.AttBasBase;
import com.kms.yg.ly.service.AttBasBaseService;
import com.kms.yg.rv.domain.AttRvBase;
@ -17,6 +21,8 @@ import com.kms.yg.sk.domain.AttResBase;
import com.kms.yg.sk.domain.AttResRspp;
import com.kms.yg.sk.service.AttResBaseService;
import com.kms.yg.sk.service.AttResRsppService;
import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.kms.yg.xgxd.domain.AttDpdsBase;
import com.kms.yg.xgxd.service.AttDpdsBaseService;
import io.swagger.models.auth.In;
@ -57,6 +63,12 @@ public class YgSynchronous {
@Autowired
AttDiscBaseService attDiscBaseService;
@Autowired
BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
private static String XH3CID = "3359137640337";
private static String XH3CAPPKEY = "q7sli9ch";
@ -83,7 +95,10 @@ public class YgSynchronous {
static final String xgxdsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dpds_base" ;
//流域基本数据
static final String llsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_bas_base" ;
//
//水闸基础信息
static final String dawb="http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_base";
//堤防基础信息
static final String dadb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dike_base";
/**
* 同步
@ -179,6 +194,40 @@ public class YgSynchronous {
}
@GetMapping("dadb")
@Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
public void dadb(){
int pageNum=1;
int pageSize=999999;
String s=sendRequest(dadb+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
String data=JSONObject.parseObject(s).getString("data");
List<BsSgcDfSafeJbxx> bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class);
bsSgcDfSafeJbxxes.forEach(bsSgcDfSafeJbxx -> {
bsSgcDfSafeJbxx.preInsert();
bsSgcDfSafeJbxx.setStatus("6");
bsSgcDfSafeJbxx.setId(bsSgcDfSafeJbxx.getDikeCode());
bsSgcDfSafeJbxxService.saveOrUpdate(bsSgcDfSafeJbxx);
});
}
@GetMapping("dawb")
@Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
public void dawb(){
int pageNum=1;
int pageSize=999999;
String s=sendRequest(dawb+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
String data=JSONObject.parseObject(s).getString("data");
List<BsSgcSzSafeJbxx> bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class);
bsSgcSzSafeJbxxes.forEach(bsSgcSzSafeJbxx -> {
bsSgcSzSafeJbxx.preInsert();
bsSgcSzSafeJbxx.setStatus("6");
bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode());
bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx);
});
}
/**
* 水库基本信息
*/

4
shuili-common/pom.xml

@ -17,7 +17,7 @@
<bitwalker.version>1.21</bitwalker.version>
<fastjson.version>1.2.79</fastjson.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.fileupload.version>1. 4</commons.fileupload.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<servlet-api.version>4.0.1</servlet-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -39,8 +39,6 @@
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>

2
shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java

@ -24,7 +24,7 @@ public class FileUploadUtils
/**
* 默认大小 50M
*/
public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
public static final long DEFAULT_MAX_SIZE = 200 * 1024 * 1024;
/**
* 默认的文件名最大长度 100

12
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@ -131,14 +131,16 @@ public class BsSgcDfSafeJbxxController extends BaseController {
BsSgcDfSafeJbxx data = sp.getData();
Page<BsSgcDfSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
.eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0")
.or().eq(BsSgcDfSafeJbxx::getZxStatus, "0")
Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).apply("1=1").like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
// .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0")
// .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0")
.eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
.eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
.isNull(BsSgcDfSafeJbxx::getExprDate)
.likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
.orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
return page;
}
@ -212,6 +214,8 @@ public class BsSgcDfSafeJbxxController extends BaseController {
.orderByDesc(BsSgcDfSafeJbxx::getExprDate));
bsSgcDfSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId());
BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0);
bsSgcDfSafeJbxx.setStatus("5");
bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
bsSgcDfSafeJbxx.setExprDate(null);
return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcDfSafeJbxx));
}

2
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java

@ -79,7 +79,7 @@ public class BsSgcDfYhxxController extends BaseController
String xzqh = sysXzqhService.getXzqh();
List<PieDto> list = bsSgcSzYhxxService.getPie(layer, xzqh);
String subString = sysXzqhService.getSubString(xzqh);
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> map = new HashMap<>();
for (PieDto pieDto : list) {

6
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java

@ -34,7 +34,8 @@ public class BsSgcDfBzbp extends BaseEntity
/** 堤防id */
@Excel(name = "堤防编码")
@ApiModelProperty("堤防编码")
private String embankmentCode;
@TableField("embankment_code")
private String dikeCode;
/** 标识位置 */
@Excel(name = "标识位置")
@ -93,7 +94,8 @@ public class BsSgcDfBzbp extends BaseEntity
private String adcd;
private String embankmentName;
@TableField("embankment_name")
private String dikeName;
@TableField(exist = false)
private String number;

277
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java

@ -1,14 +1,17 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
/**
@ -20,460 +23,336 @@ import java.util.Date;
@TableName("att_dike_base")
@Data
@ApiModel("堤防安全管理基本信息")
public class BsSgcDfSafeJbxx extends BaseEntity {
public class BsSgcDfSafeJbxx extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
* 堤防名称
*/
/** 堤防名称 */
@Excel(name = "堤防名称")
@ApiModelProperty("堤防名称")
private String dikeName;
/**
* 堤防代码
*/
/** 堤防代码 */
@ApiModelProperty("堤防名称")
@TableField("dike_CODE")
private String dikeCode;
/**
* 堤防型式
*/
/** 堤防型式 */
@Excel(name = "堤防型式")
@ApiModelProperty("堤防型式")
private String dikePatt;
/**
* 起点经度
*/
/** 起点经度 */
@Excel(name = "起点经度")
@ApiModelProperty("起点经度")
private String dikeStartLong;
/**
* 起点纬度
*/
/** 起点纬度 */
@Excel(name = "起点纬度")
@ApiModelProperty("起点纬度")
private String dikeStartLat;
/**
* 终点经度
*/
/** 终点经度 */
@Excel(name = "终点经度")
@ApiModelProperty("终点经度")
private String dikeEndLong;
/**
* 终点纬度
*/
/** 终点纬度 */
@Excel(name = "终点纬度")
@ApiModelProperty("终点纬度")
private String dikeEndLat;
/**
* 堤防所在位置
*/
/** 堤防所在位置 */
@Excel(name = "堤防所在位置")
@ApiModelProperty("堤防所在位置")
private String dikeLoc;
/**
* 堤防类型
*/
/** 堤防类型 */
@Excel(name = "堤防类型")
@ApiModelProperty("堤防类型")
private String dikeType;
/**
* 堤防用途
*/
/** 堤防用途 */
@Excel(name = "堤防用途")
@ApiModelProperty("堤防用途")
private String dikeUse;
/**
* 堤防级别
*/
/** 堤防级别 */
@Excel(name = "堤防级别")
@ApiModelProperty("堤防级别")
private String dikeGrad;
/**
* 主要建筑物级别
*/
/** 主要建筑物级别 */
@Excel(name = "主要建筑物级别")
@ApiModelProperty("主要建筑物级别")
private String mainBuildGrad;
/**
* 最大过闸流量
* <p>
* m³/s
*/
/** 最大过闸流量
m³/s */
@Excel(name = "最大过闸流量 ", readConverterExp = "m=³/s")
@ApiModelProperty("最大过闸流量 ")
private String desLockDisc;
/**
* 闸孔数量
*/
/** 闸孔数量 */
@Excel(name = "闸孔数量")
@ApiModelProperty("闸孔数量")
private String gaorNum;
/**
* 闸孔总净宽
*/
/** 闸孔总净宽 */
@Excel(name = "闸孔总净宽")
@ApiModelProperty("闸孔总净宽")
private String gaorTotNetWid;
/**
* 工程建设情况
*/
/** 工程建设情况 */
@Excel(name = "工程建设情况")
@ApiModelProperty("工程建设情况")
private String engStat;
/**
* 开工时间
*/
/** 开工时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开工时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("开工时间")
private Date startDate;
/**
* 建成时间
*/
/** 建成时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("建成时间")
private Date compDate;
/**
* 归口管理部门
*/
/** 归口管理部门 */
@Excel(name = "归口管理部门")
@ApiModelProperty("归口管理部门")
private String admDep;
/**
* 是否为套闸工程
*/
/** 是否为套闸工程 */
@Excel(name = "是否为套闸工程")
@ApiModelProperty("是否为套闸工程")
private String isGateProject;
/**
* 观测项目
*/
/** 观测项目 */
@Excel(name = "观测项目")
@ApiModelProperty("观测项目")
private String observationProject;
/**
* 水准基面
*/
/** 水准基面 */
@Excel(name = "水准基面")
@ApiModelProperty("水准基面")
private String levelDatum;
/**
* 堤防概况
*/
/** 堤防概况 */
@Excel(name = "堤防概况")
@ApiModelProperty("堤防概况")
private String dikeOverview;
/**
* $column.columnComment
*/
/** $column.columnComment */
@Excel(name = "堤防概况")
@ApiModelProperty("堤防概况")
private String createUid;
/**
* $column.columnComment
*/
/** $column.columnComment */
@Excel(name = "堤防概况")
@ApiModelProperty("堤防概况")
private String updateUid;
/**
* $column.columnComment
*/
/** $column.columnComment */
@Excel(name = "堤防概况")
@ApiModelProperty("堤防概况")
private String owerDept;
/**
* $column.columnComment
*/
/** $column.columnComment */
@Excel(name = "堤防概况")
@ApiModelProperty("堤防概况")
private String relation;
/**
* 登记状态
*/
/** 登记状态 */
@Excel(name = "登记状态")
@ApiModelProperty("登记状态")
private String status;
/**
* 安全类别
*/
/** 安全类别 */
@Excel(name = "安全类别")
@ApiModelProperty("安全类别")
private String securityCategory;
/**
* 行政区划
*/
/** 行政区划 */
@Excel(name = "行政区划")
@ApiModelProperty("行政区划")
private String adcd;
/**
* 换证状态
*/
/** 换证状态 */
@Excel(name = "换证状态")
@ApiModelProperty("换证状态")
private String hzStatus;
/**
* 注销状态
*/
/** 注销状态 */
@Excel(name = "注销状态")
@ApiModelProperty("注销状态")
private String zxStatus;
/**
* $column.columnComment
*/
/** $column.columnComment */
@Excel(name = "注销状态")
@ApiModelProperty("注销状态")
private String reason;
/**
* 起点所在位置
*/
/** 起点所在位置 */
@Excel(name = "起点所在位置")
@ApiModelProperty("起点所在位置")
private String startLoc;
/**
* 终点所在位置
*/
/** 终点所在位置 */
@Excel(name = "终点所在位置")
@ApiModelProperty("终点所在位置")
private String endLoc;
/**
* 堤防长度
*/
/** 堤防长度 */
@Excel(name = "堤防长度")
@ApiModelProperty("堤防长度")
private Long dikeLen;
/**
* 堤防起点桩号
*/
/** 堤防起点桩号 */
@Excel(name = "堤防起点桩号")
@ApiModelProperty("堤防起点桩号")
private String dikeStartNum;
/**
* 堤防终点桩号
*/
/** 堤防终点桩号 */
@Excel(name = "堤防终点桩号")
@ApiModelProperty("堤防终点桩号")
private String dikeEndNum;
/**
* 工程任务
*/
/** 工程任务 */
@Excel(name = "工程任务")
@ApiModelProperty("工程任务")
private String engTask;
/**
* 所在河流
*/
/** 所在河流 */
@Excel(name = "所在河流")
@ApiModelProperty("所在河流")
private String dikeRiver;
/**
* 河流岸别
*/
/** 河流岸别 */
@Excel(name = "河流岸别")
@ApiModelProperty("河流岸别")
private String dikeRvbk;
/**
* 规划防洪潮标准
*/
/** 规划防洪潮标准 */
@Excel(name = "规划防洪潮标准")
@ApiModelProperty("规划防洪潮标准")
private String dikePlnStda;
/**
* 现状防洪潮标准
*/
/** 现状防洪潮标准 */
@Excel(name = "现状防洪潮标准")
@ApiModelProperty("现状防洪潮标准")
private String dikeCrtStda;
/**
* 达标长度
*/
/** 达标长度 */
@Excel(name = "达标长度")
@ApiModelProperty("达标长度")
private String dikeStdaLen;
/**
* 不达标长度
*/
/** 不达标长度 */
@Excel(name = "不达标长度")
@ApiModelProperty("不达标长度")
private String dikeNotStdaLen;
/**
* 不达标位置
*/
/** 不达标位置 */
@Excel(name = "不达标位置")
@ApiModelProperty("不达标位置")
private String dikeNotStdaLoc;
/**
* 高程系统
*/
/** 高程系统 */
@Excel(name = "高程系统")
@ApiModelProperty("高程系统")
private String elevSys;
/**
* 起点堤顶高程
*/
/** 起点堤顶高程 */
@Excel(name = "起点堤顶高程")
@ApiModelProperty("起点堤顶高程")
private String startDikeTopEl;
/**
* 终点堤顶高程
*/
/** 终点堤顶高程 */
@Excel(name = "终点堤顶高程")
@ApiModelProperty("终点堤顶高程")
private String endDikeTopEl;
/**
* 防浪墙顶最低高程
*/
/** 防浪墙顶最低高程 */
@Excel(name = "防浪墙顶最低高程")
@ApiModelProperty("防浪墙顶最低高程")
private String dikeWawaMinElev;
/**
* 防浪墙顶最高高程
*/
/** 防浪墙顶最高高程 */
@Excel(name = "防浪墙顶最高高程")
@ApiModelProperty("防浪墙顶最高高程")
private String dikeWawaMaxElev;
/**
* 防浪墙顶最低高程位置
*/
/** 防浪墙顶最低高程位置 */
@Excel(name = "防浪墙顶最低高程位置")
@ApiModelProperty("防浪墙顶最低高程位置")
private String dikeWawaMinLoc;
/**
* 防浪墙顶最高高程位置
*/
/** 防浪墙顶最高高程位置 */
@Excel(name = "防浪墙顶最高高程位置")
@ApiModelProperty("防浪墙顶最高高程位置")
private String dikeWawaMaxLoc;
/**
* 堤顶最低高程
*/
/** 堤顶最低高程 */
@Excel(name = "堤顶最低高程")
@ApiModelProperty("堤顶最低高程")
private String dikeElevMin;
/**
* 堤顶最高高程
*/
/** 堤顶最高高程 */
@Excel(name = "堤顶最高高程")
@ApiModelProperty("堤顶最高高程")
private String dikeElevMax;
/**
* 堤防最小高度
*/
/** 堤防最小高度 */
@Excel(name = "堤防最小高度")
@ApiModelProperty("堤防最小高度")
private String dikeHeigMin;
/**
* 堤防最大高度
*/
/** 堤防最大高度 */
@Excel(name = "堤防最大高度")
@ApiModelProperty("堤防最大高度")
private String dikeHeigMax;
/**
* 堤顶最小宽度
*/
/** 堤顶最小宽度 */
@Excel(name = "堤顶最小宽度")
@ApiModelProperty("堤顶最小宽度")
private String dikeTopWidMin;
/**
* 堤顶最大宽度
*/
/** 堤顶最大宽度 */
@Excel(name = "堤顶最大宽度")
@ApiModelProperty("堤顶最大宽度")
private String dikeTopWidMax;
/**
* 穿堤水闸数
*/
/** 穿堤水闸数 */
@Excel(name = "穿堤水闸数")
@ApiModelProperty("穿堤水闸数")
private String sluicesAmount;
/**
* 穿堤泵站数
*/
/** 穿堤泵站数 */
@Excel(name = "穿堤泵站数")
@ApiModelProperty("穿堤泵站数")
private String pumpsAmount;
/**
* 备注
*/
/** 备注 */
@Excel(name = "备注")
@ApiModelProperty("备注")
private String note;
/**
* 记录生效时间
*/
/** 记录生效时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录生效时间")
@TableField(value = "EFF_DATE", updateStrategy=FieldStrategy.IGNORED)
private Date effDate;
/**
* 记录失效时间
*/
/** 记录失效时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录失效时间")
@TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED)
private Date exprDate;
}

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

@ -21,7 +21,7 @@ public interface BsSgcDfBzhjsMapper extends BaseMapper<BsSgcDfBzhjs> {
List<BsSgcDfBzhjs> getList(@Param("id") String id,
@Param("dikeType") String dikeType,
@Param("dikeName") String dikeName,
@Param("dikeCode") String dikeCode,
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,

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

@ -19,9 +19,10 @@ public interface BsSgcDfDaglMapper extends BaseMapper<BsSgcDfDagl> {
List<BsSgcDfDagl> getList(@Param("id") String id,
@Param("dikeType") String dikeType,
@Param("dikeName") String dikeName,
@Param("dikeCode") String dikeCode,
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("unit") String unit);
}

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

@ -24,7 +24,8 @@ public interface BsSgcDfFzrMapper extends BaseMapper<BsSgcDfFzr> {
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("dikeName")String dikeName);
List<PieDto> getType1(@Param("layer") Integer layer,
@Param("adcd") String adcd);

6
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java

@ -32,11 +32,11 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
BsSgcDfBzbp projectInfo = sp.getData();
if (projectInfo != null) {
String projectName = projectInfo.getEmbankmentName();
String dikeCode=projectInfo.getDikeCode();
// String projectType = projectInfo.getEmbankmentType();
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.like(projectName != null, "embankment_name", projectName);
queryWrapper.like(dikeCode != null, "dick_code", dikeCode);
// queryWrapper.like(projectType != null, "embankment_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
}
@ -54,7 +54,7 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
.selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), adcd);
.selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd);
Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();
bsSgcDfBzbpPage.setRecords(infoPage);

2
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java

@ -36,7 +36,7 @@ public class BsSgcDfBzhjsService extends BaseService<BsSgcDfBzhjsMapper, BsSgcDf
BsSgcDfBzhjs data = sp.getData();
List<BsSgcDfBzhjs> list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
List<BsSgcDfBzhjs> list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
Page<BsSgcDfBzhjs> page = new Page<>();

4
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java

@ -35,8 +35,8 @@ public class BsSgcDfDaglService extends BaseService<BsSgcDfDaglMapper, BsSgcDfDa
BsSgcDfDagl data = sp.getData();
List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit());
Page<BsSgcDfDagl> page = new Page<>();
page.setTotal(list.size());

2
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java

@ -83,7 +83,7 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
Map<String, Object> params = sp.getParams();
List<BsSgcSzFzr> list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),data.getDikeName());
Page<BsSgcSzFzr> page = new Page<>();

2
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java

@ -123,7 +123,7 @@ public class BsSgcSzCxjlController extends BaseController
BsSgcSzCxjl dfhdm = bsSgcSzCxjlService.getById(id);
dfhdm.setExprDate(new Date());
dfhdm.setId(UUID.randomUUID().toString());
bsSgcSzCxjlService.save(dfhdm);
// bsSgcSzCxjlService.save(dfhdm);
bsSgcSzCxjl.setEffDate(new Date());
bsSgcSzCxjl.setExprDate(null);

11
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@ -64,6 +64,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
private SysDeptService sysDeptService;
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
@ -115,6 +116,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.isNull(BsSgcSzSafeJbxx::getExprDate)
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
return page;
@ -127,11 +129,12 @@ public class BsSgcSzSafeJbxxController extends BaseController {
Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
.eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
.or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
.eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
// .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
// .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
.eq(data.getWagaType()!=null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
.apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
.orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
return page;
@ -199,6 +202,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId());
BsSgcSzSafeJbxx bsSgcDfSafeJbxx = list.get(0);
bsSgcDfSafeJbxx.setExprDate(null);
bsSgcDfSafeJbxx.setStatus("5");
bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx));
}
return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));

3
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@ -104,11 +104,12 @@ public class BsSgcSzFzr extends BaseEntity
private String type;
@TableField(exist = false)
private String wagaName;
private String wageName;
/*
@TableField("waga_type")
private String wagaType;*/
private String wagaCode;
private String adcd;

4
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@ -2,6 +2,8 @@ package com.kms.yg.sz.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -279,6 +281,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录生效时间")
@TableField(value = "EFF_DATE", updateStrategy= FieldStrategy.IGNORED)
private Date effDate;
/**
@ -288,6 +291,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录失效时间")
@TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED)
private Date exprDate;
}

3
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java

@ -25,6 +25,7 @@ public interface BsSgcSzBzhjsMapper extends BaseMapper<BsSgcSzBzhjs> {
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCOde);
}

4
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java

@ -24,5 +24,7 @@ public interface BsSgcSzDaglMapper extends BaseMapper<BsSgcSzDagl> {
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
@Param("pageSize") int pageSize,
@Param("wagaCode")String wagaCode,
@Param("unit")String unit);
}

2
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java

@ -19,7 +19,7 @@ import java.util.List;
public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
List<BsSgcSzFzr> getList(@Param("id") String id,
@Param("wagaCode") String wagaCode,
@Param("wageName") String wageName,
@Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum,

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

@ -34,7 +34,7 @@ public class BsSgcSzBzhjsService extends BaseService<BsSgcSzBzhjsMapper, BsSgcSz
BsSgcSzBzhjs data = sp.getData();
List<BsSgcSzJfgl> list= bsSgcSzBzhjsMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode());
Page<BsSgcSzJfgl> page = new Page<>();
page.setRecords(list);

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

@ -34,7 +34,7 @@ public class BsSgcSzDaglService extends BaseService<BsSgcSzDaglMapper, BsSgcSzDa
List<BsSgcSzDagl> list = bsSgcSzDaglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit());
Page<BsSgcSzDagl> page = new Page<>();
page.setTotal(list.size());

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

@ -47,7 +47,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
BsSgcSzFzr projectInfo = sp.getData();
if (projectInfo != null) {
String projectName = projectInfo.getWagaName();
String projectName = projectInfo.getWageName();
// String projectType = projectInfo.getWagaType();
queryWrapper.eq(projectInfo.getWagaCode()!=null,"waga_code", projectInfo.getWagaCode());
@ -80,7 +80,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
Map<String, Object> params = sp.getParams();
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWagaCode(), sysXzqhService.getSubString(data.getAdcd()),
List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzFzr> page = new Page<>();

4
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@ -7,10 +7,10 @@
<resultMap type="com.kms.yg.df.domain.BsSgcDfBzbp" id="Result">
<id property="id" column="id" />
<result property="embankmentName" column="embankment_name" />
<result property="dikeName" column="embankment_name" />
<result property="adcd" column="adcd" />
<result property="number" column="number" />
<result property="embankmentCode" column="embankment_code" />
<result property="dikeCode" column="embankment_code" />
</resultMap>

6
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml

@ -30,8 +30,8 @@
<if test="dikeType!=null and dikeType!=''">
and sj.dike_type = #{dikeType}
</if>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_name LIKE concat('%',#{dikeName},'%')
<if test="dikeCode!=null and dikeCode!=''">
and sj.dike_CODE LIKE concat('%',#{dikeCode},'%')
</if>
<if test="adcd!=null and adcd !=''">
@ -40,6 +40,8 @@
<if test="id!=null and id!=''">
and sf.id=#{id}
</if>
and sj.EXPR_DATE is null
</where>
order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
</mapper>

9
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml

@ -32,8 +32,8 @@
<if test="dikeType!=null and dikeType!=''">
and sj.dike_type = #{dikeType}
</if>
<if test="dikeName!=null and dikeName!=''">
and sj.dike_name LIKE concat('%',#{dikeName},'%')
<if test="dikeCode!=null and dikeCode!=''">
and sj.dike_CODE =#{dikeCode}
</if>
<if test="adcd!=null and adcd !=''">
@ -42,6 +42,11 @@
<if test="id!=null and id!=''">
and sd.id=#{id}
</if>
<if test="unit != null and unit != ''">
and sj.ADM_DEP LIKE CONCAT('%',#{unit})
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
</mapper>

4
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml

@ -64,8 +64,8 @@
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="dikeCode!=null and dikeCode!=''">
and sf.dike_code =#{dikeCode}
<if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME like concat('%',#{dikeName},'%')
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>

7
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml

@ -74,11 +74,10 @@
</select>
<select id="getHistogram" resultMap="pieDto">
select * from (
<include refid="info"></include>
<if test="layer==1">
WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0'
</if>
<if test="layer==2">
WHERE
@ -87,7 +86,7 @@
<if test="layer==3">
WHERE
sj.adcd = #{adcd} and sj.status!='0'
</if> ) t
GROUP BY t.`status`
</if>
GROUP BY sy.`status`
</select>
</mapper>

5
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml

@ -40,6 +40,11 @@
<if test="id!=null and id!=''">
and sf.id=#{id}
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.waga_code=#{wagaCode}
</if>
and sj.EXPR_DATE is null
</where>
order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
</mapper>

11
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml

@ -5,7 +5,7 @@
<mapper namespace="com.kms.yg.sz.mapper.BsSgcSzDaglMapper">
<sql id="info">
select *
select *,sj.ADM_DEP
from bs_sgc_sz_dagl sd
left join att_waga_base sj on sd.waga_code = sj.waga_code
@ -35,13 +35,20 @@
<if test="wagaName!=null and wagaName!=''">
and sj.waga_name LIKE concat('%',#{wagaName},'%')
</if>
<if test="wagaCode != null and wagaCode != ''">
and sj.WAGA_CODE = #{wagaCode}
</if>
<if test="adcd!=null and adcd !=''">
and sj.adcd like concat(#{adcd},'%')
</if>
<if test="unit != null and unit != ''">
and sj.ADM_DEP like concat(#{unit},'%')
</if>
<if test="id!=null and id!=''">
and sd.id=#{id}
</if>
and sj.EXPR_DATE is null
</where>
order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
</select>
</mapper>

6
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@ -31,7 +31,7 @@
<resultMap type="BsSgcSzFzr" id="BsSgcSzFzr">
<id property="id" column="id" />
<result property="wagaName" column="waga_name"/>
<result property="wageName" column="waga_name"/>
<result property="name" column="name"/>
<result property="unit" column="unit"/>
<result property="duties" column="duties"/>
@ -64,8 +64,8 @@
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wagaCode!=null and wagaCode!=''">
and sf.waga_code =#{wagaCode}
<if test="wageName!=null and wageName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>

Loading…
Cancel
Save