From c4ecfd4334eb660b9e4eefb5deea5bfdb4a6699a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 14 Nov 2023 16:28:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4ng-alain=E5=92=8Cactuat?= =?UTF-8?q?or=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActuatorRedisController.java | 92 ------------------- .../ngalain/controller/NgAlainController.java | 56 ----------- 2 files changed, 148 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java b/laws-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java index 5990d2d2..d8d887ca 100644 --- a/laws-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java +++ b/laws-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java @@ -25,96 +25,4 @@ import java.util.Map; @RequestMapping("/sys/actuator/redis") public class ActuatorRedisController { - @Autowired - private RedisService redisService; - - /** - * Redis详细信息 - * @return - * @throws Exception - */ - @GetMapping("/info") - public Result> getRedisInfo() throws RedisConnectException { - List infoList = this.redisService.getRedisInfo(); - log.info(infoList.toString()); - return Result.OK(infoList); - } - - @GetMapping("/keysSize") - public Map getKeysSize() throws RedisConnectException { - return redisService.getKeysSize(); - } - - /** - * 获取redis key数量 for 报表 - * @return - * @throws Exception - */ - @GetMapping("/keysSizeForReport") - public Map getKeysSizeReport() throws RedisConnectException { - return redisService.getMapForReport("1"); - } - /** - * 获取redis 内存 for 报表 - * - * @return - * @throws Exception - */ - @GetMapping("/memoryForReport") - public Map memoryForReport() throws RedisConnectException { - return redisService.getMapForReport("2"); - } - /** - * 获取redis 全部信息 for 报表 - * @return - * @throws Exception - */ - @GetMapping("/infoForReport") - public Map infoForReport() throws RedisConnectException { - return redisService.getMapForReport("3"); - } - - @GetMapping("/memoryInfo") - public Map getMemoryInfo() throws RedisConnectException { - return redisService.getMemoryInfo(); - } - - //update-begin--Author:zhangweijian Date:20190425 for：获取磁盘信息 - /** - * @功能：获取磁盘信息 - * @param request - * @param response - * @return - */ - @GetMapping("/queryDiskInfo") - public Result>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){ - Result>> res = new Result<>(); - try { - // 当前文件系统类 - FileSystemView fsv = FileSystemView.getFileSystemView(); - // 列出所有windows 磁盘 - File[] fs = File.listRoots(); - log.info("查询磁盘信息:"+fs.length+"个"); - List> list = new ArrayList<>(); - - for (int i = 0; i < fs.length; i++) { - if(fs[i].getTotalSpace()==0) { - continue; - } - Map map = new HashMap<>(); - map.put("name", fsv.getSystemDisplayName(fs[i])); - map.put("max", fs[i].getTotalSpace()); - map.put("rest", fs[i].getFreeSpace()); - map.put("restPPT", (fs[i].getTotalSpace()-fs[i].getFreeSpace())*100/fs[i].getTotalSpace()); - list.add(map); - log.info(map.toString()); - } - res.setResult(list); - res.setMessage("查询成功"); - } catch (Exception e) { - return Result.error("查询失败"+e.getMessage()); - } - return res; - } - //update-end--Author:zhangweijian Date:20190425 for：获取磁盘信息 } diff --git a/laws-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java b/laws-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java index 8bc52331..a9a0ac0b 100644 --- a/laws-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java +++ b/laws-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java @@ -22,61 +22,5 @@ import lombok.extern.slf4j.Slf4j; @RestController @RequestMapping("/sys/ng-alain") public class NgAlainController { - @Autowired - private NgAlainService ngAlainService; - @Autowired - private ISysDictService sysDictService; - @RequestMapping(value = "/getAppData") - @ResponseBody - public JSONObject getAppData(HttpServletRequest request){ - String token=request.getHeader("X-Access-Token"); - JSONObject j = new JSONObject(); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - JSONObject userObjcet = new JSONObject(); - userObjcet.put("name", user.getUsername()); - userObjcet.put("avatar", user.getAvatar()); - userObjcet.put("email", user.getEmail()); - userObjcet.put("token", token); - j.put("user", userObjcet); - j.put("menu",ngAlainService.getMenu(user.getUsername())); - JSONObject app = new JSONObject(); - app.put("name", "jero-boot-angular"); - app.put("description", "jero+ng-alain整合版本"); - j.put("app", app); - return j; - } - -// @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET) - @GetMapping("/getDictItems/{dictCode}") - public Object getDictItems(@PathVariable String dictCode) { - log.info(" dictCode : "+ dictCode); - Result> result = new Result<>(); - List ls = null; - try { - ls = sysDictService.queryDictItemsByCode(dictCode); - result.setSuccess(true); - result.setResult(ls); - } catch (Exception e) { - log.error(e.getMessage(),e); - return Result.error("操作失败"); - } - List dictlist=new ArrayList<>(); - for (DictModel l : ls) { - JSONObject dict=new JSONObject(); - try { - dict.put("value",Integer.parseInt(l.getValue())); - } catch (NumberFormatException e) { - dict.put("value",l.getValue()); - } - dict.put("label",l.getText()); - dictlist.add(dict); - } - return dictlist; - } -// @RequestMapping(value = "/getDictItemsByTable/{table}/{key}/{value}", method = RequestMethod.GET) - @GetMapping("/getDictItemsByTable/{table}/{key}/{value}") - public Object getDictItemsByTable(@PathVariable String table,@PathVariable String key,@PathVariable String value) { - return this.ngAlainService.getDictByTable(table,key,value); - } }