diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index cd850b4..a73a8d8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -234,7 +234,7 @@ bwi.RESPONSIBLE_DEPT AS deptid - SELECT FROM alarm_job aj diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index cd850b4..a73a8d8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -234,7 +234,7 @@ bwi.RESPONSIBLE_DEPT AS deptid - SELECT FROM alarm_job aj diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 7911401..263839d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index cd850b4..a73a8d8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -234,7 +234,7 @@ bwi.RESPONSIBLE_DEPT AS deptid - SELECT FROM alarm_job aj diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 7911401..263839d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 8434c3c..760fdf6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -2,16 +2,16 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; -import com.casic.missiles.modular.system.dao.SysDictMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -21,8 +21,6 @@ @Autowired private StatisticMapper statisticMapper; @Autowired - private SysDictMapper sysDictMapper; - @Autowired private AlarmNowViewMapper alarmNowViewMapper; @Resource private AbstractPermissionContext permissionService; @@ -84,7 +82,7 @@ continue; } Dept dept = permissionService.getDeptById(deptId); - if( ToolUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 + if( ObjectUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 continue; } Map map = new HashMap<>(); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index cd850b4..a73a8d8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -234,7 +234,7 @@ bwi.RESPONSIBLE_DEPT AS deptid - SELECT FROM alarm_job aj diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 7911401..263839d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 8434c3c..760fdf6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -2,16 +2,16 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; -import com.casic.missiles.modular.system.dao.SysDictMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -21,8 +21,6 @@ @Autowired private StatisticMapper statisticMapper; @Autowired - private SysDictMapper sysDictMapper; - @Autowired private AlarmNowViewMapper alarmNowViewMapper; @Resource private AbstractPermissionContext permissionService; @@ -84,7 +82,7 @@ continue; } Dept dept = permissionService.getDeptById(deptId); - if( ToolUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 + if( ObjectUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 continue; } Map map = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java index cbd8e59..81ed390 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.util; import com.casic.missiles.config.PushProperties; -import com.casic.missiles.core.util.SpringContextHolder; import com.gexin.rp.sdk.base.IPushResult; import com.gexin.rp.sdk.base.impl.ListMessage; import com.gexin.rp.sdk.base.impl.Target; @@ -10,7 +9,6 @@ import com.gexin.rp.sdk.template.NotificationTemplate; import com.gexin.rp.sdk.template.style.Style0; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 1b57b31..95d7f58 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -71,6 +71,19 @@ ${pro.version} provided + + + org.quartz-scheduler + quartz + 2.3.0 + + + + com.casic + casic-export-support + ${extension.version} + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java new file mode 100644 index 0000000..460d4db --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/CasicApplication.java @@ -0,0 +1,31 @@ +package com.casic.missiles; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * SpringBoot方式启动类 + * + * @author lwh + * @Date 2021/06/06 12:06 + */ +@SpringBootApplication +@EnableCaching +@EnableScheduling +@EnableTransactionManagement(proxyTargetClass = true) +@EnableAsync +@ServletComponentScan +@Slf4j +public class CasicApplication { + public static void main(String[] args) { + SpringApplication.run(CasicApplication.class, args); + log.info("CasicApplication is success!"); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java index 150976e..9c9c4b5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java +++ b/casic-alarm/src/main/java/com/casic/missiles/config/WebSocketConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; // tomcat启动无需配置 @Configuration diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 1398aab..ef473af 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -1,21 +1,19 @@ package com.casic.missiles.modular.alarm.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.warpper.AlarmJobWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.hswebframework.expands.office.excel.ExcelIO; -import org.json.JSONException; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; @@ -32,7 +31,6 @@ import java.text.ParseException; import java.util.*; -//import com.casic.missiles.model.response.ResponseData; /** * 控制器 @@ -47,7 +45,7 @@ @Autowired private IAlarmJobService alarmJobService; - @Autowired + @Resource private AbstractPermissionContext iCommonPermissionService; @Autowired private ISysDictService iSysDictService; @@ -129,10 +127,9 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -147,7 +144,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatusStr)) { + if (StrUtil.isNotEmpty(jobStatusStr)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatusStr)); } @@ -156,7 +153,6 @@ } new AlarmJobWarpper(retList).warp(); page.setRecords(retList); - return ResponseData.success(super.packForBT(page)); } @@ -168,9 +164,10 @@ public Object jobListSearch(String keywords, String alarmLevel, String alarmContent, String jobStatus, String beginTime, String endTime, String getJobBeginTime, String getJobEndTime, String shouldGetBeginTime, String shouldGetEndTime, String handleJobBeginTime, String handleJobEndTime, String shouldHandleBeginTime, String shouldHandleEndTime) { - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -182,7 +179,7 @@ if (currentUser.getRoleTips().contains(sLeader)) { // 组长，查组内全部 leaderId = currentUser.getId(); - if (ToolUtil.isNotEmpty(jobStatus)) { + if (StrUtil.isNotEmpty(jobStatus)) { //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前) page.setOpenSort(!alarmJobService.checkJobStatus(jobStatus)); } @@ -210,9 +207,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -248,9 +245,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("createTime", false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = new ArrayList<>(); if (alarmJobService.checkPcRole(currentUser.getRoleTips())) { // pc角色 @@ -279,11 +276,12 @@ public void exportJob(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { - Page> page = new PageFactory>().defaultPage("createTime", false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + + page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); page.setSearchCount(false); - page.setOffset(0); + page.offset(); String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); @@ -293,12 +291,12 @@ String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); List> jobExpList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); new AlarmJobWarpper(jobExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(jobExpList)) { + if (CollectionUtil.isEmpty(jobExpList)) { fileInputStream = new FileInputStream(templatePath + "/jobRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath + "/jobRecTemplate.xlsx"); @@ -331,9 +329,9 @@ @ResponseBody public Object getJob(int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - if (alarmJobService.getJob(id, currentUser.getId())){ + if (alarmJobService.getJob(id, currentUser.getId())) { return ResponseData.success(); } else { return ResponseData.error("接单失败"); @@ -346,10 +344,10 @@ @RequestMapping(value = "/confirmJob") @ResponseBody public Object confirmJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "firstState", required = true) String firstState, - @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, - @RequestParam(value = "needHandle", required = true) String needHandle) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + @RequestParam(value = "firstState", required = true) String firstState, + @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, + @RequestParam(value = "needHandle", required = true) String needHandle) { + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.confirmJob(id, currentUser.getId(), firstState, firstStatePhotos, needHandle)) { return ResponseData.success(); } else { @@ -365,7 +363,7 @@ public Object transferJob(@RequestParam(value = "id", required = true) int id, @RequestParam(value = "transferPerson", required = true) String transferPerson) throws JSONException { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); String dbTime = iSysDictService.getDBtime(); JSONObject jsonObject = new JSONObject(); @@ -386,8 +384,8 @@ @RequestMapping(value = "/saveJob") @ResponseBody public Object saveJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { if (alarmJobService.saveJob(id, handleMessage, handlePhotos)) { return ResponseData.success(); @@ -402,10 +400,10 @@ @RequestMapping(value = "/overJob") @ResponseBody public Object overJob(@RequestParam(value = "id", required = true) int id, - @RequestParam(value = "handleMessage", required = true) String handleMessage, - @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { + @RequestParam(value = "handleMessage", required = true) String handleMessage, + @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.overJob(id, currentUser.getId(), handleMessage, handlePhotos)) { return ResponseData.success(); @@ -421,7 +419,7 @@ @RequestMapping(value = "/handleJob") @ResponseBody public Object handleJob(@RequestParam(value = "id", required = true) int id) { - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (alarmJobService.handleJob(id, currentUser.getId())) { return ResponseData.success(); } else { @@ -436,8 +434,8 @@ @ResponseBody public Object jobInfo(@RequestParam(value = "id", required = true) int id) { - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId()); new AlarmJobWarpper(retList).warp(); @@ -457,7 +455,7 @@ @RequestParam(value = "wellCode", required = true) String wellCode) { Map retMap = new HashMap<>(); try { - alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"),wellCode); + alarmJobService.updateSinkJob(id, URLDecoder.decode(msg, "UTF-8"), wellCode); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 353d8c5..5ec9ed1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -1,27 +1,24 @@ package com.casic.missiles.modular.alarm.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; import com.casic.missiles.modular.system.model.DeptPermission; -import com.casic.missiles.modular.system.service.IDeptPermissionService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import javax.annotation.Resource; import java.util.*; @@ -40,7 +37,7 @@ @Resource private AbstractPermissionContext permissionService; @Autowired - private IDeptPermissionService deptPermissionService; + private AbstractDeptService deptPermissionService; /** * 获取告警等级列表 @@ -49,15 +46,16 @@ @ResponseBody public Object levelList(Long tenantId){ List> levelList = new ArrayList<>(); - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id } + DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId()); - if(ToolUtil.isEmpty(deptPermission)){ + if(ObjectUtil.isEmpty(deptPermission)){ return levelList; } for(Object deviceType: JSON.parseObject(deptPermission.getDeviceType(), List.class)){ @@ -89,19 +87,19 @@ levelMap.put("deviceType",deviceType); levelMap.put("deviceTypeName",deviceTypeName); - if(ToolUtil.isEmpty(level.get("openAlarm"))){ + if(ObjectUtil.isEmpty(level.get("openAlarm"))){ levelMap.put("openAlarm",""); }else{ levelMap.put("openAlarm",level.get("openAlarm").toString()); } - if(ToolUtil.isEmpty(level.get("openJob"))){ + if(ObjectUtil.isEmpty(level.get("openJob"))){ levelMap.put("openJob",""); }else{ levelMap.put("openJob",level.get("openJob").toString()); } - if(ToolUtil.isEmpty(level.get("ts"))){ + if(ObjectUtil.isEmpty(level.get("ts"))){ levelMap.put("ts",""); }else{ levelMap.put("ts",level.get("ts").toString()); @@ -119,9 +117,9 @@ @RequestMapping("/levelByType") @ResponseBody public Object levelByType(Long tenantId, String name){ - ShiroUser currUser = permissionService.getCurrLoginUser(); - if(ToolUtil.isEmpty(tenantId)){ - if(ToolUtil.isEmpty(currUser.getTenantId())){ + AuthUser currUser = permissionService.getAuthService().getLoginUser(); + if(ObjectUtil.isEmpty(tenantId)){ + if(StrUtil.isEmpty(currUser.getTenantId())){ return ResponseData.error("无关联的项目id"); } tenantId = Long.valueOf(currUser.getTenantId()); //当前用户所属组织机构关联的项目id @@ -134,16 +132,16 @@ @ResponseBody @Transactional(rollbackFor = Exception.class) public Object configLevel(@RequestBody List levelList){ - ShiroUser currUser = permissionService.getCurrLoginUser(); + AuthUser currUser = permissionService.getAuthService().getLoginUser(); String userTenantId = currUser.getTenantId(); //当前用户所属组织机构关联的项目id Date currDate = new Date(); for(AlarmLevel alarmLevel:levelList){ - if(ToolUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ + if(ObjectUtil.isAllEmpty(alarmLevel.getTenantId(),userTenantId)){ return ResponseData.error("无关联的项目id"); } - Long tenantId = ToolUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); + Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId(); AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId,alarmLevel.getName(),alarmLevel.getLevel()); - if(ToolUtil.isEmpty(oldAlarmLevel)){ + if(ObjectUtil.isEmpty(oldAlarmLevel)){ //insert alarmLevel.setTenantId(tenantId); alarmLevel.setTs(currDate); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 75c6f9d..67e4b49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -1,17 +1,15 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; -import org.json.JSONException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -19,14 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.collection.CollectionUtil; -import org.hswebframework.expands.office.excel.ExcelIO; - +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ @Autowired private IAlarmRecordsService alarmRecordsService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -69,9 +66,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + Page> page = PageFactory.defaultPage(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; @@ -96,14 +93,14 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - Page> page = new PageFactory>().defaultPage("alarmTime",false); - page.setLimit(maxRowsExcel); + Page> page = PageFactory.defaultPage(); + page.setMaxLimit((long)maxRowsExcel); page.setSize(maxRowsExcel); - page.setOffset(0); + page.offset(); page.setSearchCount(false); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } @@ -111,7 +108,7 @@ new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; - if (ToolUtil.isEmpty(alarmExpList)) { + if (CollectionUtil.isEmpty(alarmExpList)) { fileInputStream = new FileInputStream(templatePath+"/alarmRecEmpty.xlsx"); } else { fileInputStream = new FileInputStream(templatePath+"/alarmRecTemplate.xlsx"); @@ -148,7 +145,7 @@ @RequestParam(value = "jobStatus",required = true) String jobStatus, @RequestParam(value = "handleMessage",required = true)String handleMessage){ Map retMap = new HashMap<>(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); boolean isCancel = alarmRecordsService.cancelAlarm(id,jobStatus,handleMessage,currentUser.getId()); if(isCancel){ return ResponseData.success(); @@ -173,8 +170,8 @@ Map retMap = new HashMap<>(); //根据查询条件查询alarm_record记录 - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); - ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime); //根据jobId调用closeJob for (AlarmRecords alarmRecord : alarmRecords) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index ed65abe..7a645dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -7,18 +7,17 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import com.casic.missiles.modular.system.dto.AlarmRuleDTO; -import com.casic.missiles.modular.system.model.AlarmRule; -import com.casic.missiles.modular.system.service.IDeviceRuleService; import com.casic.missiles.modular.system.warpper.AlarmRuleWarpper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -39,8 +38,8 @@ @Autowired private IAlarmRuleService alarmRuleService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Autowired private IDeviceRuleService iDeviceRuleService; @@ -55,9 +54,9 @@ public Map list(String keywords, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)) + if (StrUtil.isEmpty(deviceType)) deviceType = ""; - Page> page = new PageFactory>().defaultPage(); + Page> page = PageFactory.defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; bSessionValid = super.getSession().getAttribute("sessionFlag") == null ? false : (boolean) super.getSession().getAttribute("sessionFlag"); @@ -67,7 +66,7 @@ return retMap; } List> retList = new ArrayList<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); new AlarmRuleWarpper(retList).warp(); page.setRecords(retList); @@ -81,7 +80,7 @@ @ResponseBody public Map updateRule(@RequestParam(value = "id", required = true) int id, HttpServletRequest httpServletRequest) { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope if (super.getSession().getAttribute("sessionFlag") == null) { retMap.put("code", 505); retMap.put("message", "sessionExpired"); @@ -91,9 +90,9 @@ String sLow = httpServletRequest.getParameter("lowValue"); float highValue = 99999; float lowValue = -99999; - if (ToolUtil.isNotEmpty(sHigh)) + if (StrUtil.isNotEmpty(sHigh)) highValue = Float.parseFloat(sHigh); - if (ToolUtil.isNotEmpty(sLow)) + if (StrUtil.isNotEmpty(sLow)) lowValue = Float.parseFloat(sLow); if (alarmRuleService.updateRule(id, highValue, lowValue)) { @@ -152,7 +151,7 @@ public Map getNoAlarmDevice() { Map retMap = new HashMap<>(); - DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();//datascope List alarmRuleList= alarmRuleService.getNoAlarmDevice(dataScope); retMap.put("code", 200); retMap.put("message", "success"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java index 4c1ee9e..a8bdef7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.alarm.controller; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.core.base.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.StrUtil; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; @@ -30,8 +31,8 @@ @Autowired private ISysDictService sysDictService; - @Autowired - private ICommonPermissionService iCommonPermissionService; + @Resource + private AbstractPermissionContext iCommonPermissionService; @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @@ -51,7 +52,7 @@ @ResponseBody public Map listContentType(@RequestParam(value = "alarmType" ,required = true) String alarmType, HttpServletRequest httpServletRequest) { String deviceType = httpServletRequest.getParameter("deviceType"); - if (ToolUtil.isEmpty(deviceType)){ + if (StrUtil.isEmpty(deviceType)){ deviceType=""; } Map retMap = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java index 0ab3a1c..ba9f439 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/HandleAlarmJob.java @@ -1,8 +1,6 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.dto.UserClientView; import com.casic.missiles.modular.system.model.AlarmJob; @@ -11,13 +9,13 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @@ -73,7 +71,7 @@ // APP推送 推给井盖所属权属单位 List clientIds = new ArrayList<>(); for(UserClientView userClientView:userClientViewList){ - if(ToolUtil.isNotEmpty(userClientView.getClientid())){ + if(StrUtil.isNotEmpty(userClientView.getClientid())){ clientIds.add(userClientView.getClientid()); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java index dfa5574..46eeda9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/job/getDelayJob.java @@ -1,8 +1,5 @@ package com.casic.missiles.modular.alarm.job; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.core.common.service.ICommonUserService; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.modular.system.model.AlarmJob; import com.casic.missiles.modular.system.model.User; @@ -12,17 +9,16 @@ import com.gexin.rp.sdk.base.IPushResult; import com.google.gson.GsonBuilder; import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import cn.hutool.core.util.StrUtil; import java.text.SimpleDateFormat; import java.util.*; @Component -public class getDelayJob implements Job{ +public class getDelayJob implements Job { private static final Logger logger = LoggerFactory.getLogger(getDelayJob.class); @@ -67,7 +63,7 @@ // 超时未处理 alarmJob.setJobFlagDelay("2"); // 延时标签 String jobFlag = alarmJob.getJobFlag1(); // 延时记录 - if(ToolUtil.isNotEmpty(jobFlag)){ + if(StrUtil.isNotEmpty(jobFlag)){ jobFlag += ",2"; }else{ jobFlag = "2"; @@ -78,7 +74,7 @@ Long jobBelongTo = alarmJob.getJobBelongTo(); // 只给责任人推送 String clientId = iAlarmJobService.selectClientIdByUser(jobBelongTo); List clientIds = new ArrayList<>(); - if(ToolUtil.isNotEmpty(clientId)){ + if(StrUtil.isNotEmpty(clientId)){ clientIds.add(clientId); IPushResult pushResult = PushList.pushToUser(clientIds,"工单提醒","您有一条工单超时未处理"); if("ok".equals(pushResult.getResponse().get("result").toString())){ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 351e2d2..d9ca2a1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -1,16 +1,14 @@ package com.casic.missiles.modular.alarm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.common.service.ICommonUserService; import com.casic.missiles.modular.alarm.job.HandleAlarmJob; import com.casic.missiles.modular.alarm.job.getDelayJob; import com.casic.missiles.modular.alarm.service.IAlarmJobService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmJobMapper; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import com.casic.missiles.modular.system.dto.SelectDto; @@ -23,8 +21,6 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import com.gexin.rp.sdk.base.IPushResult; -import com.google.gson.GsonBuilder; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +31,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; /** *

@@ -63,7 +61,7 @@ // @Resource // private ICommonPermissionService permissionService; @Resource - private ICommonUserService iCommonUserService; + private AbstractPermissionContext iCommonUserService; @Resource private WebSocket webSocket; @@ -128,7 +126,7 @@ } private String converAlarmContent(String alarmContent){ - if(ToolUtil.isEmpty(alarmContent)){ + if(StrUtil.isEmpty(alarmContent)){ return alarmContent; }else { return EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); @@ -288,10 +286,10 @@ EntityWrapper busWellInfoEntityWrapper = new EntityWrapper<>(); busWellInfoEntityWrapper.eq("WELL_CODE",wellCode); BusWellInfo busWellInfo = busWellInfoService.selectOne(busWellInfoEntityWrapper); - if(busWellInfo!=null&&ToolUtil.isNotEmpty(busWellInfo.getDeptid())){ + if(busWellInfo!=null&&StrUtil.isNotEmpty(busWellInfo.getDeptid())){ List roleids= new ArrayList<>(); for(SelectDto selectDto:selectDtoList){ - if(ToolUtil.isNotEmpty(selectDto.getName()) + if(StrUtil.isNotEmpty(selectDto.getName()) && Arrays.asList(selectDto.getName().split(",")).contains(busWellInfo.getDeptid())){ roleids.add(selectDto.getId()); } @@ -311,7 +309,7 @@ AlarmJob alarmJob = this.baseMapper.selectById(id); sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端 } - if(StringUtils.isNotBlank(msg)){ + if(StrUtil.isNotBlank(msg)){ sendAlarm(msg, userClientViewList);//推送告警至app和pc端 } @@ -322,10 +320,10 @@ List clientIds = new ArrayList<>(); List userIds = new ArrayList<>(); for (UserClientView userClientView : userClientViewList) { - if (ToolUtil.isNotEmpty(userClientView.getClientid())) { + if (StrUtil.isNotEmpty(userClientView.getClientid())) { clientIds.add(userClientView.getClientid()); } - if (ToolUtil.isNotEmpty(userClientView.getId())) { + if (StrUtil.isNotEmpty(userClientView.getId())) { userIds.add(userClientView.getId()); } } @@ -351,7 +349,7 @@ Map map = new HashMap(); map.put("message", msg); map.put("type", "alarm"); - webSocket.sendListMessage(userIds, new GsonBuilder().create().toJson(map)); + webSocket.sendListMessage(userIds, JSON.toJSONString(map)); } else { logger.info("告警消息找不到责任人，pc端未推送:" + msg); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 0440c0d..2f9b8d1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -6,11 +6,11 @@ import com.casic.missiles.modular.system.model.AlarmRecords; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmRecordsMapper; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ @Override public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); @@ -41,7 +41,7 @@ @Override public List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) { String sContent = null; - if (ToolUtil.isNotEmpty(alarmContent)){ + if (ObjectUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 69850b4..134a817 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -3,10 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.SuccessResponseData; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; @@ -18,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - +import cn.hutool.core.util.ObjectUtil; /** * 地图总览模块的controller * @@ -67,10 +65,9 @@ @RequestMapping(value = "/alarmsByWell", method = RequestMethod.GET) @ResponseBody public Object alarmsByWell(@RequestParam(required = true) Long id) { - if(ToolUtil.isEmpty(id)){ + if(ObjectUtil.isEmpty(id)){ throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - SuccessResponseData successResult = new SuccessResponseData(); // 查询闸井信息 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index c8cb8eb..5ea0e69 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index cd850b4..a73a8d8 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -234,7 +234,7 @@ bwi.RESPONSIBLE_DEPT AS deptid - SELECT FROM alarm_job aj diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 7911401..263839d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 8434c3c..760fdf6 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -2,16 +2,16 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; -import com.casic.missiles.modular.system.dao.SysDictMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import cn.hutool.core.util.ObjectUtil; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -21,8 +21,6 @@ @Autowired private StatisticMapper statisticMapper; @Autowired - private SysDictMapper sysDictMapper; - @Autowired private AlarmNowViewMapper alarmNowViewMapper; @Resource private AbstractPermissionContext permissionService; @@ -84,7 +82,7 @@ continue; } Dept dept = permissionService.getDeptById(deptId); - if( ToolUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 + if( ObjectUtil.isEmpty(dept) || "04".equals(dept.getDeptType())){ // 小组不统计 continue; } Map map = new HashMap<>(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java index cbd8e59..81ed390 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.util; import com.casic.missiles.config.PushProperties; -import com.casic.missiles.core.util.SpringContextHolder; import com.gexin.rp.sdk.base.IPushResult; import com.gexin.rp.sdk.base.impl.ListMessage; import com.gexin.rp.sdk.base.impl.Target; @@ -10,7 +9,6 @@ import com.gexin.rp.sdk.template.NotificationTemplate; import com.gexin.rp.sdk.template.style.Style0; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java index d24d7a2..431e0bd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java @@ -2,11 +2,11 @@ import com.alibaba.fastjson.JSONArray; import com.casic.missiles.core.util.EhcacheConstant; -import com.casic.missiles.core.base.warpper.BaseControllerWarpper; -import com.casic.missiles.core.util.ToolUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjectUtil; + import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,11 +37,11 @@ Map wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode); // 设置权属单位、负责人、联系电话 String deptidStr = wellInfoMap.get("deptid").toString(); - long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); + long deptid = StrUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr); map.put("deptName",EhcacheConstant.retBean().getDeptNameById(deptid)); if(deptid>0){ Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid); - if(ToolUtil.isEmpty(staffstr)){ + if(ObjectUtil.isEmpty(staffstr)){ wellInfoMap.replace("staff",""); wellInfoMap.replace("tel",""); }else { @@ -60,7 +60,7 @@ map.put("alarmContent",EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr)); // 告警值加单位 - if(ToolUtil.isNotEmpty(map.get("alarmValue"))){ + if(ObjectUtil.isNotEmpty(map.get("alarmValue"))){ String alarmValue = map.get("alarmValue").toString(); String alarmContentName = map.get("alarmContentName").toString(); if("液位超限".equals(alarmContentName)) {