From f4634091d71bc3e99df179d5976b9c59a24ca5f7 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期三, 24 一月 2024 12:00:46 +0800 Subject: [PATCH] 报告 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 100 ++++++++++++++++++++++--------------------------- 1 files changed, 45 insertions(+), 55 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java index 8c51008..7399842 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java @@ -413,10 +413,10 @@ } /** - * 褰卞儚妫�鏌ラ〉闈㈠垪琛� + * 鍖栭獙妫�鏌ラ〉闈㈠垪琛� */ @GetMapping("/huaYangetProList") - @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�") + @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�") public AjaxResult huaYangetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber, @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type, @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name, @@ -446,21 +446,20 @@ SysPost byId = postService.getById(one.getPostId()); if (byId.getPostName().equals("褰曞叆鍛�")) { ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId)); - } } } } else { ksproList = projectService.getKsTjProjectIdList(); } - - //绛涢�夊奖鍍忕殑椤圭洰銆� - ksproList = ksproList.stream() - .filter(element -> element ==1633660948860522589L) - .collect(Collectors.toList()); if (ksproList == null || ksproList.size() == 0) { return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�"); } + //绛涢�夊寲楠岀殑椤圭洰銆� + ksproList = ksproList.stream() + .filter(element -> element ==1633660948860522629L) + .collect(Collectors.toList()); + List<TjCustomer> customerLis = new ArrayList<>(); //鏍规嵁浣撴鍙锋煡 @@ -599,34 +598,25 @@ return AjaxResult.success("鏆傛棤鏁版嵁"); } } - List<TjCustomer> customerLists = new ArrayList<>(); + List<TjCustomer> customerLists = null; if (type == 0) { - customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj"); +// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj"); } if (type == 1) { - customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj"); +// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj"); } asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId)); - if (customerLists != null && customerLists.size() > 0) { - Collections.reverse(customerLists); - List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - Map<String, Object> map = new HashMap<>(); - map.put("date", customerList); - map.put("total", customerLists.size()); - return AjaxResult.success(map); - } else { - AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis); - if (map != null) return map; - return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁"); - } + AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis); + if (map != null) return map; + return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁"); } /** - * 鍖栭獙妫�鏌ラ〉闈㈠垪琛� + * 褰卞儚妫�鏌ラ〉闈㈠垪琛� */ @GetMapping("/yingXiangGetProList") - @ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�") + @ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�") public AjaxResult yingXiangGetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber, @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type, @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name, @@ -663,25 +653,25 @@ } else { ksproList = projectService.getKsTjProjectIdList(); } - //绛涢�夊寲楠岀殑椤圭洰銆� - ksproList = ksproList.stream() - .filter(element -> element ==1633660948860522629L || element ==1633660948860522504L - || - element ==1633660948860522507L|| element ==1633660948860522508L - || - element ==1633660948860522515L|| element ==1633660948860522516L - || - element ==1633660948860522517L|| element ==1633660948860522519L - || - element ==1633660948860522524L|| element ==1633660948860522530L - || - element ==1633660948860522531L|| element ==1633660948860522533L - ) - .collect(Collectors.toList()); - - if (ksproList == null || ksproList.size() == 0) { + //绛涢�夊奖鍍忕殑椤圭洰銆� + if (ksproList.size() == 0) { return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�"); } + ksproList = ksproList.stream() + .filter(element -> element ==1633660948860522589L +// || element ==1633660948860522504L +// || +// element ==1633660948860522507L|| element ==1633660948860522508L +// || +// element ==1633660948860522515L|| element ==1633660948860522516L +// || +// element ==1633660948860522517L|| element ==1633660948860522519L +// || +// element ==1633660948860522524L|| element ==1633660948860522530L +// || +// element ==1633660948860522531L|| element ==1633660948860522533L + ) + .collect(Collectors.toList()); List<TjCustomer> customerLis = new ArrayList<>(); //鏍规嵁浣撴鍙锋煡 @@ -820,26 +810,26 @@ return AjaxResult.success("鏆傛棤鏁版嵁"); } } - List<TjCustomer> customerLists = new ArrayList<>(); + List<TjCustomer> customerLists = null; if (type == 0) { - customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj"); +// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj"); } if (type == 1) { - customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj"); +// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj"); } - asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId)); - if (customerLists != null && customerLists.size() > 0) { - Collections.reverse(customerLists); - List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - Map<String, Object> map = new HashMap<>(); - map.put("date", customerList); - map.put("total", customerLists.size()); - return AjaxResult.success(map); - } else { +// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId)); +// if (customerLists.size() > 0) { +// Collections.reverse(customerLists); +// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// Map<String, Object> map = new HashMap<>(); +// map.put("date", customerList); +// map.put("total", customerLists.size()); +// return AjaxResult.success(map); +// } else { AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis); if (map != null) return map; return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁"); - } +// } } -- Gitblit v1.8.0