diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java index 9461855..aa3440b 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.check.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.CallDTO; import com.casic.missiles.modular.check.dto.CaseDTO; import com.casic.missiles.modular.check.dto.ProjectDTO; @@ -120,6 +121,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("呼损率", "9.18%", "callFailRate")); ruleMenuDTOList.add(new RuleMenuDTO("接通率", "98.18%", "callSuccessRate")); ruleMenuDTOList.add(new RuleMenuDTO("质检平均分", "9.87", "avgScore")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", DateUtil.getDay(), "ts")); valueList.add(new CallDTO("100", "50", "250", "9.2", "98.12%", "1.82%", "9.87", "200")); @@ -131,6 +133,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("用户满意度", "99%", "satisfiedRate")); ruleMenuDTOList.add(new RuleMenuDTO("归档数", "250", "archiveCount")); ruleMenuDTOList.add(new RuleMenuDTO("延期案卷数", "250", "delayCaseCount")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", "2023-03-02", "ts")); valueList.add(new CaseDTO("200", "95.12%", "99%", "250", "250")); break; @@ -163,4 +166,32 @@ "查询详情成功", resultMap); } + + + /** + * 统计数据列表 + */ + @RequestMapping(value = "/detailList") + @ResponseBody + public Object detailList(String startTime,String endTime) { + if(ToolUtil.isNotEmpty(startTime)){ + if(DateUtil.compareDate(DateUtil.getDay(),startTime)){ + return detail(1L); + } + } + if(ToolUtil.isNotEmpty(endTime)){ + if(DateUtil.compareDate(endTime,DateUtil.getDay())){ + return detail(1L); + } + } + + Map resultMap = new HashMap<>(); + List ruleMenuDTOList = new ArrayList<>(); + List valueList = new ArrayList<>(); + resultMap.put("nameList", ruleMenuDTOList); + resultMap.put("valueList", valueList); + return ResponseData.success(200, + "查询详情成功", + resultMap); + } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java index 9461855..aa3440b 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.check.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.CallDTO; import com.casic.missiles.modular.check.dto.CaseDTO; import com.casic.missiles.modular.check.dto.ProjectDTO; @@ -120,6 +121,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("呼损率", "9.18%", "callFailRate")); ruleMenuDTOList.add(new RuleMenuDTO("接通率", "98.18%", "callSuccessRate")); ruleMenuDTOList.add(new RuleMenuDTO("质检平均分", "9.87", "avgScore")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", DateUtil.getDay(), "ts")); valueList.add(new CallDTO("100", "50", "250", "9.2", "98.12%", "1.82%", "9.87", "200")); @@ -131,6 +133,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("用户满意度", "99%", "satisfiedRate")); ruleMenuDTOList.add(new RuleMenuDTO("归档数", "250", "archiveCount")); ruleMenuDTOList.add(new RuleMenuDTO("延期案卷数", "250", "delayCaseCount")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", "2023-03-02", "ts")); valueList.add(new CaseDTO("200", "95.12%", "99%", "250", "250")); break; @@ -163,4 +166,32 @@ "查询详情成功", resultMap); } + + + /** + * 统计数据列表 + */ + @RequestMapping(value = "/detailList") + @ResponseBody + public Object detailList(String startTime,String endTime) { + if(ToolUtil.isNotEmpty(startTime)){ + if(DateUtil.compareDate(DateUtil.getDay(),startTime)){ + return detail(1L); + } + } + if(ToolUtil.isNotEmpty(endTime)){ + if(DateUtil.compareDate(endTime,DateUtil.getDay())){ + return detail(1L); + } + } + + Map resultMap = new HashMap<>(); + List ruleMenuDTOList = new ArrayList<>(); + List valueList = new ArrayList<>(); + resultMap.put("nameList", ruleMenuDTOList); + resultMap.put("valueList", valueList); + return ResponseData.success(200, + "查询详情成功", + resultMap); + } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java index 6c37072..f16fdb4 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java @@ -63,9 +63,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.ge("ts", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.le("ts", endTime + " 23:59:59"); + } page = checkResultService.selectPage(page, query); List checkResultList = page.getRecords(); checkResultList.forEach(checkResult -> { @@ -126,15 +132,56 @@ public Object statistics(@RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List depStatisticsResult = new ArrayList<>(); - depStatisticsResult.add(new SelectDTO("住建部", "90")); - depStatisticsResult.add(new SelectDTO("党政办", "95")); - depStatisticsResult.add(new SelectDTO("经发局", "80")); - depStatisticsResult.add(new SelectDTO("项目办", "78")); - depStatisticsResult.add(new SelectDTO("社管局", "83")); - depStatisticsResult.add(new SelectDTO("财政局", "92")); - depStatisticsResult.add(new SelectDTO("综治办", "96")); - depStatisticsResult.add(new SelectDTO("公安分局", "68")); - depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + depStatisticsResult.add(new SelectDTO("住建部", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "98")); + depStatisticsResult.add(new SelectDTO("社管局", "93")); + depStatisticsResult.add(new SelectDTO("财政局", "83")); + depStatisticsResult.add(new SelectDTO("综治办", "76")); + depStatisticsResult.add(new SelectDTO("公安分局", "90")); + depStatisticsResult.add(new SelectDTO("产业招商局", "68")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "70")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("项目办", "88")); + depStatisticsResult.add(new SelectDTO("财政局", "75")); + depStatisticsResult.add(new SelectDTO("综治办", "67")); + depStatisticsResult.add(new SelectDTO("公安分局", "88")); + depStatisticsResult.add(new SelectDTO("产业招商局", "80")); + } else { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + } else { + depStatisticsResult.add(new SelectDTO("住建部", "97")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + return ResponseData.success(depStatisticsResult); } @@ -148,10 +195,71 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.45")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.4")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.2")); + } return ResponseData.success(selectDTOS); } @@ -164,18 +272,225 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "90")); - selectDTOS.add(new SelectDTO("2", "87")); - selectDTOS.add(new SelectDTO("3", "92")); - selectDTOS.add(new SelectDTO("4", "95")); - selectDTOS.add(new SelectDTO("5", "88")); - selectDTOS.add(new SelectDTO("6", "90")); - selectDTOS.add(new SelectDTO("7", "70")); - selectDTOS.add(new SelectDTO("8", "75")); - selectDTOS.add(new SelectDTO("9", "89")); - selectDTOS.add(new SelectDTO("10", "67")); - selectDTOS.add(new SelectDTO("11", "77")); - selectDTOS.add(new SelectDTO("12", "88")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + } else { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "90")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "99")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "88")); + selectDTOS.add(new SelectDTO("3", "82")); + selectDTOS.add(new SelectDTO("4", "85")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "90")); + selectDTOS.add(new SelectDTO("8", "85")); + selectDTOS.add(new SelectDTO("9", "99")); + selectDTOS.add(new SelectDTO("10", "77")); + selectDTOS.add(new SelectDTO("11", "87")); + selectDTOS.add(new SelectDTO("12", "78")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "70")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "88")); + selectDTOS.add(new SelectDTO("10", "87")); + selectDTOS.add(new SelectDTO("11", "65")); + selectDTOS.add(new SelectDTO("12", "89")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "80")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + } + if (selectDTOS.size() < 1) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "88")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "72")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "89")); + } + return ResponseData.success(selectDTOS); } @@ -219,7 +534,7 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, - HttpServletResponse response)throws IOException { + HttpServletResponse response) throws IOException { EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(deptId)) @@ -246,22 +561,76 @@ public Object alarmIndexAnalysis(@RequestParam(value = "deptId", required = false) Long deptId, @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime) { + @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { Map resultMap = new HashMap<>(); List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "10")); - selectDTOS.add(new SelectDTO("2", "9.7")); - selectDTOS.add(new SelectDTO("3", "9.0")); - selectDTOS.add(new SelectDTO("4", "9.2")); - selectDTOS.add(new SelectDTO("5", "8.9")); - selectDTOS.add(new SelectDTO("6", "8.5")); - selectDTOS.add(new SelectDTO("7", "7.8")); - selectDTOS.add(new SelectDTO("8", "8.5")); - selectDTOS.add(new SelectDTO("9", "8")); - selectDTOS.add(new SelectDTO("10", "7.7")); - selectDTOS.add(new SelectDTO("11", "9.4")); - selectDTOS.add(new SelectDTO("12", "8.8")); + if(statisticsTime.contains("2020")) { + selectDTOS.add(new SelectDTO("1", "10")); + selectDTOS.add(new SelectDTO("2", "9.7")); + selectDTOS.add(new SelectDTO("3", "9.0")); + selectDTOS.add(new SelectDTO("4", "9.2")); + selectDTOS.add(new SelectDTO("5", "8.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "7.7")); + selectDTOS.add(new SelectDTO("11", "9.4")); + selectDTOS.add(new SelectDTO("12", "8.8")); + }else if(statisticsTime.contains("2021")) { + selectDTOS.add(new SelectDTO("1", "8")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8.7")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "7.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2022")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "7.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "8.8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2023")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "7.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "9.5")); + selectDTOS.add(new SelectDTO("7", "9.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "9")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + } resultMap.put("dataList", selectDTOS); resultMap.put("alarmValue", "8"); return ResponseData.success(resultMap); diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java index 9461855..aa3440b 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.check.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.CallDTO; import com.casic.missiles.modular.check.dto.CaseDTO; import com.casic.missiles.modular.check.dto.ProjectDTO; @@ -120,6 +121,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("呼损率", "9.18%", "callFailRate")); ruleMenuDTOList.add(new RuleMenuDTO("接通率", "98.18%", "callSuccessRate")); ruleMenuDTOList.add(new RuleMenuDTO("质检平均分", "9.87", "avgScore")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", DateUtil.getDay(), "ts")); valueList.add(new CallDTO("100", "50", "250", "9.2", "98.12%", "1.82%", "9.87", "200")); @@ -131,6 +133,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("用户满意度", "99%", "satisfiedRate")); ruleMenuDTOList.add(new RuleMenuDTO("归档数", "250", "archiveCount")); ruleMenuDTOList.add(new RuleMenuDTO("延期案卷数", "250", "delayCaseCount")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", "2023-03-02", "ts")); valueList.add(new CaseDTO("200", "95.12%", "99%", "250", "250")); break; @@ -163,4 +166,32 @@ "查询详情成功", resultMap); } + + + /** + * 统计数据列表 + */ + @RequestMapping(value = "/detailList") + @ResponseBody + public Object detailList(String startTime,String endTime) { + if(ToolUtil.isNotEmpty(startTime)){ + if(DateUtil.compareDate(DateUtil.getDay(),startTime)){ + return detail(1L); + } + } + if(ToolUtil.isNotEmpty(endTime)){ + if(DateUtil.compareDate(endTime,DateUtil.getDay())){ + return detail(1L); + } + } + + Map resultMap = new HashMap<>(); + List ruleMenuDTOList = new ArrayList<>(); + List valueList = new ArrayList<>(); + resultMap.put("nameList", ruleMenuDTOList); + resultMap.put("valueList", valueList); + return ResponseData.success(200, + "查询详情成功", + resultMap); + } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java index 6c37072..f16fdb4 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java @@ -63,9 +63,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.ge("ts", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.le("ts", endTime + " 23:59:59"); + } page = checkResultService.selectPage(page, query); List checkResultList = page.getRecords(); checkResultList.forEach(checkResult -> { @@ -126,15 +132,56 @@ public Object statistics(@RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List depStatisticsResult = new ArrayList<>(); - depStatisticsResult.add(new SelectDTO("住建部", "90")); - depStatisticsResult.add(new SelectDTO("党政办", "95")); - depStatisticsResult.add(new SelectDTO("经发局", "80")); - depStatisticsResult.add(new SelectDTO("项目办", "78")); - depStatisticsResult.add(new SelectDTO("社管局", "83")); - depStatisticsResult.add(new SelectDTO("财政局", "92")); - depStatisticsResult.add(new SelectDTO("综治办", "96")); - depStatisticsResult.add(new SelectDTO("公安分局", "68")); - depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + depStatisticsResult.add(new SelectDTO("住建部", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "98")); + depStatisticsResult.add(new SelectDTO("社管局", "93")); + depStatisticsResult.add(new SelectDTO("财政局", "83")); + depStatisticsResult.add(new SelectDTO("综治办", "76")); + depStatisticsResult.add(new SelectDTO("公安分局", "90")); + depStatisticsResult.add(new SelectDTO("产业招商局", "68")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "70")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("项目办", "88")); + depStatisticsResult.add(new SelectDTO("财政局", "75")); + depStatisticsResult.add(new SelectDTO("综治办", "67")); + depStatisticsResult.add(new SelectDTO("公安分局", "88")); + depStatisticsResult.add(new SelectDTO("产业招商局", "80")); + } else { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + } else { + depStatisticsResult.add(new SelectDTO("住建部", "97")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + return ResponseData.success(depStatisticsResult); } @@ -148,10 +195,71 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.45")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.4")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.2")); + } return ResponseData.success(selectDTOS); } @@ -164,18 +272,225 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "90")); - selectDTOS.add(new SelectDTO("2", "87")); - selectDTOS.add(new SelectDTO("3", "92")); - selectDTOS.add(new SelectDTO("4", "95")); - selectDTOS.add(new SelectDTO("5", "88")); - selectDTOS.add(new SelectDTO("6", "90")); - selectDTOS.add(new SelectDTO("7", "70")); - selectDTOS.add(new SelectDTO("8", "75")); - selectDTOS.add(new SelectDTO("9", "89")); - selectDTOS.add(new SelectDTO("10", "67")); - selectDTOS.add(new SelectDTO("11", "77")); - selectDTOS.add(new SelectDTO("12", "88")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + } else { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "90")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "99")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "88")); + selectDTOS.add(new SelectDTO("3", "82")); + selectDTOS.add(new SelectDTO("4", "85")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "90")); + selectDTOS.add(new SelectDTO("8", "85")); + selectDTOS.add(new SelectDTO("9", "99")); + selectDTOS.add(new SelectDTO("10", "77")); + selectDTOS.add(new SelectDTO("11", "87")); + selectDTOS.add(new SelectDTO("12", "78")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "70")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "88")); + selectDTOS.add(new SelectDTO("10", "87")); + selectDTOS.add(new SelectDTO("11", "65")); + selectDTOS.add(new SelectDTO("12", "89")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "80")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + } + if (selectDTOS.size() < 1) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "88")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "72")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "89")); + } + return ResponseData.success(selectDTOS); } @@ -219,7 +534,7 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, - HttpServletResponse response)throws IOException { + HttpServletResponse response) throws IOException { EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(deptId)) @@ -246,22 +561,76 @@ public Object alarmIndexAnalysis(@RequestParam(value = "deptId", required = false) Long deptId, @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime) { + @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { Map resultMap = new HashMap<>(); List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "10")); - selectDTOS.add(new SelectDTO("2", "9.7")); - selectDTOS.add(new SelectDTO("3", "9.0")); - selectDTOS.add(new SelectDTO("4", "9.2")); - selectDTOS.add(new SelectDTO("5", "8.9")); - selectDTOS.add(new SelectDTO("6", "8.5")); - selectDTOS.add(new SelectDTO("7", "7.8")); - selectDTOS.add(new SelectDTO("8", "8.5")); - selectDTOS.add(new SelectDTO("9", "8")); - selectDTOS.add(new SelectDTO("10", "7.7")); - selectDTOS.add(new SelectDTO("11", "9.4")); - selectDTOS.add(new SelectDTO("12", "8.8")); + if(statisticsTime.contains("2020")) { + selectDTOS.add(new SelectDTO("1", "10")); + selectDTOS.add(new SelectDTO("2", "9.7")); + selectDTOS.add(new SelectDTO("3", "9.0")); + selectDTOS.add(new SelectDTO("4", "9.2")); + selectDTOS.add(new SelectDTO("5", "8.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "7.7")); + selectDTOS.add(new SelectDTO("11", "9.4")); + selectDTOS.add(new SelectDTO("12", "8.8")); + }else if(statisticsTime.contains("2021")) { + selectDTOS.add(new SelectDTO("1", "8")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8.7")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "7.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2022")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "7.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "8.8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2023")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "7.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "9.5")); + selectDTOS.add(new SelectDTO("7", "9.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "9")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + } resultMap.put("dataList", selectDTOS); resultMap.put("alarmValue", "8"); return ResponseData.success(resultMap); diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java index 1911078..9d15be1 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.check.dto; +import com.casic.missiles.core.util.DateUtil; + public class CallDTO { private String avgInTimes; @@ -10,6 +12,7 @@ private String callFailRate; private String avgScore; private String totalTimes; + private String ts; public String getAvgInTimes() { return avgInTimes; @@ -87,5 +90,6 @@ this.callFailRate = callFailRate; this.avgScore = avgScore; this.totalTimes = totalTimes; + this.ts= DateUtil.getDay(); } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java index 9461855..aa3440b 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.check.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.CallDTO; import com.casic.missiles.modular.check.dto.CaseDTO; import com.casic.missiles.modular.check.dto.ProjectDTO; @@ -120,6 +121,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("呼损率", "9.18%", "callFailRate")); ruleMenuDTOList.add(new RuleMenuDTO("接通率", "98.18%", "callSuccessRate")); ruleMenuDTOList.add(new RuleMenuDTO("质检平均分", "9.87", "avgScore")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", DateUtil.getDay(), "ts")); valueList.add(new CallDTO("100", "50", "250", "9.2", "98.12%", "1.82%", "9.87", "200")); @@ -131,6 +133,7 @@ ruleMenuDTOList.add(new RuleMenuDTO("用户满意度", "99%", "satisfiedRate")); ruleMenuDTOList.add(new RuleMenuDTO("归档数", "250", "archiveCount")); ruleMenuDTOList.add(new RuleMenuDTO("延期案卷数", "250", "delayCaseCount")); + ruleMenuDTOList.add(new RuleMenuDTO("时间", "2023-03-02", "ts")); valueList.add(new CaseDTO("200", "95.12%", "99%", "250", "250")); break; @@ -163,4 +166,32 @@ "查询详情成功", resultMap); } + + + /** + * 统计数据列表 + */ + @RequestMapping(value = "/detailList") + @ResponseBody + public Object detailList(String startTime,String endTime) { + if(ToolUtil.isNotEmpty(startTime)){ + if(DateUtil.compareDate(DateUtil.getDay(),startTime)){ + return detail(1L); + } + } + if(ToolUtil.isNotEmpty(endTime)){ + if(DateUtil.compareDate(endTime,DateUtil.getDay())){ + return detail(1L); + } + } + + Map resultMap = new HashMap<>(); + List ruleMenuDTOList = new ArrayList<>(); + List valueList = new ArrayList<>(); + resultMap.put("nameList", ruleMenuDTOList); + resultMap.put("valueList", valueList); + return ResponseData.success(200, + "查询详情成功", + resultMap); + } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java index 6c37072..f16fdb4 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckResultController.java @@ -63,9 +63,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String startTime, String endTime) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(startTime)) { + query.ge("ts", startTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + query.le("ts", endTime + " 23:59:59"); + } page = checkResultService.selectPage(page, query); List checkResultList = page.getRecords(); checkResultList.forEach(checkResult -> { @@ -126,15 +132,56 @@ public Object statistics(@RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List depStatisticsResult = new ArrayList<>(); - depStatisticsResult.add(new SelectDTO("住建部", "90")); - depStatisticsResult.add(new SelectDTO("党政办", "95")); - depStatisticsResult.add(new SelectDTO("经发局", "80")); - depStatisticsResult.add(new SelectDTO("项目办", "78")); - depStatisticsResult.add(new SelectDTO("社管局", "83")); - depStatisticsResult.add(new SelectDTO("财政局", "92")); - depStatisticsResult.add(new SelectDTO("综治办", "96")); - depStatisticsResult.add(new SelectDTO("公安分局", "68")); - depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + depStatisticsResult.add(new SelectDTO("住建部", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "98")); + depStatisticsResult.add(new SelectDTO("社管局", "93")); + depStatisticsResult.add(new SelectDTO("财政局", "83")); + depStatisticsResult.add(new SelectDTO("综治办", "76")); + depStatisticsResult.add(new SelectDTO("公安分局", "90")); + depStatisticsResult.add(new SelectDTO("产业招商局", "68")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + depStatisticsResult.add(new SelectDTO("住建部", "70")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("项目办", "88")); + depStatisticsResult.add(new SelectDTO("财政局", "75")); + depStatisticsResult.add(new SelectDTO("综治办", "67")); + depStatisticsResult.add(new SelectDTO("公安分局", "88")); + depStatisticsResult.add(new SelectDTO("产业招商局", "80")); + } else { + depStatisticsResult.add(new SelectDTO("住建部", "90")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + } else { + depStatisticsResult.add(new SelectDTO("住建部", "97")); + depStatisticsResult.add(new SelectDTO("党政办", "95")); + depStatisticsResult.add(new SelectDTO("经发局", "80")); + depStatisticsResult.add(new SelectDTO("项目办", "78")); + depStatisticsResult.add(new SelectDTO("社管局", "83")); + depStatisticsResult.add(new SelectDTO("财政局", "92")); + depStatisticsResult.add(new SelectDTO("综治办", "96")); + depStatisticsResult.add(new SelectDTO("公安分局", "68")); + depStatisticsResult.add(new SelectDTO("产业招商局", "82")); + } + return ResponseData.success(depStatisticsResult); } @@ -148,10 +195,71 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.45")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "27", "0.35")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "18", "0.3")); + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (startTime.contains("2022") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } else if (startTime.contains("2022") && startTime.contains("2022")) { + selectDTOS.add(new SelectDTO("部门职能指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "25", "0.25")); + selectDTOS.add(new SelectDTO("行政综合指标", "30", "0.25")); + } else if (startTime.contains("2023-02") && startTime.contains("2023")) { + selectDTOS.add(new SelectDTO("部门职能指标", "10", "0.25")); + selectDTOS.add(new SelectDTO("经济建设指标", "30", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "23", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.35")); + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "28", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.3")); + selectDTOS.add(new SelectDTO("专题专项指标", "27", "0.3")); + selectDTOS.add(new SelectDTO("行政综合指标", "20", "0.2")); + } + } else { + selectDTOS.add(new SelectDTO("部门职能指标", "30", "0.2")); + selectDTOS.add(new SelectDTO("经济建设指标", "25", "0.4")); + selectDTOS.add(new SelectDTO("专题专项指标", "20", "0.2")); + selectDTOS.add(new SelectDTO("行政综合指标", "25", "0.2")); + } return ResponseData.success(selectDTOS); } @@ -164,18 +272,225 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "90")); - selectDTOS.add(new SelectDTO("2", "87")); - selectDTOS.add(new SelectDTO("3", "92")); - selectDTOS.add(new SelectDTO("4", "95")); - selectDTOS.add(new SelectDTO("5", "88")); - selectDTOS.add(new SelectDTO("6", "90")); - selectDTOS.add(new SelectDTO("7", "70")); - selectDTOS.add(new SelectDTO("8", "75")); - selectDTOS.add(new SelectDTO("9", "89")); - selectDTOS.add(new SelectDTO("10", "67")); - selectDTOS.add(new SelectDTO("11", "77")); - selectDTOS.add(new SelectDTO("12", "88")); + if (deptId == 1255343768085778434L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "60")); + selectDTOS.add(new SelectDTO("3", "78")); + selectDTOS.add(new SelectDTO("4", "89")); + selectDTOS.add(new SelectDTO("5", "90")); + selectDTOS.add(new SelectDTO("6", "88")); + selectDTOS.add(new SelectDTO("7", "77")); + selectDTOS.add(new SelectDTO("8", "66")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "70")); + selectDTOS.add(new SelectDTO("12", "98")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + } else { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "90")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "99")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + + } else if (deptId == 1255343768157081602L) { + if (ToolUtil.isNotEmpty(statisticsTime)) { + if (statisticsTime.contains("2023")) { + + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "88")); + selectDTOS.add(new SelectDTO("3", "82")); + selectDTOS.add(new SelectDTO("4", "85")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "90")); + selectDTOS.add(new SelectDTO("8", "85")); + selectDTOS.add(new SelectDTO("9", "99")); + selectDTOS.add(new SelectDTO("10", "77")); + selectDTOS.add(new SelectDTO("11", "87")); + selectDTOS.add(new SelectDTO("12", "78")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else if (statisticsTime.contains("2022")) { + if ("部门职能".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "90")); + selectDTOS.add(new SelectDTO("2", "87")); + selectDTOS.add(new SelectDTO("3", "92")); + selectDTOS.add(new SelectDTO("4", "95")); + selectDTOS.add(new SelectDTO("5", "88")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "70")); + selectDTOS.add(new SelectDTO("8", "75")); + selectDTOS.add(new SelectDTO("9", "89")); + selectDTOS.add(new SelectDTO("10", "67")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } else if ("专题专项".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "70")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "70")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "88")); + selectDTOS.add(new SelectDTO("10", "87")); + selectDTOS.add(new SelectDTO("11", "65")); + selectDTOS.add(new SelectDTO("12", "89")); + } else if ("经济发展".equals(indexType)) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "67")); + selectDTOS.add(new SelectDTO("3", "89")); + selectDTOS.add(new SelectDTO("4", "56")); + selectDTOS.add(new SelectDTO("5", "78")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "76")); + selectDTOS.add(new SelectDTO("8", "87")); + selectDTOS.add(new SelectDTO("9", "84")); + selectDTOS.add(new SelectDTO("10", "80")); + selectDTOS.add(new SelectDTO("11", "77")); + selectDTOS.add(new SelectDTO("12", "88")); + } + + } else { + selectDTOS.add(new SelectDTO("1", "80")); + selectDTOS.add(new SelectDTO("2", "85")); + selectDTOS.add(new SelectDTO("3", "80")); + selectDTOS.add(new SelectDTO("4", "78")); + selectDTOS.add(new SelectDTO("5", "82")); + selectDTOS.add(new SelectDTO("6", "90")); + selectDTOS.add(new SelectDTO("7", "85")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "79")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "79")); + } + } + } + if (selectDTOS.size() < 1) { + selectDTOS.add(new SelectDTO("1", "89")); + selectDTOS.add(new SelectDTO("2", "75")); + selectDTOS.add(new SelectDTO("3", "88")); + selectDTOS.add(new SelectDTO("4", "88")); + selectDTOS.add(new SelectDTO("5", "72")); + selectDTOS.add(new SelectDTO("6", "80")); + selectDTOS.add(new SelectDTO("7", "95")); + selectDTOS.add(new SelectDTO("8", "89")); + selectDTOS.add(new SelectDTO("9", "78")); + selectDTOS.add(new SelectDTO("10", "89")); + selectDTOS.add(new SelectDTO("11", "75")); + selectDTOS.add(new SelectDTO("12", "89")); + } + return ResponseData.success(selectDTOS); } @@ -219,7 +534,7 @@ @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, - HttpServletResponse response)throws IOException { + HttpServletResponse response) throws IOException { EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(deptId)) @@ -246,22 +561,76 @@ public Object alarmIndexAnalysis(@RequestParam(value = "deptId", required = false) Long deptId, @RequestParam(value = "indexType", required = false) String indexType, @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime) { + @RequestParam(value = "statisticsTime", required = false) String statisticsTime) { Map resultMap = new HashMap<>(); List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("1", "10")); - selectDTOS.add(new SelectDTO("2", "9.7")); - selectDTOS.add(new SelectDTO("3", "9.0")); - selectDTOS.add(new SelectDTO("4", "9.2")); - selectDTOS.add(new SelectDTO("5", "8.9")); - selectDTOS.add(new SelectDTO("6", "8.5")); - selectDTOS.add(new SelectDTO("7", "7.8")); - selectDTOS.add(new SelectDTO("8", "8.5")); - selectDTOS.add(new SelectDTO("9", "8")); - selectDTOS.add(new SelectDTO("10", "7.7")); - selectDTOS.add(new SelectDTO("11", "9.4")); - selectDTOS.add(new SelectDTO("12", "8.8")); + if(statisticsTime.contains("2020")) { + selectDTOS.add(new SelectDTO("1", "10")); + selectDTOS.add(new SelectDTO("2", "9.7")); + selectDTOS.add(new SelectDTO("3", "9.0")); + selectDTOS.add(new SelectDTO("4", "9.2")); + selectDTOS.add(new SelectDTO("5", "8.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "7.7")); + selectDTOS.add(new SelectDTO("11", "9.4")); + selectDTOS.add(new SelectDTO("12", "8.8")); + }else if(statisticsTime.contains("2021")) { + selectDTOS.add(new SelectDTO("1", "8")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8.7")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "7.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2022")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "8.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "7.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "7.5")); + selectDTOS.add(new SelectDTO("7", "8.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "8.8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else if(statisticsTime.contains("2023")) { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "7.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "9.5")); + selectDTOS.add(new SelectDTO("7", "9.8")); + selectDTOS.add(new SelectDTO("8", "9.5")); + selectDTOS.add(new SelectDTO("9", "9")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + }else { + selectDTOS.add(new SelectDTO("1", "9")); + selectDTOS.add(new SelectDTO("2", "7.7")); + selectDTOS.add(new SelectDTO("3", "8.0")); + selectDTOS.add(new SelectDTO("4", "8.2")); + selectDTOS.add(new SelectDTO("5", "9.9")); + selectDTOS.add(new SelectDTO("6", "8.5")); + selectDTOS.add(new SelectDTO("7", "7.8")); + selectDTOS.add(new SelectDTO("8", "8.5")); + selectDTOS.add(new SelectDTO("9", "8")); + selectDTOS.add(new SelectDTO("10", "8.7")); + selectDTOS.add(new SelectDTO("11", "8.4")); + selectDTOS.add(new SelectDTO("12", "9.8")); + } resultMap.put("dataList", selectDTOS); resultMap.put("alarmValue", "8"); return ResponseData.success(resultMap); diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java index 1911078..9d15be1 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/CallDTO.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.check.dto; +import com.casic.missiles.core.util.DateUtil; + public class CallDTO { private String avgInTimes; @@ -10,6 +12,7 @@ private String callFailRate; private String avgScore; private String totalTimes; + private String ts; public String getAvgInTimes() { return avgInTimes; @@ -87,5 +90,6 @@ this.callFailRate = callFailRate; this.avgScore = avgScore; this.totalTimes = totalTimes; + this.ts= DateUtil.getDay(); } } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/RuleMenuDTO.java b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/RuleMenuDTO.java index 640b441..5997141 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/dto/RuleMenuDTO.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/dto/RuleMenuDTO.java @@ -5,6 +5,7 @@ private String text; private String value; private String name; + private String ts; public String getText() { return text; @@ -30,6 +31,14 @@ this.name = name; } + public RuleMenuDTO(String text, String value, String name, String ts) { + this.text = text; + this.value = value; + this.name = name; + this.ts = ts; + } + + public RuleMenuDTO(String text, String value, String name) { this.text = text; this.value = value;