Browse Source

bug修改

master_tdsql
zth 2 months ago
parent
commit
9428fee130
  1. 78
      shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
  2. 478
      shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
  3. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  4. 4
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
  5. 2
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java
  6. 12
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  7. 7
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java
  8. 1
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
  9. 4
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java
  10. 2
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java
  11. 20
      shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java
  12. 3
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
  13. 12
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
  14. 16
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

78
shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@ -15,6 +15,7 @@ import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysDept;
import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.enums.BusinessType; import com.shuili.common.enums.BusinessType;
import com.shuili.common.utils.StringUtils;
import com.shuili.common.utils.poi.ExcelUtil; import com.shuili.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -60,37 +61,86 @@ public class SysXzqhController extends BaseController {
} }
// @GetMapping("/common")
// @ApiOperation("通用行政区划")
// public AjaxResult common() {
// SysUser user = UserUtils.getUser();
// String deptId = user.getDeptId();
// SysDept sysDept = sysDeptService.getById(deptId);
// String xzqhId = sysDept.getXzqhId();
// SysXzqh xzqh = sysXzqhService.getById(xzqhId);
// String userName = user.getUserName();
// /*if (userName.equals("admin")) {
// List<SysXzqh> list = sysXzqhService.list();
// return AjaxResult.success(list);
// }else */
// if (xzqh.getLayer() == 5) {
// String substring = xzqh.getXzqhdm().substring(0, 2);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// } else if (xzqh.getLayer() == 4) {
// String substring = xzqh.getXzqhdm().substring(0, 4);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// } else {
// return AjaxResult.success(xzqh);
// }
// }
@GetMapping("/common") @GetMapping("/common")
@ApiOperation("通用行政区划") @ApiOperation("通用行政区划")
public AjaxResult common() { public AjaxResult common(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) {
if (StringUtils.isEmpty(xzqhdm)) {
SysUser user = UserUtils.getUser(); SysUser user = UserUtils.getUser();
String deptId = user.getDeptId(); String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.getById(deptId); SysDept sysDept = sysDeptService.getById(deptId);
String xzqhId = sysDept.getXzqhId(); String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId); SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String userName = user.getUserName(); String userName = user.getUserName();
/*if (userName.equals("admin")) {
List<SysXzqh> list = sysXzqhService.list();
return AjaxResult.success(list);
}else */
if (xzqh.getLayer() == 5) {
String substring = xzqh.getXzqhdm().substring(0, 2);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", substring); queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'"); .in("LAYER", xzqh.getLayer());
List<SysXzqh> list = sysXzqhService.list(queryWrapper); List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return AjaxResult.success(list); return AjaxResult.success(list);
} else if (xzqh.getLayer() == 4) { } else {
String substring = xzqh.getXzqhdm().substring(0, 4); SysXzqh xzqh = sysXzqhService.getById(xzqhdm);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", substring); queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'"); .in("LAYER", xzqh.getLayer() - 1);
List<SysXzqh> list = sysXzqhService.list(queryWrapper); List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return AjaxResult.success(list); return AjaxResult.success(list);
}
}
private String getQuery(String xzqhdm) {
int index = xzqhdm.lastIndexOf("000");
if (index < 0) {
index = xzqhdm.lastIndexOf("00");
if (index < 0) {
return xzqhdm;
} else { } else {
return AjaxResult.success(xzqh); return getQuery(xzqhdm.substring(0, index));
}
} else {
if (index < 6) {
index = xzqhdm.lastIndexOf("00");
if (index < 0) {
return xzqhdm;
} else {
return getQuery(xzqhdm.substring(0, index));
} }
} }
return getQuery(xzqhdm.substring(0, index));
}
}
/** /**
* 查询行政区划列表 * 查询行政区划列表

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

@ -0,0 +1,478 @@
//package com.kms.web.synchronous;
//
//import cn.hutool.core.collection.CollectionUtil;
//import cn.hutool.core.util.ArrayUtil;
//import cn.hutool.core.util.ObjectUtil;
//import cn.hutool.http.HttpRequest;
//import cn.hutool.http.HttpResponse;
//import cn.hutool.http.HttpUtil;
//import com.alibaba.fastjson.JSONObject;
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.kms.yg.dd.domain.AttDiscBase;
//import com.kms.yg.dd.service.AttDiscBaseService;
//import com.kms.yg.df.domain.*;
//import com.kms.yg.df.domain.dto.BsSgcDfSwtzDto;
//import com.kms.yg.df.service.*;
//import com.kms.yg.ly.domain.AttBasBase;
//import com.kms.yg.ly.service.AttBasBaseService;
//import com.kms.yg.rv.domain.AttRvBase;
//import com.kms.yg.rv.service.AttRvBaseService;
//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.BsSgcSzCxjl;
//import com.kms.yg.sz.domain.BsSgcSzGcjg;
//import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
//import com.kms.yg.sz.domain.BsSgcSzSwtz;
//import com.kms.yg.sz.service.BsSgcSzCxjlService;
//import com.kms.yg.sz.service.BsSgcSzGcjgService;
//import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
//import com.kms.yg.sz.service.BsSgcSzSwtzService;
//import com.kms.yg.xgxd.domain.AttDpdsBase;
//import com.kms.yg.xgxd.service.AttDpdsBaseService;
//import com.shuili.common.utils.password.MD5Util;
//import io.swagger.models.auth.In;
//import lombok.Data;
////import org.apache.commons.lang.SerializationUtils;
//import org.checkerframework.checker.units.qual.A;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
//import org.springframework.stereotype.Component;
//import org.springframework.stereotype.Controller;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.util.ArrayList;
//import java.util.Date;
//import java.util.HashMap;
//import java.util.List;
//import java.util.concurrent.*;
//import java.util.concurrent.atomic.AtomicBoolean;
//import java.util.concurrent.atomic.AtomicInteger;
//import java.util.stream.Collectors;
//
//@Configuration
//@Component
//public class YgSynchronous {
//
// @Autowired
// AttResRsppService attResRsppService;
// @Autowired
// AttResBaseService attResBaseService;
// @Autowired
// AttRvBaseService attRvBaseService;
//
// @Autowired
// AttDpdsBaseService attDpdsBaseService;
// @Autowired
// AttBasBaseService attBasBaseService;
// @Autowired
// AttDiscBaseService attDiscBaseService;
//
// @Autowired
// BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
//
// @Autowired
// BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
//
// @Autowired
// BsSgcDfSwtzService bsSgcDfSwtzService;
// private static final int MAX_RETRIES = 3;
//
//
// private static String XH3CID = "3359137640337";
//
// private static String XH3CAPPKEY = "q7sli9ch";
//
// ExecutorService executorService = Executors.newFixedThreadPool(50);
//
// public String sendRequest(String url){
// int retries = 0;
// while (retries < MAX_RETRIES) {
// try {
// HttpRequest request = HttpRequest.get(url);
// request.setConnectionTimeout(200000000);
// request.setReadTimeout(500000000);
// return request.execute().body();
// } catch (Exception e) {
// retries++;
// System.out.println("请求失败,重试第 " + retries + " 次...");
// }
// }
// System.out.println("达到最大重试次数,请求失败。");
// return null;
// }
//
// //水库特征
// static final String sktz = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_res_rspp" ;
// //水库基本数据
// static final String sksj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ygtjgx/dws_att_res_base" ;
// //河流基本数据
// static final String rvsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_rv_base" ;
// //提段基本数据
// static final String ddsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_disc_base" ;
// //险工险段基本数据
// 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 drwa="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_waga_ad";
// //堤防行政区划关系数据
// static final String drda="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_dike_ad";
// //堤防水文特征数据
// static final String dadt="http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_bsfst";
//
//
// //水闸编码***
// static final String dawc = "http://19.25.35.205:31190/ZHSL_ZY/dws_att_waga_code";
// //水闸基础信息
// static final String dawb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_base";
// //水闸水文特征***
// static final String daws = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_waga_slhypr";
// //水闸工程结构***
// static final String dawsl= "http://19.25.35.205:31190/ZHSL_ZY/dws_att_waga_sligvl";
// //水闸出险记录***
// static final String dawst= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_sldnnt";
// //堤防基础信息
// static final String dadb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dike_base";
// //堤防历史决溢记录***
// static final String dadd = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_dkhos";
// //堤防主要效益指标***
// static final String daddt = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_dbiabt";
//
// /**
// * 同步
// */
// public void synchronous() {
// int pageNum = 1;
// int pageSize = 1000;
// Boolean f = true;
// HashMap<String, Object> hashMap = new HashMap<>();
// int i = 1;
// while (f) {
// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
// String data = JSONObject.parseObject(s).getString("data");
// List<AttDiscBase> attResRspps = JSONObject.parseArray(data, AttDiscBase.class);
// if(attResRspps.size()<pageSize){
// f = false;
// }
// for (AttDiscBase attDiscBase : attResRspps) {
// hashMap.put(attDiscBase.getDiscCode(),i++);
// attDiscBase.preInsert();
// attDiscBase.setId(attDiscBase.getDiscCode());
// attDiscBaseService.save(attDiscBase);
// }
//// CopyOnWriteArrayList<AttDiscBase> attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps);
//// executorService.execute(new sktz(attResRspps));
// pageNum++;
// }
// }
//
// @Data
// class sktz implements Runnable{
//
// private List<AttDiscBase> list;
//
// public sktz(List<AttDiscBase> list){
// this.list = list;
// }
//
// @Override
// public void run() {
// int a = 1;
// for (AttDiscBase attDiscBase : list) {
// attDiscBase.preInsert();
//// attResRspp.setId(attResRspp.getDiscCode());
// boolean save = attDiscBaseService.save(attDiscBase);
// if(save){
// System.out.println(a++);
// if(a>=1000){
// System.out.println("批量处理完成1000条------------------------------------");
// } }
// }
// }
// }
//
//
// @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 s1=sendRequest(drda+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
// String data=JSONObject.parseObject(s).getString("data");
// String dataAcad=JSONObject.parseObject(s1).getString("data");
// List<BsSgcDfSafeJbxx> bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class);
// List<BsSgcDfSafeJbxx> bsSgcDfSafeJbxxesAcad=JSONObject.parseArray(dataAcad, BsSgcDfSafeJbxx.class);
// bsSgcDfSafeJbxxesAcad.forEach(bsSgcDfSafeJbxx -> {
// bsSgcDfSafeJbxx.preInsert();
// bsSgcDfSafeJbxx.setId(bsSgcDfSafeJbxx.getDikeCode());
// bsSgcDfSafeJbxx.setAdcd(bsSgcDfSafeJbxx.getAdcd().substring(0, Math.min(bsSgcDfSafeJbxx.getAdcd().length(), 6)));
// bsSgcDfSafeJbxxService.saveOrUpdate(bsSgcDfSafeJbxx);
// });
// 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 s1=sendRequest(drwa+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data=JSONObject.parseObject(s).getString("data");
//// String dataAcad=JSONObject.parseObject(s1).getString("data");
//// List<BsSgcSzSafeJbxx> bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class);
//// List<BsSgcSzSafeJbxx> bsSgcSzSafeJbxxesAcad=JSONObject.parseArray(dataAcad, BsSgcSzSafeJbxx.class);
////
//// bsSgcSzSafeJbxxesAcad.forEach(bsSgcSzSafeJbxx-> {
//// bsSgcSzSafeJbxx.preInsert();
//// bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode());
//// bsSgcSzSafeJbxx.setAdcd(bsSgcSzSafeJbxx.getAdcd().substring(0, Math.min(bsSgcSzSafeJbxx.getAdcd().length(), 6)));
//// bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx);
//// });
//// bsSgcSzSafeJbxxes.forEach(bsSgcSzSafeJbxx -> {
//// bsSgcSzSafeJbxx.preInsert();
//// bsSgcSzSafeJbxx.setStatus("6");
//// bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode());
//// bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx);
//// });
//// }
////
////
////
//// /**
//// * 水库基本信息
//// */
//// @GetMapping("sksj")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void sksj(){
//// int pageNum = 1;
//// int pageSize = 999999;
//// String s = sendRequest(sksj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<AttResBase> attResRspps = JSONObject.parseArray(data, AttResBase.class);
//// attResRspps.forEach(attResRspp -> {
//// attResRspp.preInsert();
//// attResRspp.setId(attResRspp.getResCode());
//// attResBaseService.saveOrUpdate(attResRspp);
//// });
//// }
////
//// /**
//// * 河流基础信息
//// */
//// @GetMapping("rvsj")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void rvsj(){
//// int pageNum = 1;
//// int pageSize = 999999;
//// String s = sendRequest(rvsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<AttRvBase> attRvBases = JSONObject.parseArray(data, AttRvBase.class);
//// attRvBases.forEach(attResRspp -> {
//// attResRspp.preInsert();
//// attResRspp.setId(attResRspp.getRvCode());
//// attRvBaseService.saveOrUpdate(attResRspp);
//// });
//// }
////
////
//// /**
//// * 险工险峻信息
//// */
//// @GetMapping("dpds")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void dpds(){
//// int pageNum = 1;
//// int pageSize = 999999;
//// String s = sendRequest(xgxdsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<AttDpdsBase> attRvBases = JSONObject.parseArray(data, AttDpdsBase.class);
//// attRvBases.forEach(attResRspp -> {
//// attResRspp.preInsert();
//// attResRspp.setId(attResRspp.getDpdsCode());
//// attDpdsBaseService.saveOrUpdate(attResRspp);
//// });
//// }
//
//
// /**
// * 提段基本数据
// */
//// @GetMapping("disc")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void disc(){
//// int pageNum = 1;
//// int pageSize = 999999;
//// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<AttDiscBase> attRvBases = JSONObject.parseArray(data, AttDiscBase.class);
//// attRvBases.forEach(attResRspp -> {
//// attResRspp.preInsert();
//// attResRspp.setId(attResRspp.getDiscCode());
//// attDiscBaseService.saveOrUpdate(attResRspp);
//// });
//// }
//
//
// /**
// * 流域基本数据
// */
//// @GetMapping("bas")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void bas(){
//// int pageNum = 1;
//// int pageSize = 99999;
//// String s = sendRequest( llsj+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<AttBasBase> attRvBases = JSONObject.parseArray(data, AttBasBase.class);
//// attRvBases.forEach(attResRspp -> {
//// attResRspp.preInsert();
//// attResRspp.setId(attResRspp.getBasCode());
//// attBasBaseService.saveOrUpdate(attResRspp);
//// });
//// }
////
//// /**
//// * 水闸编码
//// */
//// @GetMapping("dawc")
//// @Scheduled(cron = "0 0 0 * * ?")
//// public void dawc(){
//// int pageNum = 1;
//// int pageSize = 99999;
//// String s = sendRequest( dawc+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
////
//// }
//
//// @Autowired
//// BsSgcSzSwtzService bsSgcSzSwtzService;
//// @Autowired
//// BsSgcSzGcjgService bsSgcSzGcjgService;
//// @Autowired
//// BsSgcSzCxjlService bsSgcSzCxjlService;
//// @Autowired
//// BsSgcDfJyjlService bsSgcDfJyjlService;
//// @Autowired
//// BsSgcDfGcxyService bsSgcDfGcxyService;
////
//// /**
//// * 水闸水文特征
//// */
//// @GetMapping("水闸水文特征")
//// @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
//// public void daws(){
//// int pageNum = 1;
//// int pageSize = 9999999;
//// String s = sendRequest( daws+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<BsSgcSzSwtz> bsSgcSzSwtzs = JSONObject.parseArray(data, BsSgcSzSwtz.class);
//// for (BsSgcSzSwtz bsSgcSzSwtz : bsSgcSzSwtzs) {
//// bsSgcSzSwtz.preInsert();
//// bsSgcSzSwtz.setId(bsSgcSzSwtz.getWagaCode());
//// bsSgcSzSwtzService.saveOrUpdate(bsSgcSzSwtz);
//// }
////
//// }
////
////
//// /**
//// * 水闸工程结构
//// */
//// @GetMapping("dawsl")
//// @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
//// public void dawsl(){
//// int pageNum = 1;
//// int pageSize = 9999999;
//// String s = sendRequest( dawsl+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<BsSgcSzGcjg> bsSgcSzGcjgs = JSONObject.parseArray(data, BsSgcSzGcjg.class);
//// for (BsSgcSzGcjg bsSgcSzGcjg : bsSgcSzGcjgs) {
//// bsSgcSzGcjg.preInsert();
//// bsSgcSzGcjg.setId(bsSgcSzGcjg.getWagaCode());
//// bsSgcSzGcjgService.saveOrUpdate(bsSgcSzGcjg);
//// }
//// }
////
////
//// /**
//// * 水闸出险记录
//// */
//// @GetMapping("dawst")
//// @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
//// public void dawst(){
//// System.out.println("执行了00000000000");
//// int pageNum = 1;
//// int pageSize = 9999999;
//// String s = sendRequest( dawst+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<BsSgcSzCxjl> bsSgcSzCxjls = JSONObject.parseArray(data, BsSgcSzCxjl.class);
//// for (BsSgcSzCxjl bsSgcSzCxjl : bsSgcSzCxjls) {
//// bsSgcSzCxjl.preInsert();
//// Date fntm = bsSgcSzCxjl.getDntm();
//// String u = bsSgcSzCxjl.getWagaCode()+fntm.getTime();
//// String id = MD5Util.MD5Encode(u, "utf-8");
//// bsSgcSzCxjl.setId(id);
//// bsSgcSzCxjlService.saveOrUpdate(bsSgcSzCxjl);
//// }
//// }
////
////
////
//// /**
//// * 堤防历史决溢记录
//// */
//// @GetMapping("dadd")
//// @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
//// public void dadd(){
//// int pageNum = 1;
//// int pageSize = 9999999;
//// String s = sendRequest( dadd+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<BsSgcDfJyjl> bsSgcSzCxjls = JSONObject.parseArray(data, BsSgcDfJyjl.class);
//// for (BsSgcDfJyjl bsSgcSzCxjl : bsSgcSzCxjls) {
//// bsSgcSzCxjl.preInsert();
//// Date brspTime = bsSgcSzCxjl.getBrspDateTime();
//// String dikeCode = bsSgcSzCxjl.getDikeCode();
//// String u = brspTime.getTime() + dikeCode;
//// String id = MD5Util.MD5Encode(u, "utf-8");
//// bsSgcSzCxjl.setId(id);
//// bsSgcDfJyjlService.saveOrUpdate(bsSgcSzCxjl);
//// }
//// }
////
////
//// /**
//// * 堤防历史决溢记录
//// */
//// @GetMapping("daddt")
//// @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
//// public void daddt(){
//// int pageNum = 1;
//// int pageSize = 9999999;
//// String s = sendRequest( daddt+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
//// String data = JSONObject.parseObject(s).getString("data");
//// List<BsSgcDfGcxy> bsSgcDfGcxies = JSONObject.parseArray(data, BsSgcDfGcxy.class);
//// bsSgcDfGcxyService.remove(new QueryWrapper<>());
//// for (BsSgcDfGcxy bsSgcDfGcxy : bsSgcDfGcxies) {
//// bsSgcDfGcxy.preInsert();
//// bsSgcDfGcxyService.saveOrUpdate(bsSgcDfGcxy);
//// }
//// }
//
//
//
//}

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

@ -137,7 +137,7 @@ public class BsSgcDfSafeJbxxController extends BaseController {
.eq(BsSgcDfSafeJbxx::getMnun,name) .eq(BsSgcDfSafeJbxx::getMnun,name)
.eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType()) .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
.eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus()) .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
.likeRight(xzqhId!=null,BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId)) .likeRight(data.getAdcd()!=null,BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
.isNull(BsSgcDfSafeJbxx::getExprDate) .isNull(BsSgcDfSafeJbxx::getExprDate)
.orderByAsc(BsSgcDfSafeJbxx::getDikeGrad) .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
.orderByDesc(BsSgcDfSafeJbxx::getCreateTime)); .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));

4
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java

@ -107,11 +107,11 @@ public class BsSgcDfGcxy extends BaseEntity
@Excel(name = "'保护总人口数'") @Excel(name = "'保护总人口数'")
@ApiModelProperty("'保护总人口数'") @ApiModelProperty("'保护总人口数'")
private String diekPrpp; private String dikePrpp;
@Excel(name = "'是否保护铁路'") @Excel(name = "'是否保护铁路'")
@ApiModelProperty("'是否保护铁路'") @ApiModelProperty("'是否保护铁路'")
private String diekPrrw; private String dikePrrw;
@Excel(name = "'是否保护公路'") @Excel(name = "'是否保护公路'")
@ApiModelProperty("'是否保护公路'") @ApiModelProperty("'是否保护公路'")

2
shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java

@ -34,7 +34,7 @@ public class BsSgcDfJyjl extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "决溢时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "决溢时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("决溢时间") @ApiModelProperty("决溢时间")
private Date brspDateTime; private Date brspDatetime;
/** 决溢地点与形式 */ /** 决溢地点与形式 */
@Excel(name = "决溢地点与形式") @Excel(name = "决溢地点与形式")

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

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.UserUtils; import com.kms.common.utils.UserUtils;
@ -109,6 +110,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
/** /**
* 查询水闸安全管理基本信息列表 * 查询水闸安全管理基本信息列表
*/ */
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("水闸安全管理基本信息列表") @ApiOperation("水闸安全管理基本信息列表")
public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) { public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
@ -117,7 +119,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
String[] roleIds = sysUser.getRoleIds(); String[] roleIds = sysUser.getRoleIds();
SysDept dept = sysUser.getDept(); SysDept dept = sysUser.getDept();
String xzqhId = dept.getXzqhId(); String xzqhId = dept.getXzqhId();
if(StringUtils.isNotEmpty(sp.getData().getAdcd())){ if(ObjectUtils.isNotEmpty(sp.getData())&&StringUtils.isNotEmpty(sp.getData().getAdcd())){
xzqhId=sp.getData().getAdcd(); xzqhId=sp.getData().getAdcd();
} }
String name = dept.getName(); String name = dept.getName();
@ -128,6 +130,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
break; break;
} }
} }
Page<BsSgcSzSafeJbxx> page=new Page<>(); Page<BsSgcSzSafeJbxx> page=new Page<>();
if (isGLDW){ if (isGLDW){
page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
@ -137,7 +140,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.likeRight(xzqhId!=null,BsSgcSzSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId)) .likeRight(xzqhId!=null,BsSgcSzSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId))
.isNull(BsSgcSzSafeJbxx::getExprDate) .isNull(BsSgcSzSafeJbxx::getExprDate)
.orderByAsc(BsSgcSzSafeJbxx::getEngScal)); .orderByDesc(BsSgcSzSafeJbxx::getEngScal)
);
}else { }else {
page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
@ -145,8 +149,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
.eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
.isNull(BsSgcSzSafeJbxx::getExprDate) .isNull(BsSgcSzSafeJbxx::getExprDate)
.likeRight(data.getAdcd() != null , BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId)) .likeRight(data.getAdcd() != null , BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId))
.orderByAsc(BsSgcSzSafeJbxx::getEngScal)); .orderByDesc(BsSgcSzSafeJbxx::getEngScal)
);
} }
return page; return page;

7
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java

@ -40,8 +40,8 @@ public class BsSgcSzGcjg extends BaseEntity {
/** /**
* 水闸堰型 * 水闸堰型
*/ */
@Excel(name = "水闸堰型") @Excel(name = "闸室结构")
@ApiModelProperty("水闸堰型") @ApiModelProperty("闸室结构")
private String slwrst; private String slwrst;
/** /**
@ -237,6 +237,7 @@ public class BsSgcSzGcjg extends BaseEntity {
private Integer aGaorNum; private Integer aGaorNum;
private String elevSys; private String elevSys;
private String elevSysConver; private String elevSysConver;
private String hset; private String hseq;
private Integer hsgram; private Integer hsgram;
private Double aGthlntwd;
} }

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

@ -297,6 +297,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
private Date exprDate; private Date exprDate;
private String wagaCenLat; private String wagaCenLat;
private String wagaCenLong;
private String ifCeb; private String ifCeb;
private String ifHyj; private String ifHyj;
private String ifGse; private String ifGse;

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

@ -144,8 +144,10 @@ public class BsSgcSzSwtz extends BaseEntity
private String normWatLev; private String normWatLev;
private String dslklv; private String dslklv;
private String dsfllv; private String dsfllv;
private String chhllv; private String chfllv;
private String note; private String note;
private String hmlcf;
private String hmlcftm;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
// private Date updateDate; // private Date updateDate;
} }

2
shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java

@ -118,4 +118,6 @@ public class BsSgcSzXlnl extends BaseEntity {
@ApiModelProperty("记录失效时间") @ApiModelProperty("记录失效时间")
private Date exprDate; private Date exprDate;
private Date updateDate;
} }

20
shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java

@ -26,7 +26,7 @@ import java.util.stream.Collectors;
*/ */
@Getter @Getter
public enum DataSyncBasicEnum { public enum DataSyncBasicEnum {
ATT_WAGA_ESCPP("水闸水位过闸流量关系表",Constants.SZ_ID),
ATT_RES_BASE("水库基础信息", Constants.SK_MAP), ATT_RES_BASE("水库基础信息", Constants.SK_MAP),
ATT_RES_RSPP("水库主要特征", Constants.SK_MAP), ATT_RES_RSPP("水库主要特征", Constants.SK_MAP),
ATT_RES_CODE("水库编码查找表", Constants.SK_MAP), ATT_RES_CODE("水库编码查找表", Constants.SK_MAP),
@ -40,7 +40,7 @@ public enum DataSyncBasicEnum {
ATT_WAGA_BASE("水闸基础信息", Constants.SZ_MAP), ATT_WAGA_BASE("水闸基础信息", Constants.SZ_MAP),
ATT_WAGA_CODE("水闸工程代码", Constants.SZ_MAP), ATT_WAGA_CODE("水闸工程代码", Constants.SZ_MAP),
ATT_WAGA_SLHYPR("水闸水文特征", Constants.SZ_ID_MAP), ATT_WAGA_SLHYPR("水闸水文特征", Constants.SZ_ID_MAP),
ATT_WAGA_SLIGVL("水闸工程结构", Constants.SZ_ID_MAP), ATT_WAGA_SLIGVL("水闸工程结构", Constants.SLSZ_ID),
ATT_WAGA_SLDNNT("水闸出险记录", Constants.SZ_DAWST_MAP), ATT_WAGA_SLDNNT("水闸出险记录", Constants.SZ_DAWST_MAP),
ATT_RV_BASE("河流基础信息", Constants.RV_MAP), ATT_RV_BASE("河流基础信息", Constants.RV_MAP),
ATT_DPDS_BASE("险工险峻信息", Constants.DPDS_MAP), ATT_DPDS_BASE("险工险峻信息", Constants.DPDS_MAP),
@ -181,6 +181,22 @@ public enum DataSyncBasicEnum {
public static final Map<String, Function<JsonObjProxy, Object>> SZ_ID_MAP = new HashMap<String, Function<JsonObjProxy, Object>>() { public static final Map<String, Function<JsonObjProxy, Object>> SZ_ID_MAP = new HashMap<String, Function<JsonObjProxy, Object>>() {
{ {
put("id", obj -> obj.getString("wagaCode")); put("id", obj -> obj.getString("wagaCode"));
put("hmlcftm", obj -> {
String value = obj.getString("HMLCFTM");
return StringUtils.isEmpty(value) ? null : obj.getDate("HMLCFTM");
});
}
};
public static final Map<String, Function<JsonObjProxy, Object>> SZ_ID = new HashMap<String, Function<JsonObjProxy, Object>>() {
{
put("id", obj -> obj.getString("wagaCode"));
}
};
public static final Map<String, Function<JsonObjProxy, Object>> SLSZ_ID = new HashMap<String, Function<JsonObjProxy, Object>>() {
{
put("id", obj -> obj.getString("wagaCode"));
put("A_GTHLNTWD", obj -> obj.get("A_GTHLNTWD"));
} }
}; };
public static final Map<String, Function<JsonObjProxy, Object>> SZ_DAWST_MAP = new HashMap<String, Function<JsonObjProxy, Object>>() { public static final Map<String, Function<JsonObjProxy, Object>> SZ_DAWST_MAP = new HashMap<String, Function<JsonObjProxy, Object>>() {

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

@ -68,6 +68,9 @@
<if test="dikeName!=null and dikeName!=''"> <if test="dikeName!=null and dikeName!=''">
and sj.dike_NAME like concat('%',#{dikeName},'%') and sj.dike_NAME like concat('%',#{dikeName},'%')
</if> </if>
<if test="dikeCode != null and dikeCode != ''">
and sj.dike_CODE =#{dikeCode}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};

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

@ -42,12 +42,12 @@
<select id="getNo" resultMap="pieDto"> <select id="getNo" resultMap="pieDto">
<include refid="info"></include> <include refid="info"></include>
<if test="layer==1"> <if test="layer==5">
WHERE WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4) sj.adcd LIKE concat(#{adcd},'%') GROUP BY LEFT(sj.adcd,4)
</if> </if>
<if test="layer==2"> <if test="layer==4">
WHERE WHERE
sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd sj.adcd LIKE concat(#{adcd},'%') GROUP BY sj.adcd
</if> </if>
@ -77,13 +77,13 @@
<select id="getHistogram" resultMap="pieDto"> <select id="getHistogram" resultMap="pieDto">
<include refid="info"></include> <include refid="info"></include>
<if test="layer==1"> <if test="layer==5">
WHERE WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' sj.adcd LIKE concat(#{adcd},'%')
</if> </if>
<if test="layer==2"> <if test="layer==4">
WHERE WHERE
sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY sj.adcd sj.adcd LIKE concat(#{adcd},'%')
</if> </if>
<if test="layer==3"> <if test="layer==3">
WHERE WHERE

16
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml

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

Loading…
Cancel
Save