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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryList.xlsx b/casic-web/src/main/resources/excel/factoryList.xlsx deleted file mode 100644 index 71b8ecb..0000000 --- a/casic-web/src/main/resources/excel/factoryList.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryList.xlsx b/casic-web/src/main/resources/excel/factoryList.xlsx deleted file mode 100644 index 71b8ecb..0000000 --- a/casic-web/src/main/resources/excel/factoryList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsImp.xlsx b/casic-web/src/main/resources/excel/repairsImp.xlsx deleted file mode 100644 index af948e2..0000000 --- a/casic-web/src/main/resources/excel/repairsImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryList.xlsx b/casic-web/src/main/resources/excel/factoryList.xlsx deleted file mode 100644 index 71b8ecb..0000000 --- a/casic-web/src/main/resources/excel/factoryList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsImp.xlsx b/casic-web/src/main/resources/excel/repairsImp.xlsx deleted file mode 100644 index af948e2..0000000 --- a/casic-web/src/main/resources/excel/repairsImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsList.xlsx b/casic-web/src/main/resources/excel/repairsList.xlsx deleted file mode 100644 index 3d5da1f..0000000 --- a/casic-web/src/main/resources/excel/repairsList.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryList.xlsx b/casic-web/src/main/resources/excel/factoryList.xlsx deleted file mode 100644 index 71b8ecb..0000000 --- a/casic-web/src/main/resources/excel/factoryList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsImp.xlsx b/casic-web/src/main/resources/excel/repairsImp.xlsx deleted file mode 100644 index af948e2..0000000 --- a/casic-web/src/main/resources/excel/repairsImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsList.xlsx b/casic-web/src/main/resources/excel/repairsList.xlsx deleted file mode 100644 index 3d5da1f..0000000 --- a/casic-web/src/main/resources/excel/repairsList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/taskImp.xlsx b/casic-web/src/main/resources/excel/taskImp.xlsx deleted file mode 100644 index 9950017..0000000 --- a/casic-web/src/main/resources/excel/taskImp.xlsx +++ /dev/null Binary files differ 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 dc34ecf..6c37072 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 @@ -3,6 +3,7 @@ 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.controller.ExportController; 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; @@ -10,6 +11,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.check.dto.IndexAnalysisDTO; import com.casic.missiles.modular.check.dto.SelectDTO; +import com.casic.missiles.modular.check.enums.ExportEnum; import com.casic.missiles.modular.check.service.ICheckResultService; import com.casic.missiles.modular.check.service.ICheckRuleService; import com.casic.missiles.modular.system.model.CheckResult; @@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +39,7 @@ */ @Controller @RequestMapping("/checkResult") -public class CheckResultController extends BaseController { +public class CheckResultController extends ExportController { @Resource @@ -144,10 +148,10 @@ @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime) { List selectDTOS = new ArrayList<>(); - selectDTOS.add(new SelectDTO("部门职能指标", "30", "25")); - selectDTOS.add(new SelectDTO("经济建设指标", "27", "35")); - selectDTOS.add(new SelectDTO("专题专项指标", "20", "30")); - selectDTOS.add(new SelectDTO("行政综合指标", "18", "30")); + 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")); return ResponseData.success(selectDTOS); } @@ -207,6 +211,34 @@ /** + * 指标态势分析 + */ + @RequestMapping(value = "/analysisExport") + @ResponseBody + public void analysisExport(@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, + HttpServletResponse response)throws IOException { + + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(deptId)) + query.eq("deptid", deptId); + if (ToolUtil.isNotEmpty(indexType)) + query.eq("indexType", indexType); + List checkRuleList = checkRuleService.selectList(query); + checkRuleList.forEach(checkRule -> { + if (ToolUtil.isNotEmpty(checkRule.getDeptid())) { + Dept dept = permissionService.getDeptById(checkRule.getDeptid()); + checkRule.setDeptName(dept != null ? dept.getFullname() : ""); + } + checkRule.setAlarmValue("8"); + checkRule.setCurrentValue("7.82"); + }); + super.exportExcel(ExportEnum.Analysis_EXPORT, checkRuleList, response); + } + + /** * 预警指标分析 */ @RequestMapping(value = "/alarmIndexAnalysis") @@ -248,4 +280,24 @@ // resultData.setData(checkResultService.selectById(checkResultId)); // return resultData; // } + + + /** + * 导出人员列表 + */ + @RequestMapping(value = "/export") + @ResponseBody + public void exportList(HttpServletResponse response, String startTime, String endTime) throws IOException { + EntityWrapper query = new EntityWrapper<>(); + List checkResultList = checkResultService.selectList(query); + checkResultList.forEach(checkResult -> { + if (ToolUtil.isNotEmpty(checkResult.getDeptid())) { + Dept dept = permissionService.getDeptById(checkResult.getDeptid()); + checkResult.setDeptName(dept != null ? dept.getFullname() : ""); + } + }); + super.exportExcel(ExportEnum.Result_EXPORT, checkResultList, response); + } + + } diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java index 4e7b680..6dd7ca7 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckRuleController.java @@ -52,13 +52,15 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(Long keyword1, Long keyword2) { + public Object listPage(Long keyword1, Long keyword2, String keyword3) { Page page = new PageFactory().defaultPage(); EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(keyword1)) query.eq("deptid", keyword1); if (ToolUtil.isNotEmpty(keyword2)) query.eq("subdeptid", keyword2); + if (ToolUtil.isNotEmpty(keyword3)) + query.eq("indexType", keyword3); page = checkRuleService.selectPage(page, query); List checkRuleList = page.getRecords(); checkRuleList.forEach(checkRule -> { diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java new file mode 100644 index 0000000..2288c31 --- /dev/null +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/enums/ExportEnum.java @@ -0,0 +1,48 @@ +package com.casic.missiles.modular.check.enums; + +import com.casic.missiles.config.properties.CasicProperties; +import com.casic.missiles.core.enums.ExportExcelEnum; +import com.casic.missiles.core.util.SpringContextHolder; + +public enum ExportEnum implements ExportExcelEnum { + + Result_EXPORT("checkResultTemp.xlsx","checkResultTemp.xlsx","考核结果"), + Analysis_EXPORT("analysisTemp.xlsx","analysisTemp.xlsx","指标态势分析"), + Visitor_Person_EXPORT("visitorPersonTemp.xlsx","visitorPersonTemp.xlsx","人员访客记录"), + Visitor_Car_EXPORT("visitorCarTemp.xlsx","visitorCarTemp.xlsx","车辆访客列表"), + Alarm_EXPORT("alarmTemp.xlsx","alarmTemp.xlsx","报警列表"); + + ExportEnum(String fileTempPath, String fileName, String description) { + this.fileTempPath = SpringContextHolder.getBean(CasicProperties.class).getExportTempPath().concat(fileTempPath); + this.fileName = fileName; + this.description = description; + } + + /** + * 导出模板相对路径 + */ + private String fileTempPath; + /** + * 下载文件名 + */ + private String fileName; + /** + * 描述信息 + */ + private String description; + + @Override + public String getFileTempPath() { + return fileTempPath; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getDescription() { + return description; + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 803b336..07edaf0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_administrator?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 @@ -17,6 +17,7 @@ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram file-upload-path: C:\casic\tmp\ file-download-path: D:\tmp\ + export-temp-path: D:\tmp\ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid diff --git a/casic-web/src/main/resources/excel/analysisTemp.xlsx b/casic-web/src/main/resources/excel/analysisTemp.xlsx new file mode 100644 index 0000000..8359a99 --- /dev/null +++ b/casic-web/src/main/resources/excel/analysisTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/checkResultTemp.xlsx b/casic-web/src/main/resources/excel/checkResultTemp.xlsx new file mode 100644 index 0000000..990a121 --- /dev/null +++ b/casic-web/src/main/resources/excel/checkResultTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/excel/contractImp.xlsx b/casic-web/src/main/resources/excel/contractImp.xlsx deleted file mode 100644 index 871fa15..0000000 --- a/casic-web/src/main/resources/excel/contractImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/contractList.xlsx b/casic-web/src/main/resources/excel/contractList.xlsx deleted file mode 100644 index 19dda44..0000000 --- a/casic-web/src/main/resources/excel/contractList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx b/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx deleted file mode 100644 index 2986ec1..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp _bak.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/devTypeImp.xlsx b/casic-web/src/main/resources/excel/devTypeImp.xlsx deleted file mode 100644 index 308b35f..0000000 --- a/casic-web/src/main/resources/excel/devTypeImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceImp.xlsx b/casic-web/src/main/resources/excel/deviceImp.xlsx deleted file mode 100644 index 3869021..0000000 --- a/casic-web/src/main/resources/excel/deviceImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceList.xlsx b/casic-web/src/main/resources/excel/deviceList.xlsx deleted file mode 100644 index ebc172f..0000000 --- a/casic-web/src/main/resources/excel/deviceList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/deviceTypeList.xlsx b/casic-web/src/main/resources/excel/deviceTypeList.xlsx deleted file mode 100644 index bc93325..0000000 --- a/casic-web/src/main/resources/excel/deviceTypeList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryImp.xlsx b/casic-web/src/main/resources/excel/factoryImp.xlsx deleted file mode 100644 index bf2dedf..0000000 --- a/casic-web/src/main/resources/excel/factoryImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/factoryList.xlsx b/casic-web/src/main/resources/excel/factoryList.xlsx deleted file mode 100644 index 71b8ecb..0000000 --- a/casic-web/src/main/resources/excel/factoryList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsImp.xlsx b/casic-web/src/main/resources/excel/repairsImp.xlsx deleted file mode 100644 index af948e2..0000000 --- a/casic-web/src/main/resources/excel/repairsImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/repairsList.xlsx b/casic-web/src/main/resources/excel/repairsList.xlsx deleted file mode 100644 index 3d5da1f..0000000 --- a/casic-web/src/main/resources/excel/repairsList.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/taskImp.xlsx b/casic-web/src/main/resources/excel/taskImp.xlsx deleted file mode 100644 index 9950017..0000000 --- a/casic-web/src/main/resources/excel/taskImp.xlsx +++ /dev/null Binary files differ diff --git a/casic-web/src/main/resources/excel/taskList.xlsx b/casic-web/src/main/resources/excel/taskList.xlsx deleted file mode 100644 index 73f22df..0000000 --- a/casic-web/src/main/resources/excel/taskList.xlsx +++ /dev/null Binary files differ