Browse Source

Merge branch 'refs/heads/release-sy-v1.0.0' into feature-v1.4.0-task

master_tdsql
hxh 7 months ago
parent
commit
638f63d73a
  1. 22
      shuili-admin/src/main/java/com/kms/web/config/CommonThreadPoolConfig.java
  2. 40
      shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
  3. 157
      shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
  4. 152
      shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java
  5. 1
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java
  6. 2
      shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java
  7. 18
      shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java
  8. 21
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  9. 2
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java
  10. 6
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java
  11. 5
      shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
  12. 29
      shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java
  13. 2
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java
  14. 5
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java
  15. 3
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java
  16. 6
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
  17. 2
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java
  18. 4
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java
  19. 2
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
  20. 3
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
  21. 2
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java
  22. 11
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  23. 3
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
  24. 6
      shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
  25. 3
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java
  26. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java
  27. 2
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java
  28. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java
  29. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java
  30. 4
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  31. 2
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java
  32. 3
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java
  33. 5
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java
  34. 3
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java
  35. 3
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java
  36. 4
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
  37. 6
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml
  38. 9
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml
  39. 4
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
  40. 7
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
  41. 5
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml
  42. 11
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml
  43. 6
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

22
shuili-admin/src/main/java/com/kms/web/config/CommonThreadPoolConfig.java

@ -0,0 +1,22 @@
package com.kms.web.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@Configuration
public class CommonThreadPoolConfig {
/**
* 线程池定义
*/
@Bean()
public ThreadPoolExecutor commonPool() {
return new ThreadPoolExecutor(30, 50, 200, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1000));
}
}

40
shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@ -46,12 +46,14 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -88,6 +90,10 @@ public class SysLoginController extends BaseController {
@Value("${water.portalUrl:}")
private String portalUrl;
@Value("${water.logoutUrl:}")
public String logoutUrl;
@Resource(name = "commonPool")
private Executor executor;
// @PostConstruct
// public void init() {
@ -136,11 +142,21 @@ public class SysLoginController extends BaseController {
@PostMapping("/logout")
@SaCheckLogin
public AjaxResult logout() {
// 登录保存缓存
StpUtil.logout();
//删除缓存
return AjaxResult.success();
if (StringUtils.isNotBlank(logoutUrl)) {
return AjaxResult.success(new ProxyInfo() {{
setType("redirect");
setUrl(logoutUrl);
}});
} else {
String loginPath = "login";
return AjaxResult.success(new ProxyInfo() {{
setType("local");
setUrl(loginPath);
}});
}
}
@ -270,10 +286,17 @@ public class SysLoginController extends BaseController {
@GetMapping("/signOnLogin")
public ModelAndView signOnLogin(HttpServletRequest request,
HttpServletResponse response,
@RequestParam(name = "code") String code,
@RequestParam(name = "page", required = false) String page,
@RequestParam(name = "token") String token) throws IOException {
CompletableFuture<List<MenuDto>> menusFuture = CompletableFuture.supplyAsync(() -> portalMenu(token));
CompletableFuture<SysUser> userFuture = CompletableFuture.supplyAsync(() -> innerLogin(token));
if (StringUtils.isNotBlank(code)) {
token = waterRequestUtil.getToken(code);
} else if (StringUtils.isBlank(token)) {
throw new BaseException("token不能为空");
}
String accessToken = token;
CompletableFuture<List<MenuDto>> menusFuture = CompletableFuture.supplyAsync(() -> portalMenu(accessToken), executor);
CompletableFuture<SysUser> userFuture = CompletableFuture.supplyAsync(() -> innerLogin(accessToken), executor);
CompletableFuture.allOf(menusFuture, userFuture).join();
List<MenuDto> menus = menusFuture.join();
SysUser simpleUser = userFuture.join();
@ -281,11 +304,12 @@ public class SysLoginController extends BaseController {
throw new BaseException("账号异常,登陆失败");
}
permissionService.setUserMenuFromPortal(simpleUser.getId(), menus);
permissionService.setPortalToken(simpleUser.getId(), token);
StpUtil.login(simpleUser.getId());
StpUtil.getSession().set("jianwei-user", simpleUser);
String accessToken = StpUtil.getTokenValue();
log.info("登录成功,用户[{}]token:{}", simpleUser.getId(), accessToken);
RedirectView redirectView = new RedirectView(redirect + "?token=" + accessToken + "&page=" + page);
String innerToken = StpUtil.getTokenValue();
log.info("登录成功,用户[{}]token:{}", simpleUser.getId(), innerToken);
RedirectView redirectView = new RedirectView(redirect + "?token=" + innerToken + "&page=" + page);
return new ModelAndView(redirectView);
}

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

@ -5,6 +5,13 @@ import cn.hutool.http.HttpResponse;
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.domain.BsSgcDfSwtz;
import com.kms.yg.df.domain.dto.BsSgcDfSwtzDto;
import com.kms.yg.df.service.BsSgcDfJbxxService;
import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
import com.kms.yg.df.service.BsSgcDfSwtzService;
import com.kms.yg.ly.domain.AttBasBase;
import com.kms.yg.ly.service.AttBasBaseService;
import com.kms.yg.rv.domain.AttRvBase;
@ -13,6 +20,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 lombok.Data;
@ -22,7 +31,9 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -44,6 +55,15 @@ public class YgSynchronous {
@Autowired
AttDiscBaseService attDiscBaseService;
@Autowired
BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
@Autowired
BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
@Autowired
BsSgcDfSwtzService bsSgcDfSwtzService;
private static String XH3CID = "3359137640337";
private static String XH3CAPPKEY = "q7sli9ch";
@ -70,36 +90,44 @@ 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";
//水闸行政区划关系数据
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";
/**
* 同步
*/
// @GetMapping("sktz1")
// public void synchronous() throws ExecutionException, InterruptedException {
// 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++;
// }
// }
@GetMapping("sktz1")
public void synchronous() throws ExecutionException, InterruptedException {
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{
@ -128,6 +156,8 @@ public class YgSynchronous {
/***
* 提段线程
* @param list
@ -165,6 +195,79 @@ public class YgSynchronous {
});
}
@GetMapping("dadt")
@Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
public void dadt(){
int pageNum=1;
int pageSize=999999;
String s=sendRequest(dadt+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
String data=JSONObject.parseObject(s).getString("data");
List<BsSgcDfSwtzDto>sgcDfSwtzDtos=JSONObject.parseArray(data, BsSgcDfSwtzDto.class);
sgcDfSwtzDtos.forEach(bsSgcDfSwtzDto -> {
BsSgcDfSwtz bsSgcDfSwtz=new BsSgcDfSwtz();
bsSgcDfSwtz.setId(bsSgcDfSwtzDto.getDikeCode());
bsSgcDfSwtz.setDikeCode(bsSgcDfSwtzDto.getDikeCode());
bsSgcDfSwtz.setDsflStd(bsSgcDfSwtzDto.getFlcnst());
bsSgcDfSwtz.setDsflLev(bsSgcDfSwtzDto.getDsfllv());
bsSgcDfSwtz.setAlwtLev(bsSgcDfSwtzDto.getWrwl());
bsSgcDfSwtz.setNote(bsSgcDfSwtzDto.getNote());
bsSgcDfSwtz.setEffDate(bsSgcDfSwtzDto.getEffDate());
bsSgcDfSwtzService.saveOrUpdate(bsSgcDfSwtz);
});
}
@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);
});
}
/**
* 水库基本信息

152
shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java

@ -23,30 +23,35 @@ public class WaterRequestUtil {
private static final Logger log = LoggerFactory.getLogger(WaterRequestUtil.class);
@Value("${water.paasToken:}")
public String paasToken;
@Value("${water.paasId:}")
public String paasId;
//网关
@Value("${water.gateway.paasToken:}")
public String gatewayPaasToken;
@Value("${water.gateway.paasId:}")
public String gatewayPaasId;
//应用中台
@Value("${water.center.paasToken:}")
public String centerPaasToken;
@Value("${water.center.paasId:}")
public String centerPaasId;
//网关
@Value("${water.url:}")
public String url;
//单点登录id
@Value("${water.singOnServiceId:}")
public String singOnServiceId;
//单点登录密钥
@Value("${water.singOnAppsecret:}")
public String singOnAppsecret;
@Value("${water.singOnUrl:}")
public String singOnUrl;
@Value("${water.logoutUrl:}")
public String logoutUrl;
@Value("${water.accessTokenUrl:}")
public String accessTokenUrl;
//验证用户登录
@Value("${water.userUrl:}")
public String userUrl;
@Value("${water.authUserServiceId:}")
public String authUserServiceId;
@Value("${water.authUserAppsecret:}")
public String authUserAppsecret;
@Value("${water.systemCode:}")
public String systemCode;
@Value("${water.systemName:}")
@ -55,79 +60,61 @@ public class WaterRequestUtil {
//获取部门信息
@Value("${water.orgUrl:}")
public String orgUrl;
@Value("${water.orgServiceId:}")
public String orgServiceId;
@Value("${water.orgAppsecret:}")
public String orgAppsecret;
//业务角色
@Value("${water.roleUrl:}")
public String roleUrl;
@Value("${water.roleServiceId:}")
public String roleServiceId;
@Value("${water.roleAppsecret:}")
public String roleAppsecret;
@Value("${water.systemUrl:}")
public String systemUrl;
@Value("${water.systemServiceId:}")
public String systemServiceId;
@Value("${water.systemAppsecret:}")
public String systemAppsecret;
@Value("${water.usersUrl:}")
public String usersUrl;
@Value("${water.usersServiceId:}")
public String usersServiceId;
@Value("${water.usersAppsecret:}")
public String usersAppsecret;
@Value("${water.resourceUrl:}")
public String resourceUrl;
@Value("${water.resourceServiceId:}")
public String resourceServiceId;
@Value("${water.resourceAppsecret:}")
public String resourceAppsecret;
/**
* 设置
*
* @param httpRequest
* @param serviceId
* @param appsecret
*/
private void setHead(HttpRequest httpRequest, String serviceId, String appsecret) {
private void setHead(HttpRequest httpRequest) {
String timestamp = String.valueOf(new Date().getTime());
String nonce = IdUtil.fastSimpleUUID();
String signature = timestamp + paasToken + nonce + timestamp;
String gatewaySignature = timestamp + gatewayPaasToken + nonce + timestamp;
String centerSignature = timestamp + centerPaasToken + nonce + timestamp;
try {
signature = SHACoder.encodeSHA256Hex(signature).toUpperCase();
gatewaySignature = SHACoder.encodeSHA256Hex(gatewaySignature).toUpperCase();
centerSignature = SHACoder.encodeSHA256Hex(centerSignature).toUpperCase();
} catch (Exception e) {
e.printStackTrace();
}
httpRequest
.header("x-tsp-paasid", paasId)
.header("x-tsp-signature", signature)
.header("x-tif-paasid", gatewayPaasId)
.header("x-tif-signature", gatewaySignature)
.header("x-tif-timestamp", timestamp)
.header("x-tif-nonce", nonce)
.header("x-tsp-paasid", centerPaasId)
.header("x-tsp-signature", centerSignature)
.header("x-tsp-timestamp", timestamp)
.header("x-tsp-nonce", nonce)
.header("x-tsp-serviceid", serviceId)
.header("x-tsp-appsecret", appsecret);
.header("x-tsp-nonce", nonce);
}
public HttpRequest createGet(String url, String serviceId, String appsecret) {
public HttpRequest createGet(String url) {
HttpRequest httpRequest = HttpRequest.get(url);
setHead(httpRequest, serviceId, appsecret);
setHead(httpRequest);
return httpRequest;
}
public HttpRequest createPost(String url, String serviceId, String appsecret) {
public HttpRequest createPost(String url) {
HttpRequest httpRequest = HttpRequest.post(url);
setHead(httpRequest, serviceId, appsecret);
setHead(httpRequest);
return httpRequest;
}
@ -138,7 +125,7 @@ public class WaterRequestUtil {
*/
public WaterResult systemPage() {
log.info("查询业务系统-----------------");
HttpRequest post = createPost(systemUrl, systemServiceId, systemAppsecret);
HttpRequest post = createPost(systemUrl);
HashMap<String, String> query = new HashMap<>();
query.put("code", systemCode);
query.put("name", systemName);
@ -183,9 +170,9 @@ public class WaterRequestUtil {
* @return
*/
public WaterResult signOn(String userId) {
HttpRequest get = createGet(userUrl, singOnServiceId, singOnAppsecret);
HttpRequest get = createGet(userUrl);
String body;
try (HttpResponse response = get.header("x-tsp-target", paasId)
try (HttpResponse response = get.header("x-tsp-target", gatewayPaasId)
.header("x-tsp-uid-type", "id")
.header("x-tsp-uid", userId)
.execute()) {
@ -194,6 +181,23 @@ public class WaterRequestUtil {
return JSONObject.parseObject(body, WaterResult.class);
}
public WaterResultV2<String> logout(String authorization) {
long startTime = System.currentTimeMillis();
log.info("--------请求统一门户用户注销登陆,请求地址为:{}", logoutUrl);
HttpRequest get = createGet(logoutUrl);
String body;
try (HttpResponse response = get.header("Authorization", authorization)
.execute()) {
body = response.body();
}
long endTime = System.currentTimeMillis();
log.info("--------请求统一门户用户注销登陆,耗时{}毫秒,返回结果为:{}", endTime - startTime, body);
WaterResultV2<String> waterResult = JSON.parseObject(body, new TypeReference<WaterResultV2<String>>() {
});
isSuccess(waterResult);
return waterResult;
}
/**
* 验证用户登录
*
@ -203,20 +207,45 @@ public class WaterRequestUtil {
public WaterResultV2<WaterUser> authUser(String authorization) {
long startTime = System.currentTimeMillis();
log.info("--------请求统一门户用户验证,请求地址为:{}", userUrl);
HttpRequest get = createGet(userUrl, authUserServiceId, authUserAppsecret);
HttpRequest get = createGet(userUrl);
String body;
try (HttpResponse response = get.header("Authorization", authorization)
.execute()) {
body = response.body();
}
long endTime = System.currentTimeMillis();
log.info("--------请求统一门户用户验证,耗时{}毫秒,返回结果为:{}", endTime - startTime, body);
log.info("--------请求统一门户用户验证,耗时{}毫秒", endTime - startTime);
WaterResultV2<WaterUser> waterResult = JSON.parseObject(body, new TypeReference<WaterResultV2<WaterUser>>() {
});
isSuccess(waterResult);
return waterResult;
}
public String getToken(String code) {
long startTime = System.currentTimeMillis();
log.info("--------请求统一门户获取token,请求地址为:{}", accessTokenUrl);
HttpRequest get = createGet(accessTokenUrl);
String body;
try (HttpResponse response = get.header("Authorization", code)
.execute()) {
body = response.body();
}
long endTime = System.currentTimeMillis();
log.info("-------请求统一门户获取token,耗时{}毫秒,token:[{}]", endTime - startTime, body);
WaterResultV2<WaterToken> waterResult = JSON.parseObject(body, new TypeReference<WaterResultV2<WaterToken>>() {
});
isSuccess(waterResult);
return waterResult.getData().getAccessToken();
}
@Data
public static class WaterToken {
private String accessToken;
private String tokenType;
private String refreshToken;
private String expiresIn;
}
@Data
public static class WaterUser {
private WaterUserInfo user;
@ -236,7 +265,7 @@ public class WaterRequestUtil {
hashMap.put("page", 1);
hashMap.put("size", 100);
hashMap.put("systemCode", systemCode);
HttpRequest get = createPost(orgUrl, orgServiceId, orgAppsecret);
HttpRequest get = createPost(orgUrl);
String body;
try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap))
.execute()) {
@ -263,14 +292,15 @@ public class WaterRequestUtil {
//计算请求消耗的时间
long startTime = System.currentTimeMillis();
log.info("--------请求获取门户用户资源信息,请求地址为:{}", resourceUrl);
HttpRequest get = createPost(resourceUrl + "?systemCode=" + systemCode, resourceServiceId, resourceAppsecret);
HttpRequest get = createPost(resourceUrl + "?systemCode=" + systemCode);
get.header("Authorization", authorization);
String body;
try (HttpResponse response = get.execute()) {
body = response.body();
}
long endTime = System.currentTimeMillis();
log.info("--------请求获取门户用户资源信息,耗时{}毫秒,返回结果为:{}", endTime - startTime, body);
log.info("--------请求获取门户用户资源信息,耗时{}毫秒", endTime - startTime);
log.debug("--------请求获取门户用户资源信息,返回结果:{}", body);
WaterResultV2<List<SingleMenu>> waterResult = JSON.parseObject(body, new TypeReference<WaterResultV2<List<SingleMenu>>>() {
});
isSuccess(waterResult);
@ -285,13 +315,13 @@ public class WaterRequestUtil {
hashMap.put("page", 1);
hashMap.put("size", 1000);
hashMap.put("systemCode", systemCode);
HttpRequest get = createPost(roleUrl, roleServiceId, roleAppsecret);
HttpRequest get = createPost(roleUrl);
String body;
try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap))
.execute()) {
body = response.body();
}
log.info("--------请求获取门户角色信息,返回结果为:{}", body);
log.info("--------请求获取门户角色信息");
WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
isSuccess(waterResult);
//{\"total\":1,\"size\":100,\"records\":[{\"area\":\"440000\",\"systemList\":[{\"area\":\"440000\",\"code\":\"sgc-jg\",\"name\":\"水工程应用-水利工程建设管理模块\",\"id\":\"1732648267643097090\"}],\"code\":\"YW00013\",\"level\":\"1d\",\"dataConfig\":\"none\",\"type\":\"BUSINESS\",\"posts\":[],\"users\":[{\"id\":\"20231225000006\"},{\"id\":\"20240119000002\"}],\"name\":\"水利工程应用-水利工程建设管理模块角色\",\"id\":\"20231213000001\",\"category\":\"BUSINESS\",\"businesses\":[{\"parent\":\"1762458920822599682\",\"businessCode\":\"YWSLGCJSGL0008\",\"parentName\":\"水利工程建设管理\",\"businessName\":\"水利工程建设管理\",\"description\":\"\",\"id\":\"1705128209926942721\",\"delFlag\":0}],\"status\":\"1\"}],\"page\":1}
@ -305,13 +335,13 @@ public class WaterRequestUtil {
hashMap.put("page", 1);
hashMap.put("size", 100);
hashMap.put("systemCode", systemCode);
HttpRequest get = createPost(usersUrl, usersServiceId, usersAppsecret);
HttpRequest get = createPost(usersUrl);
String body;
try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap))
.execute()) {
body = response.body();
}
log.info("--------请求获取门户用户信息,返回结果为:{}", body);
log.info("--------请求获取门户用户信息");
WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
isSuccess(waterResult);
return waterResult;

1
shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java

@ -118,7 +118,6 @@ public class SysMenu extends BaseEntity {
this.parentId = parentId;
}
@NotNull(message = "显示顺序不能为空")
public Integer getOrderNum() {
return orderNum;
}

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

@ -23,7 +23,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

18
shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java

@ -83,7 +83,7 @@ public class SysPermissionService {
Object cache = redisCache.getCacheObject(menusKey(userId));
if (cache != null) {
List<MenuDto> menus = StringUtils.cast(cache);
List<String> ides = menus.stream().map(MenuDto::getCode).map(String::trim).collect(Collectors.toList());
List<String> ides = menus.stream().map(MenuDto::getCode).filter(Objects::nonNull).map(String::trim).collect(Collectors.toList());
Map<String, MenuDto> map = menus.stream().collect(Collectors.toMap(MenuDto::getCode, Function.identity(), (a, b) -> a));
return menuService.getChildPerms(menuService.selectMenuList(ides).stream().peek(item ->
{
@ -100,6 +100,14 @@ public class SysPermissionService {
}
}
public String getPortalToken(String userId) {
Object cache = redisCache.getCacheObject(tokenKey(userId));
if (cache != null) {
return StringUtils.cast(cache);
} else {
return null;
}
}
public void setUserPermissionFromPortal(String userId, List<String> perms) {
if (CollectionUtils.isEmpty(perms)) {
@ -115,6 +123,10 @@ public class SysPermissionService {
redisCache.setCacheObject(menusKey(userId), menus, 7, TimeUnit.DAYS);
}
public void setPortalToken(String userId, String token) {
redisCache.setCacheObject(tokenKey(userId), token, 7, TimeUnit.DAYS);
}
@Data
@AllArgsConstructor
@NoArgsConstructor
@ -127,6 +139,10 @@ public class SysPermissionService {
}
private String tokenKey(String userId) {
return "portal_token:" + userId;
}
private String permsKey(String userId) {
return "user_perms:" + userId;
}

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

@ -1,6 +1,11 @@
package com.kms.yg.df.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.math.BigDecimal;
import java.util.*;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.BaseEntityUtils;
@ -60,9 +65,9 @@ public class BsSgcDfSafeJbxxController extends BaseController {
List<HashMap<String, String>> listBy = new ArrayList<>();
HashMap<String, String> map = new HashMap<>();
for (PieDto pieDto : list) {
if (ObjectUtil.isNotEmpty(pieDto.getName())) {
map.put(pieDto.getName(), pieDto.getNum());
}
}
listBy.add(map);
return listBy;
@ -109,14 +114,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;
}
@ -190,6 +197,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

@ -63,7 +63,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

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

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

@ -1,5 +1,7 @@
package com.kms.yg.df.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.common.dto.IAdcd;
@ -35,6 +37,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity implements IAdcd {
* 堤防代码
*/
@ApiModelProperty("堤防名称")
@TableField("dike_CODE")
private String dikeCode;
/**
@ -467,6 +470,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity implements IAdcd {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录生效时间")
@TableField(value = "EFF_DATE", updateStrategy = FieldStrategy.IGNORED)
private Date effDate;
/**
@ -475,6 +479,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity implements IAdcd {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录失效时间")
@TableField(value = "EXPR_DATE", updateStrategy = FieldStrategy.IGNORED)
private Date exprDate;
}

29
shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java

@ -0,0 +1,29 @@
package com.kms.yg.df.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.Setter;
import java.util.Date;
@Data
public class BsSgcDfSwtzDto {
//堤防编码
private String dikeCode;
//防洪标准
private String Flcnst;
//设计洪水位
private String dsfllv;
//警戒水位
private String wrwl;
//备注
private String note;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date effDate;
}

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

@ -20,7 +20,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

@ -40,7 +40,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

@ -31,11 +31,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);
}
@ -53,7 +53,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

@ -34,7 +34,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

@ -33,8 +33,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

@ -79,7 +79,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<>();

3
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java

@ -1,6 +1,7 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -98,10 +99,12 @@ public class BsSgcDfSafeJbxxService extends BaseService<BsSgcDfSafeJbxxMapper, B
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (ObjectUtil.isNotEmpty(pieDtos.get(j).getName())){
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
// hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(j).getStatus(), pieDtos.get(j).getNum());
}
}
}
map.put(pieDtos.get(i).getName(), hashMap);

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

@ -110,7 +110,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

@ -43,6 +43,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
private SysDeptService sysDeptService;
@GetMapping("/getPie")
public List<HashMap<String, String>> getPie() {
@ -94,6 +95,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;
@ -106,11 +108,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;
@ -178,6 +181,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

@ -103,11 +103,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;

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

@ -1,6 +1,10 @@
package com.kms.yg.sz.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.kms.yxgh.common.dto.IAdcd;
import com.shuili.common.annotation.Excel;
@ -280,6 +284,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("记录生效时间")
@TableField(value = "EFF_DATE", updateStrategy= FieldStrategy.IGNORED)
private Date effDate;
/**
@ -289,6 +294,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd {
@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

@ -34,7 +34,7 @@ public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
List<DutyHolderDto> getByWagaCode(@Param("wagaCode") String wagaCode);
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

@ -44,7 +44,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());
@ -77,7 +77,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<>();

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

@ -28,7 +28,7 @@ import java.util.Map;
* @date 2024-01-16
*/
@Service
public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx> {
public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, BsSgcSzSafeJbxx> {
@Resource
private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;

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

@ -39,6 +39,9 @@ public class DfYhPlanSearchDto implements IAdcd {
@ApiModelProperty("堤防id")
private String dikeId;
@ApiModelProperty("堤防等级")
private String dikeGrad;
@ApiModelProperty("名称")
private String name;

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

@ -40,7 +40,10 @@ public interface DfYhPlanMapper extends BaseMapper<DfYhPlan> {
"AND yh.dike_type = #{dto.dikeType} ",
"</if>",
"<if test='dto.dikeCode != null and dto.dikeCode != \"\"'>",
"AND jd.dike_code = #{dto.dikeCode} ",
"AND jb.dike_code = #{dto.dikeCode} ",
"</if>",
"<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>",
"AND jb.dike_grad = #{dto.dikeGrad} ",
"</if>",
"<if test='dto.name != null'>",
"AND yh.name LIKE CONCAT('%',#{dto.name},'%') ",

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

@ -34,6 +34,9 @@ public class SzYhPlanSearchDto implements IAdcd {
@ApiModelProperty("水闸类型")
private String wagaType;
@ApiModelProperty("工程规模")
private String engScal;
@ApiModelProperty("水闸id")
private String wagaId;

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

@ -42,6 +42,9 @@ public interface SzYhPlanMapper extends BaseMapper<SzYhPlan> {
"<if test='dto.wagaCode != null and dto.wagaCode != \"\"'>",
"AND jd.waga_code = #{dto.wagaCode} ",
"</if>",
"<if test='dto.engScal != null and dto.engScal != \"\"'>",
"AND jb.eng_scal = #{dto.engScal} ",
"</if>",
"<if test='dto.name != null'>",
"AND yh.name LIKE CONCAT('%',#{dto.name},'%') ",
"</if>",

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