diff --git a/shuili-admin/src/main/java/com/kms/web/config/CommonThreadPoolConfig.java b/shuili-admin/src/main/java/com/kms/web/config/CommonThreadPoolConfig.java new file mode 100644 index 00000000..0379ba6d --- /dev/null +++ b/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)); + } + +} diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index b9d4e7ac..5003c000 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/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> menusFuture = CompletableFuture.supplyAsync(() -> portalMenu(token)); - CompletableFuture 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> menusFuture = CompletableFuture.supplyAsync(() -> portalMenu(accessToken), executor); + CompletableFuture userFuture = CompletableFuture.supplyAsync(() -> innerLogin(accessToken), executor); CompletableFuture.allOf(menusFuture, userFuture).join(); List 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); } diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index 9359e1b9..6cf9e8f3 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/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 hashMap = new HashMap<>(); -// int i = 1; -// while (f) { -// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); -// String data = JSONObject.parseObject(s).getString("data"); -// List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); -// if(attResRspps.size() 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 hashMap = new HashMap<>(); + int i = 1; + while (f) { + String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); + if(attResRspps.size() 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"); + ListsgcDfSwtzDtos=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 bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class); + List 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 bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class); + List 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); + }); + } + + /** * 水库基本信息 diff --git a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java b/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java index f51c6de8..e5254c33 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java +++ b/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 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 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 waterResult = JSON.parseObject(body, new TypeReference>() { + }); + isSuccess(waterResult); + return waterResult; + } + /** * 验证用户登录 * @@ -203,20 +207,45 @@ public class WaterRequestUtil { public WaterResultV2 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 waterResult = JSON.parseObject(body, new TypeReference>() { }); 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 waterResult = JSON.parseObject(body, new TypeReference>() { + }); + 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> waterResult = JSON.parseObject(body, new TypeReference>>() { }); 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; diff --git a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java index 338c2c60..ddef7c65 100644 --- a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java +++ b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java @@ -6,7 +6,7 @@ import java.util.Arrays; /** * 文件上传 误异常类 - * + * * @author shuili */ public class InvalidExtensionException extends FileUploadException diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java index c2fd0425..c535f287 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java +++ b/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; } diff --git a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java index 63351022..683e93b0 100644 --- a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java +++ b/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 diff --git a/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java b/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java index 166bcc14..50a0ce7e 100644 --- a/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java +++ b/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 menus = StringUtils.cast(cache); - List ides = menus.stream().map(MenuDto::getCode).map(String::trim).collect(Collectors.toList()); + List ides = menus.stream().map(MenuDto::getCode).filter(Objects::nonNull).map(String::trim).collect(Collectors.toList()); Map 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 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; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 74737d84..775bc898 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/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> listBy = new ArrayList<>(); HashMap 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 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)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java index 350760c6..7485fbc7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java +++ b/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 list = bsSgcSzYhxxService.getPie(layer, xzqh); - + String subString = sysXzqhService.getSubString(xzqh); List> listBy = new ArrayList<>(); HashMap map = new HashMap<>(); for (PieDto pieDto : list) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java index 728ea5a5..56176e04 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java index c0cbcbe5..24938674 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java +++ b/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; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java new file mode 100644 index 00000000..88f61533 --- /dev/null +++ b/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; +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java index 19cf0f9b..1c9004f5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java @@ -20,7 +20,7 @@ public interface BsSgcDfBzhjsMapper extends BaseMapper { List 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, diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java index 32b11ba8..c45b7983 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java @@ -19,9 +19,10 @@ public interface BsSgcDfDaglMapper extends BaseMapper { List 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); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index a7a77b43..cbc5a763 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -40,7 +40,8 @@ public interface BsSgcDfFzrMapper extends BaseMapper { @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 getType1(@Param("layer") Integer layer, @Param("adcd") String adcd); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java index c552f56c..07356fbb 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -31,11 +31,11 @@ public class BsSgcDfBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); List infoPage = bsSgcDfBzbpMapper - .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), adcd); + .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd); Page bsSgcDfBzbpPage = new Page<>(); bsSgcDfBzbpPage.setRecords(infoPage); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index 3862b1d5..ef27faf2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java @@ -34,7 +34,7 @@ public class BsSgcDfBzhjsService extends BaseService list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), + List list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); Page page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index a01347a7..af50450d 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -33,8 +33,8 @@ public class BsSgcDfDaglService extends BaseService list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit()); Page page = new Page<>(); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java index 0c4c74f5..d672f51c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java @@ -79,7 +79,7 @@ public class BsSgcDfFzrService extends BaseService Map params = sp.getParams(); List 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 page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java index 94c49a16..9145442a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java +++ b/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 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); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java index 69e9c7d8..df1e9426 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java +++ b/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); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 1c2cc4a9..16a9af76 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/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> 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 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)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java index 94b2e936..f931e0be 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java index ca33c784..3a63c1a6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java +++ b/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; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java index 519325f6..16842433 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java @@ -25,6 +25,7 @@ public interface BsSgcSzBzhjsMapper extends BaseMapper { @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCOde); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java index ae4e6101..66f86add 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java @@ -24,5 +24,7 @@ public interface BsSgcSzDaglMapper extends BaseMapper { @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); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java index 5b4091b8..93fff33e 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java @@ -34,7 +34,7 @@ public interface BsSgcSzFzrMapper extends BaseMapper { List getByWagaCode(@Param("wagaCode") String wagaCode); List 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, diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java index 99190f4c..e23b3257 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java @@ -34,7 +34,7 @@ public class BsSgcSzBzhjsService extends BaseService 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 page = new Page<>(); page.setRecords(list); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java index 4b9fdc75..eabb54f1 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java @@ -34,7 +34,7 @@ public class BsSgcSzDaglService extends BaseService 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 page = new Page<>(); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java index 9fd6d2ed..b2da353f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java @@ -44,7 +44,7 @@ public class BsSgcSzFzrService extends BaseService 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 Map params = sp.getParams(); - List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWagaCode(), sysXzqhService.getSubString(data.getAdcd()), + List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); Page page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java index 3baccec7..478608ea 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java +++ b/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 { +public class BsSgcSzSafeJbxxService extends BaseService { @Resource private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java index 70df5522..d08cb1c2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java index f12e2b69..cffcec4d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java @@ -40,7 +40,10 @@ public interface DfYhPlanMapper extends BaseMapper { "AND yh.dike_type = #{dto.dikeType} ", "", "", - "AND jd.dike_code = #{dto.dikeCode} ", + "AND jb.dike_code = #{dto.dikeCode} ", + "", + "", + "AND jb.dike_grad = #{dto.dikeGrad} ", "", "", "AND yh.name LIKE CONCAT('%',#{dto.name},'%') ", diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java index 80304c80..8fc4dbe3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java index 09cf4722..2e74ac2d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java @@ -42,6 +42,9 @@ public interface SzYhPlanMapper extends BaseMapper { "", "AND jd.waga_code = #{dto.wagaCode} ", "", + "", + "AND jb.eng_scal = #{dto.engScal} ", + "", "", "AND yh.name LIKE CONCAT('%',#{dto.name},'%') ", "", diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml index 2b6c2809..47f1347c 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml @@ -7,10 +7,10 @@ - + - + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml index 22d18a83..8989a0e4 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -30,8 +30,8 @@ and sj.dike_type = #{dikeType} - - and sj.dike_name LIKE concat('%',#{dikeName},'%') + + and sj.dike_CODE LIKE concat('%',#{dikeCode},'%') @@ -40,6 +40,8 @@ and sf.id=#{id} + and sj.EXPR_DATE is null + order by sf.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml index 72bfcd79..6135ed3f 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml @@ -32,8 +32,8 @@ and sj.dike_type = #{dikeType} - - and sj.dike_name LIKE concat('%',#{dikeName},'%') + + and sj.dike_CODE =#{dikeCode} @@ -42,6 +42,11 @@ and sd.id=#{id} + + and sj.ADM_DEP LIKE CONCAT('%',#{unit}) + + and sj.EXPR_DATE is null + order by sd.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml index 78e912f4..aa37049d 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -64,8 +64,8 @@ - - and sf.dike_code =#{dikeCode} + + and sj.dike_NAME like concat('%',#{dikeName},'%') diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml index 9011d077..70376686 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml @@ -74,11 +74,10 @@ diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml index 1056caa5..01214d3e 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml @@ -40,6 +40,11 @@ and sf.id=#{id} + + and sj.waga_code=#{wagaCode} + + and sj.EXPR_DATE is null + order by sf.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml index 1cbf29de..ecb771a0 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml @@ -5,7 +5,7 @@ - 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 @@ and sj.waga_name LIKE concat('%',#{wagaName},'%') - + + and sj.WAGA_CODE = #{wagaCode} + and sj.adcd like concat(#{adcd},'%') + + and sj.ADM_DEP like concat(#{unit},'%') + and sd.id=#{id} + and sj.EXPR_DATE is null + order by sd.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index 55649300..aea2faff 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -31,7 +31,7 @@ - + @@ -64,8 +64,8 @@ - - and sf.waga_code =#{wagaCode} + + and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')