From b5f7a5fede2ba469f3bbff1443083e21c67c7bb5 Mon Sep 17 00:00:00 2001 From: shanao Date: Fri, 27 Sep 2024 18:07:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=86=E4=BA=8B=E6=95=85=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=A6=BB=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accident/AccidentRecordsController.java | 17 ++-- .../entity/accident/AccidentRecords.java | 45 +++++++++++ .../impl/AccidentRecordsServiceImpl.java | 11 +-- .../accident/AccidentRecordsMapper.xml | 79 ++++++++++++------- 4 files changed, 109 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java index f46e4dab..eb60f044 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java @@ -1,6 +1,5 @@ package com.zcloud.controller.accident; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zcloud.controller.base.BaseController; @@ -39,7 +38,11 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping(value = "/page") public Map queryPage(Page page, HttpServletRequest request) { - page.setPd(new PageData(request)); + PageData data = new PageData(request); + if (ObjectUtil.isEmpty(data.get("type"))) { + throw new RuntimeException("type不能为空"); + } + page.setPd(data); Map result = new HashMap<>(); result.put("result", "success"); result.put("varList", accidentRecordsService.queryPage(page)); @@ -71,8 +74,7 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping("/save") public Map save(HttpServletRequest request) { - AccidentRecords accidentRecords = BeanUtil.mapToBean(new PageData(request), AccidentRecords.class, true); - accidentRecordsService.save(accidentRecords); + accidentRecordsService.save(new AccidentRecords(new PageData(request))); Map result = new HashMap<>(); result.put("result", "success"); return result; @@ -87,9 +89,10 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping("/update") public Map update(HttpServletRequest request) { - PageData pageData = new PageData(request); - AccidentRecords accidentRecords = BeanUtil.mapToBean(pageData, AccidentRecords.class, true); - accidentRecords.setId(Optional.of(accidentRecords.getId()).orElseThrow(() -> new RuntimeException("id不能为空"))); + AccidentRecords accidentRecords = new AccidentRecords(new PageData(request)); + if (StrUtil.isEmpty(accidentRecords.getId())) { + throw new RuntimeException("id不能为空"); + } accidentRecordsService.update(accidentRecords); Map result = new HashMap<>(); result.put("result", "success"); diff --git a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java index f44e8ca1..3fc74355 100644 --- a/src/main/java/com/zcloud/entity/accident/AccidentRecords.java +++ b/src/main/java/com/zcloud/entity/accident/AccidentRecords.java @@ -1,5 +1,9 @@ package com.zcloud.entity.accident; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.zcloud.entity.PageData; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,6 +39,11 @@ public class AccidentRecords implements Serializable { @Size(max = 100, message = "事故名称最大长度要小于 100") private String incidentName; + /** + * 1事件/2事故 + */ + private String type; + /** * 事故类型 */ @@ -106,6 +115,11 @@ public class AccidentRecords implements Serializable { */ private String photos; + /** + * 附件地址 + */ + private String attachmentAddress; + /** * 原因分析及责任认定 */ @@ -162,6 +176,37 @@ public class AccidentRecords implements Serializable { private static final long serialVersionUID = 1L; + public AccidentRecords(PageData data) { + setIncidentNumber(data.getString("incidentNumber")); + setId(data.getString("id")); + setIncidentName(data.getString("incidentName")); + setIncidentType(data.getString("incidentType")); + setIncidentLevel(data.getString("incidentLevel")); + setLocation(data.getString("location")); + setFatalities(toInt(data.get("fatalities"))); + DateTime time = DateUtil.parse(data.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + setIncidentDate(time); + DateTime time1 = DateUtil.parse(data.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + setReportDate(time1); + setDirectLoss(toInt(data.get("directLoss"))); + setInjured(toInt(data.get("injured"))); + setSeriouslyInjured(toInt(data.get("seriouslyInjured"))); + setCause(data.getString("cause")); + setSummary(data.getString("summary")); + setAnalysis(data.getString("analysis")); + setAttachmentAddress(data.getString("attachmentAddress")); + setType(data.getString("type")); + setSuggestions(data.getString("suggestions")); + setMeasures(data.getString("measures")); + setCreator(data.getString("creator")); + setPhotos(data.getString("photos")); + } + + private Integer toInt(Object object) { + Integer i = Convert.toInt(object); + return i == null ? 0 : i; + } + // public AccidentRecords(AccidentRecordsExcel reader, DictionariesService service) throws Exception { // this.id = IdUtil.getSnowflake(1, 1).nextId(); // this.corpinfoId = reader.getCompanyName(); diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index f3777606..91b10f12 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.lang.reflect.Field; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -61,16 +60,10 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { public void save(AccidentRecords accidentRecords) { accidentRecords.setId(IdUtil.fastSimpleUUID()); accidentRecords.setCreatedBy(Jurisdiction.getUsername()); - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN); - // 设置成东八区时间 - dateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - - DateUtil.parse(dateFormat.format(date), DatePattern.NORM_DATETIME_PATTERN); - accidentRecords.setIsDeleted(0); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); + accidentRecords.setCreatedTime(new Date()); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @@ -79,6 +72,8 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { public void update(AccidentRecords accidentRecords) { accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); + // 不支持修改类型 + accidentRecords.setType(null); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); Assert.isTrue(accidentRecordsMapper.updateById(accidentRecords) == 1, "更新事故记录失败"); diff --git a/src/main/resources/mybatis/datasource/accident/AccidentRecordsMapper.xml b/src/main/resources/mybatis/datasource/accident/AccidentRecordsMapper.xml index fcfd5164..c1d452d0 100644 --- a/src/main/resources/mybatis/datasource/accident/AccidentRecordsMapper.xml +++ b/src/main/resources/mybatis/datasource/accident/AccidentRecordsMapper.xml @@ -3,7 +3,8 @@ From bd1690cea55c585d36ed27ae9b831a8dc0c9b616 Mon Sep 17 00:00:00 2001 From: shanao Date: Mon, 30 Sep 2024 14:46:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B1=BB=E5=9E=8B=E7=AD=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatisticsDataController.java | 429 +++++++++++++++--- 1 file changed, 357 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/zcloud/controller/statisticsdata/StatisticsDataController.java b/src/main/java/com/zcloud/controller/statisticsdata/StatisticsDataController.java index 5d046d49..6647e3c9 100644 --- a/src/main/java/com/zcloud/controller/statisticsdata/StatisticsDataController.java +++ b/src/main/java/com/zcloud/controller/statisticsdata/StatisticsDataController.java @@ -92,16 +92,16 @@ public class StatisticsDataController extends BaseController { Map corp = new HashMap<>(); //部门 List userCount = usersService.statisticsByCorp(pd); - corp.put("USERCOUNT", userCount.get(0).get("COUNT")); //人员总数 - corp.put("USERCHECKCOUNT", userCount.get(1).get("COUNT")); //人员总数 + corp.put("USERCOUNT", userCount.get(0).get("COUNT")); //人员总数 + corp.put("USERCHECKCOUNT", userCount.get(1).get("COUNT")); //人员总数 //部门 - List deptCount = departmentService.statisticsByCorp(pd); - corp.put("DEPTCOUNT", deptCount.get(0).get("COUNT")); //人员总数 - corp.put("DEPTCHECKCOUNT", deptCount.get(1).get("COUNT")); //人员总数 + List deptCount = departmentService.statisticsByCorp(pd); + corp.put("DEPTCOUNT", deptCount.get(0).get("COUNT")); //人员总数 + corp.put("DEPTCHECKCOUNT", deptCount.get(1).get("COUNT")); //人员总数 //清单 - List listCount = listmanagerService.statisticsByCorp(pd); //列出ListManager列表 - corp.put("LISTCOUNT", listCount.get(0).get("COUNT")); //人员总数 - corp.put("LISTCHECKCOUNT", listCount.get(1).get("COUNT")); //人员总数 + List listCount = listmanagerService.statisticsByCorp(pd); //列出ListManager列表 + corp.put("LISTCOUNT", listCount.get(0).get("COUNT")); //人员总数 + corp.put("LISTCHECKCOUNT", listCount.get(1).get("COUNT")); //人员总数 map.put("corp", corp); map.put("result", errInfo); @@ -120,7 +120,7 @@ public class StatisticsDataController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - pd.put("CORPINFO_ID",CORPINFO_ID); + pd.put("CORPINFO_ID", CORPINFO_ID); //清单类型占比统计 List chartData = listmanagerService.statisticsGroupType(pd); @@ -151,9 +151,9 @@ public class StatisticsDataController extends BaseController { for (int i = 0; i < legendData.size(); i++) { PageData pd = new PageData(); pd.put("CORPINFO_ID", CORPINFO_ID); - pd.put("STATENAME",legendData.get(i)); + pd.put("STATENAME", legendData.get(i)); List data = new ArrayList(); - List hdRecChart = hiddenService.statisticsGroupMonthByState(pd); //根据状态按时间分组统计隐患数据 + List hdRecChart = hiddenService.statisticsGroupMonthByState(pd); //根据状态按时间分组统计隐患数据 for (int j = 0; j < halfYearMonth.size(); j++) { boolean flag = true; for (int k = 0; k < hdRecChart.size(); k++) { @@ -191,18 +191,18 @@ public class StatisticsDataController extends BaseController { PageData pd = this.getPageData(); pd.put("CORPINFO_ID", CORPINFO_ID); Map chartData = new HashMap(); - List deptList = riskpointService.listDeptByPoint(pd); + List deptList = riskpointService.listDeptByPoint(pd); List yAxisData = new ArrayList(); - for(PageData d :deptList){ + for (PageData d : deptList) { PageData pdf = new PageData(); yAxisData.add(d.getString("DEPT_NAME")); } chartData.put("yAxisData", yAxisData); - List varList = dictionariesService.listSubDictByParentId("5a81e63ec0e94d919b3138bc01dbef6b"); + List varList = dictionariesService.listSubDictByParentId("5a81e63ec0e94d919b3138bc01dbef6b"); List legendData = new ArrayList(); List seriesData = new ArrayList(); - for(Dictionaries d :varList){ + for (Dictionaries d : varList) { PageData pdf = new PageData(); legendData.add(d.getNAME()); seriesData.add(new ArrayList()); @@ -211,8 +211,8 @@ public class StatisticsDataController extends BaseController { //隐患整改趋势（近半年） for (int i = 0; i < deptList.size(); i++) { PageData dept = new PageData(); - dept.put("DEPARTMENT_ID",deptList.get(i).getString("DEPARTMENT_ID")); - List dataChart = riskpointService.statisticsGroupLevelByDept(dept); //按照级别分类统计各部门风险管控数据 + dept.put("DEPARTMENT_ID", deptList.get(i).getString("DEPARTMENT_ID")); + List dataChart = riskpointService.statisticsGroupLevelByDept(dept); //按照级别分类统计各部门风险管控数据 for (int j = 0; j < varList.size(); j++) { List secondList = (List) seriesData.get(j); secondList.add(i, dataChart.get(j).getString("COUNT")); @@ -294,7 +294,7 @@ public class StatisticsDataController extends BaseController { List seriesData2 = new ArrayList(); List seriesData3 = new ArrayList(); - List disposalChart = majordangersourceDisposalService.statisticsGroupMajordangersource(pd); //根据重大危险源分组统计报警处置情况 + List disposalChart = majordangersourceDisposalService.statisticsGroupMajordangersource(pd); //根据重大危险源分组统计报警处置情况 List seriesData = new ArrayList(); for (PageData data : disposalChart) { xAxisData.add(data.getString("MAJORDANGERSOURCE_NAME")); @@ -330,7 +330,7 @@ public class StatisticsDataController extends BaseController { Map chartData = new HashMap(); List legendData = Arrays.asList(new String[]{"动火作业", "临时用电作业", "盲板作业", "高处作业", "有限空间作业", "吊装作业"}); - List workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 + List workChart = highworkService.statisticsAllHighRiskWork(pd); //统计高危作业里各作业数 List seriesData = new ArrayList(); for (int i = 0; i < legendData.size(); i++) { PageData pie = new PageData(); @@ -345,27 +345,29 @@ public class StatisticsDataController extends BaseController { return map; } - /**数据可视化平台首页获取 + /** + * 数据可视化平台首页获取 * 1.获取企业的置顶视频 * 2.获取管理的置顶视频 * 3.没有视频或者没有置顶视频 + * * @param * @throws Exception */ - @RequestMapping(value="/getObjectForBiLogin") + @RequestMapping(value = "/getObjectForBiLogin") @ResponseBody - public Object getObjectForBiLogin() throws Exception{ - Map map = new HashMap(); + public Object getObjectForBiLogin() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd.put("TYPE", "1"); pd.put("CORPINFO_TYPE", "1"); pd.put("CORPINFO_ID", CORPINFO_ID); - List cpvarList = videoService.listAll(pd); //企业视频 + List cpvarList = videoService.listAll(pd); //企业视频 pd = new PageData(); pd.put("CORPINFO_TYPE", "2"); pd.put("TYPE", "1"); - List ptVarList = videoService.listAll(pd); //平台视频 + List ptVarList = videoService.listAll(pd); //平台视频 map.put("ptVarList", ptVarList); map.put("cpvarList", cpvarList); @@ -373,17 +375,19 @@ public class StatisticsDataController extends BaseController { return map; } - /**获取重大危险源数据 + /** + * 获取重大危险源数据 + * * @param * @throws Exception */ - @RequestMapping(value="/findValidateData") + @RequestMapping(value = "/findValidateData") @ResponseBody - public Object findValidateData() throws Exception{ - Map map = new HashMap(); + public Object findValidateData() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - List varList = majordangersourcedisposalService.listAll(pd); //根据ID读取 + List varList = majordangersourcedisposalService.listAll(pd); //根据ID读取 map.put("varList", varList); map.put("result", errInfo); return map; @@ -654,17 +658,19 @@ public class StatisticsDataController extends BaseController { return lastDayOfMonth; } - /**首页 获取折线图 + /** + * 首页 获取折线图 + * * @param * @throws Exception */ - @RequestMapping(value="/listmanagerIndexCount") + @RequestMapping(value = "/listmanagerIndexCount") @ResponseBody - public Object listmanagerIndexCount() throws Exception{ - Map map = new HashMap(); + public Object listmanagerIndexCount() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", CORPINFO_ID); //企业 + pd.put("CORPINFO_ID", CORPINFO_ID); //企业 List valList = listmanagerService.goIndexCount(pd); List valList1 = new ArrayList(); @@ -672,30 +678,30 @@ public class StatisticsDataController extends BaseController { // {months: "2022-06", count: 0, screenType: "riskChecklistType0001"} // 6 * 3 近6個月 ，3 三种类型 - Map monSCrMap = new HashMap<>(); - for (PageData pageData : valList){ - String key = pageData.getString("months")+"*"+pageData.getString("screenType"); - monSCrMap.put(key,pageData.getString("count")); + Map monSCrMap = new HashMap<>(); + for (PageData pageData : valList) { + String key = pageData.getString("months") + "*" + pageData.getString("screenType"); + monSCrMap.put(key, pageData.getString("count")); } List halfYearMonth = DateUtil.getHalfYearMonth(true); - String [] typeAll = new String[]{"riskChecklistType0001","riskChecklistType0002","zhqd03"}; + String[] typeAll = new String[]{"riskChecklistType0001", "riskChecklistType0002", "zhqd03"}; - List> list = new ArrayList<>(); // 整理完成的数据 size 6 * 3 - for(String month : halfYearMonth){ - for (String type : typeAll){ + List> list = new ArrayList<>(); // 整理完成的数据 size 6 * 3 + for (String month : halfYearMonth) { + for (String type : typeAll) { String count = "0"; - String key = month +"*" + type; - if (monSCrMap.containsKey(key)){ + String key = month + "*" + type; + if (monSCrMap.containsKey(key)) { count = monSCrMap.get(key); } - Map monAndType = new HashMap<>(); - monAndType.put("months",month); - monAndType.put("screenType",type); - monAndType.put("count",count); + Map monAndType = new HashMap<>(); + monAndType.put("months", month); + monAndType.put("screenType", type); + monAndType.put("count", count); list.add(monAndType); } } @@ -867,20 +873,22 @@ public class StatisticsDataController extends BaseController { return map; } - /**平台公告 + /** + * 平台公告 + * * @param page * @throws Exception */ - @RequestMapping(value="/listByIndex") + @RequestMapping(value = "/listByIndex") @ResponseBody - public Object listByIndex(Page page) throws Exception{ - Map map = new HashMap(); + public Object listByIndex(Page page) throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); //获取发布给这个企业的信息 pd.put("CORP_INFO_ID", CORPINFO_ID); page.setPd(pd); - List varList = noticeService.getNotAndCorpByCorpId(page); + List varList = noticeService.getNotAndCorpByCorpId(page); map.put("varList", varList); map.put("page", page); @@ -888,21 +896,23 @@ public class StatisticsDataController extends BaseController { return map; } - /**企业公告 + /** + * 企业公告 + * * @param page * @throws Exception */ - @RequestMapping(value="/enterpriseListByIndex") + @RequestMapping(value = "/enterpriseListByIndex") @ResponseBody - public Object enterpriseListByIndex(Page page) throws Exception{ - Map map = new HashMap(); + public Object enterpriseListByIndex(Page page) throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); pd.put("USER_ID", USER_ID); page.setPd(pd); - List varList = noticecorpService.listByIndex(page); //列出NOTICECORP列表 + List varList = noticecorpService.listByIndex(page); //列出NOTICECORP列表 map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -910,35 +920,37 @@ public class StatisticsDataController extends BaseController { } - /**清單列表 + /** + * 清單列表 + * * @param * @throws Exception */ - @RequestMapping(value="/checkListIndex") + @RequestMapping(value = "/checkListIndex") @ResponseBody - public Object checkListIndex() throws Exception{ - Map map = new HashMap(); + public Object checkListIndex() throws Exception { + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID", CORPINFO_ID); //企业 - pd.put("USER_ID",USER_ID); + pd.put("CORPINFO_ID", CORPINFO_ID); //企业 + pd.put("USER_ID", USER_ID); pd.put("DEPARTMENT_ID", DEPT_ID); - pd.put("USER_ID",""); - List varList = listmanagerService.listAll(pd); //列出ListManager列表 + pd.put("USER_ID", ""); + List varList = listmanagerService.listAll(pd); //列出ListManager列表 int wjcNum = 0; int yjcNum = 0; for (PageData list : varList) { - if(list.getString("TYPE").equals("listType0005")) { - if(Integer.parseInt(list.get("checkCount").toString()) > 0) { + if (list.getString("TYPE").equals("listType0005")) { + if (Integer.parseInt(list.get("checkCount").toString()) > 0) { yjcNum++; } else { wjcNum++; } continue; } - if(Integer.parseInt(list.get("checkCount").toString()) > 0) { + if (Integer.parseInt(list.get("checkCount").toString()) > 0) { yjcNum++; } else { wjcNum++; @@ -951,5 +963,278 @@ public class StatisticsDataController extends BaseController { return map; } + /** + *

隐患处理

+ * + *

+ * 数据可视化/任务处理情况/隐患处理 + *

+ * + * @Data 2024年9月30日 + */ + @RequestMapping(value = "/getBICount") + @ResponseBody + public Object getBICount() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", CORPINFO_ID); + // 旬 + if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { + // 1-10 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 10-20 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 20-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } + } + // 季度 + if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) { + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + } + List varList = hiddenService.getBICount(pd); + if (varList != null && !varList.isEmpty()) { + map.put("total", varList.size()); + int checked = 0; + int uncheck = 0; + for (PageData hidden : varList) { + if (hidden.get("STATE").toString().equals("4") || hidden.get("STATE").toString().equals("15") || hidden.get("STATE").toString().equals("5") || hidden.get("STATE").toString().equals("6")) { + checked++; + } else { + uncheck++; + } + + } + map.put("checked", checked); + map.put("uncheck", uncheck); + } else { + map.put("total", 0); + map.put("checked", 0); + map.put("uncheck", 0); + } + + map.put("result", errInfo); + return map; + } + + /** + *

日常检查

+ * + *

数据可视化/任务处理情况/日常检查

+ */ + @RequestMapping(value = "/goBiListCount") + @ResponseBody + public Object goBiListCount() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", CORPINFO_ID); // 企业 + + switch (pd.get("COUNTTYPE").toString()) { + case "day":// 每日 + pd.put("STARTTIME", DateUtil.getDay() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getDay() + " 23:59:59"); + break; + + case "week":// 每周 + pd.put("STARTTIME", DateUtil.getWeekStart()); + pd.put("ENDTIME", DateUtil.getWeekEnd()); + break; + + case "xun":// 每旬 + String year = DateUtil.getYear(); + String month = DateUtil.getMonth(); + Integer day = Integer.parseInt(DateUtil.getOnlyDay()); + String startTime = year + "-" + month + "-"; + String endTime = year + "-" + month + "-"; + if (day <= 10) { + startTime = startTime + "01 00:00:00"; + endTime = endTime + "10 23:59:59"; + } else if (day > 10 && day <= 20) { + startTime = startTime + "11 00:00:00"; + endTime = endTime + "20 23:59:59"; + } else { + startTime = startTime + "21 00:00:00"; + endTime = DateUtil.getMonthEndDay() + " 23:59:59"; + } + pd.put("STARTTIME", startTime); + pd.put("ENDTIME", endTime); + break; + + case "month":// 每月 + pd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + break; + + case "quarter":// 每季 + pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59"); + break; + + case "year":// 每年 + pd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00"); + pd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59"); + break; + + case "halfyear":// 半年 + String byear = DateUtil.getYear(); + Integer bmonth = Integer.parseInt(DateUtil.getMonth()); + if (bmonth <= 6) { + pd.put("STARTTIME", byear + "-01-01 00:00:00"); + pd.put("ENDTIME", byear + "-06-30 23:59:59"); + } else if (bmonth > 6) { + pd.put("STARTTIME", byear + "-07-01 00:00:00"); + pd.put("ENDTIME", byear + "-12-31 23:59:59"); + } + break; + + default: + break; + } + + String STARTTIME = pd.getString("STARTTIME"); + String ENDTIME = pd.getString("ENDTIME"); + + PageData all = new PageData(); + all.put("type", "all"); + all.put("name", "合计"); + all.put("molecule", 0); + all.put("denominator", 0); + all.put("percentage", 0d); + + List countList = listStatisticsService.getCountList(pd);// 统计分母 + + if (countList != null && !countList.isEmpty()) { + int sum = 0; + List dayList = checkrecordService.listCountDay(pd); // 统计--日 + if (dayList != null && !dayList.isEmpty()) { + for (PageData count : dayList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List weekList = checkrecordService.listCountWeek(pd); // 统计--周 + if (weekList != null && !weekList.isEmpty()) { + for (PageData count : weekList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List monthList = checkrecordService.listCountMonth(pd); // 统计--月 + + if (monthList != null && !monthList.isEmpty()) { + for (PageData count : monthList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List quarterList = checkrecordService.listCountQuarter(pd); // 统计--季 + + if (quarterList != null && !quarterList.isEmpty()) { + for (PageData count : quarterList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年 + + if (halfYearList != null && !halfYearList.isEmpty()) { + for (PageData count : halfYearList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + List yearList = checkrecordService.listCountYear(pd); // 统计--年 + if (yearList != null && !yearList.isEmpty()) { + for (PageData count : yearList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + // 处理旬时间 + StringBuilder stt = new StringBuilder(); + stt.append(pd.getString("STARTTIME")); + stt.setCharAt(9, '1'); + pd.put("STARTTIME", stt.toString()); + + String endDay = ENDTIME.substring(8, 10); + Integer endTime = Integer.parseInt(endDay); + StringBuffer et = new StringBuffer(); + et.append(pd.getString("ENDTIME")); + + if (endTime <= 10) { + stt.setCharAt(8, '1'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else if (endTime <= 20) { + stt.setCharAt(8, '2'); + stt.setCharAt(9, '0'); + pd.put("ENDTIME", et.toString()); + } else { + Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7)); + Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4)); + pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59"); + } + List tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬 + if (tenDaysList != null && !tenDaysList.isEmpty()) { + for (PageData count : tenDaysList) { + sum += Integer.parseInt(count.get("NUM").toString()); + } + } + // 分母 + for (PageData count : countList) { + + Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString()) + + Integer.parseInt(all.get("denominator").toString()); + all.put("denominator", allDenominator); + } + + Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd); + all.put("molecule", sum + jjr); + } + + if (!all.get("denominator").toString().equals("0")) { + if (all.get("molecule").toString().equals("0")) { + all.put("percentage", 0d); + } else { + Double denominator = Double.parseDouble(all.get("denominator").toString()); + Double molecule = Double.parseDouble(all.get("molecule").toString()); + Double percentage = molecule / denominator * 100; + DecimalFormat df = new DecimalFormat("#.00"); + all.put("percentage", df.format(percentage)); + } + } + + map.put("all", all); + map.put("result", errInfo); + return map; + } + + /** + *

排查信息

+ *

辨识部位检查记录（排查信息）

+ */ + @RequestMapping(value = "/listLogByIde") + @ResponseBody + public Object listLogByIde() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", CORPINFO_ID); // 企业 + List varList = checkrecordService.listLogByIde(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } } From 6111c30c7a0f4bd6a517816aa138a54b531786db Mon Sep 17 00:00:00 2001 From: shanao Date: Tue, 15 Oct 2024 18:13:26 +0800 Subject: [PATCH 3/6] 1111111 --- .../controller/app/AppHiddenController.java | 46 +-- .../controller/app/AppImgFilesController.java | 27 +- .../controller/bus/VideoController.java | 26 +- .../SafetyEnvironmentalController.java | 10 +- .../SafetyEnvironmentalExplainController.java | 1 - .../controller/system/LoginController.java | 47 +-- .../controller/xgf/XgfCorpController.java | 21 +- .../accident/AccidentRecordsService.java | 9 +- .../SafetyEnvironmentalService.java | 297 ++++++++++-------- .../impl/SafetyEnvironmentalServiceImpl.java | 8 +- .../mkmj/impl/MkmjAreaServiceImpl.java | 3 +- src/main/resources/application-dev.properties | 8 +- .../mybatis/datasource/bus/HiddenMapper.xml | 3 +- .../mybatis/datasource/bus/ImgFilesMapper.xml | 6 +- .../SafetyEnvironmentalExplainMapper.xml | 2 +- .../SafetyEnvironmentalInspectorMapper.xml | 2 +- .../inspection/SafetyEnvironmentalMapper.xml | 16 +- 17 files changed, 266 insertions(+), 266 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index 920660ad..c653f501 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -1,25 +1,25 @@ package com.zcloud.controller.app; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.io.File; - -import com.zcloud.controller.bus.HiddenController; +import cn.hutool.crypto.digest.DigestUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; import com.zcloud.service.bus.*; import com.zcloud.service.hiddenApi.HiddenApiService; import com.zcloud.service.hiddenApi.HiddenCheckApiService; import com.zcloud.service.hiddenApi.HiddenExamineApiService; import com.zcloud.service.inspection.SafetyEnvironmentalService; +import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import com.zcloud.util.event.DeviceHiddenEvent; import com.zcloud.util.message.MessageService; +import net.sf.json.JSONArray; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -29,27 +29,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.ModelAndView; -import org.apache.commons.io.FileUtils; -import org.apache.fop.fo.flow.PageNumberCitation; -import org.apache.fop.render.afp.modca.PageDescriptor; -import org.apache.shiro.authz.annotation.RequiresPermissions; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.Page; - -import net.sf.json.JSONArray; - -import com.zcloud.entity.PageData; -import com.zcloud.service.system.DepartmentService; -import com.zcloud.service.system.UsersService; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.tools.Tool; +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.*; /** * 说明：隐患 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com @@ -567,6 +552,7 @@ public class AppHiddenController extends BaseController { } File tempFile = new File(file.getOriginalFilename()); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); + String md5 = DigestUtil.md5Hex(tempFile); if (!FileUpload.isImage(tempFile)) { tempFile.delete(); map.put("result", "failed"); @@ -584,8 +570,10 @@ public class AppHiddenController extends BaseController { Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); PageData pd = new PageData(); pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("MD5", md5); pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); pd.put("TYPE", TYPE); + pd.put("FOREIGN_KEY", FOREIGN_KEY); imgFilesService.save(pd); diff --git a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java index 526cc82c..1e313417 100644 --- a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java +++ b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java @@ -1,13 +1,13 @@ package com.zcloud.controller.app; -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import cn.hutool.crypto.digest.DigestUtil; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ImgFilesService; import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; @@ -16,13 +16,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import org.apache.commons.io.FileUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.service.bus.ImgFilesService; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 说明：图片管理 @@ -65,6 +64,7 @@ public class AppImgFilesController extends BaseController { MultipartFile file = files[i]; // 保存文件 File tempFile = new File(file.getOriginalFilename()); + String md5 = DigestUtil.md5Hex(tempFile); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型 tempFile.delete(); @@ -98,6 +98,7 @@ public class AppImgFilesController extends BaseController { pd.put("IMGFILES_ID", this.get32UUID()); pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("TYPE", TYPE); + pd.put("MD5", md5); pd.put("FOREIGN_KEY", FOREIGN_KEY); imgfilesService.save(pd); } diff --git a/src/main/java/com/zcloud/controller/bus/VideoController.java b/src/main/java/com/zcloud/controller/bus/VideoController.java index e8f232ca..bf64d81e 100644 --- a/src/main/java/com/zcloud/controller/bus/VideoController.java +++ b/src/main/java/com/zcloud/controller/bus/VideoController.java @@ -1,11 +1,10 @@ package com.zcloud.controller.bus; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.VideoService; +import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -16,18 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.service.bus.VideoService; -import com.zcloud.util.Const; -import com.zcloud.util.DateUtil; -import com.zcloud.util.FileUpload; -import com.zcloud.util.Jurisdiction; -import com.zcloud.util.ObjectExcelView; -import com.zcloud.util.PathUtil; -import com.zcloud.util.Smb; -import com.zcloud.util.Tools; +import java.util.*; /** * 说明：视频管理 @@ -155,7 +143,7 @@ public class VideoController extends BaseController { @RequiresPermissions("video:edit") @ResponseBody public Object goEdit() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap<>(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index 952c989c..043b1215 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -3,11 +3,8 @@ package com.zcloud.controller.inspection; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.hotWorkApplication.Color; import com.zcloud.entity.hotWorkApplication.Node; import com.zcloud.entity.hotWorkApplication.Overseer; -import com.zcloud.entity.system.Department; -import com.zcloud.entity.system.User; import com.zcloud.service.bus.HiddenCheckService; import com.zcloud.service.bus.HiddenService; import com.zcloud.service.bus.NoticeCorpService; @@ -21,8 +18,6 @@ import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.session.Session; -import org.apache.xmlgraphics.xmp.schemas.pdf.PDFAAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -34,7 +29,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.*; -import java.util.stream.Collectors; /** * 说明：安全环保检查 @@ -211,11 +205,11 @@ public class SafetyEnvironmentalController extends BaseController { @RequiresPermissions("safetyenvironmental:list") @ResponseBody public Object list(Page page) throws Exception { - Map map = new HashMap(); + Map map = new HashMap<>(); String errInfo = "success"; PageData pd = this.getPageData(); String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("KEYWORDS", Tools.notEmpty(KEYWORDS) ? KEYWORDS.trim() : ""); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID // PageData userInfo = new PageData(); // userInfo.put("USER_ID",pd.getString("INSPECTION_ORIGINATOR_ID")); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java index 3acc2464..1cd904e2 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java @@ -8,7 +8,6 @@ import com.zcloud.service.bus.NoticeCorpUtil; import com.zcloud.service.inspection.SafetyEnvironmentalExplainService; import com.zcloud.service.system.DepartmentService; import com.zcloud.util.*; -import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index 5c93c4f0..8a6540c0 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -1,50 +1,26 @@ package com.zcloud.controller.system; -import java.util.*; - -import javax.servlet.http.HttpServletRequest; - +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.User; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.bus.OffDutyService; import com.zcloud.service.system.*; import com.zcloud.util.*; -import org.apache.http.HttpEntity; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.protocol.HTTP; -import org.apache.http.util.EntityUtils; +import net.sf.json.JSONObject; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.DisabledAccountException; -import org.apache.shiro.authc.ExcessiveAttemptsException; -import org.apache.shiro.authc.IncorrectCredentialsException; -import org.apache.shiro.authc.LockedAccountException; -import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.authc.*; import org.apache.shiro.crypto.hash.SimpleHash; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; 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 com.alibaba.fastjson.JSON; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.PageData; -import com.zcloud.entity.system.Role; -import com.zcloud.entity.system.User; -import com.zcloud.service.bus.CorpInfoService; -import com.zcloud.service.bus.OffDutyService; - -import net.sf.json.JSONObject; +import javax.servlet.http.HttpServletRequest; +import java.util.*; /** * 说明：登录处理类 @@ -177,6 +153,7 @@ public class LoginController extends BaseController { } catch (AuthenticationException ae) { errInfo = "usererror"; } + Integer port = SpringUtil.getApplicationContext().getEnvironment().getProperty("server.port", Integer.class); if (subject.isAuthenticated()) { //验证是否登录成功 removeSession(USERNAME); @@ -201,7 +178,8 @@ public class LoginController extends BaseController { if (backEndPath.get("result").toString().equals("success")) { backEndPath.put("baseImgPath",map.get("baseImgPath").toString()); backEndPath.put("USER_IDENTITY",map.get("USER_IDENTITY").toString()); - backEndPath.put("BACKENDADDR", map.get("BACKENDADDR").toString()); + + backEndPath.put("BACKENDADDR", "http://" + ip + ":" + port + "/"); System.out.println("登录返回参数：" + backEndPath); return backEndPath; } else { @@ -212,6 +190,7 @@ public class LoginController extends BaseController { return map; } } + map.put("BACKENDADDR", "http://" + ip + ":" + port + "/"); if ("99".equals(pd.getString("STATUS"))) { errInfo = "userlock"; map.put("result", "fail"); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java index e152ae2d..8624a6bf 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfCorpController.java @@ -1,30 +1,25 @@ package com.zcloud.controller.xgf; -import java.util.*; -import java.util.stream.Collectors; - import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; -import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.entity.PageData; import com.zcloud.service.system.DepartmentService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; -import net.sf.json.JSONArray; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; - -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.PageData; -import com.zcloud.util.DateUtil; -import com.zcloud.util.HttpClientService; -import com.zcloud.util.Jurisdiction; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; @RestController @RequestMapping("/xgf/corp") @@ -62,7 +57,7 @@ public class XgfCorpController extends BaseController { } } Map result = HttpClientService.doPost(url + "/api/corpinfo/JiTuanTeShulist", pd); - // created by liu jun (为了不在相关方连表查询，只能在这里这么写，兼容老数据) + // created by liu jun (为了不在相关方连表查询，只能在这里这么写，兼容老数据) List list = (List )result.get("varList"); for (HashMap x : list) { if (x.get("MAIN_DEPARTMENT") != null && x.get("MAIN_DEPARTMENT").toString().contains("]")) { diff --git a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java index 2d003b70..26a52c65 100644 --- a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java +++ b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java @@ -2,6 +2,7 @@ package com.zcloud.service.accident; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.entity.accident.AccidentRecords; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -28,16 +29,16 @@ public interface AccidentRecordsService { /** * 新增 * - * @param pageData 要保存的实体 + * @param accidentRecords 要保存的实体 */ - void save(PageData pageData); + void save(AccidentRecords accidentRecords); /** * 修改 * - * @param bean 要修改的实体 + * @param accidentRecords 要修改的实体 */ - void update(PageData pageData); + void update(AccidentRecords accidentRecords); /** * 删除 diff --git a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java index 5e8e1921..d5b1921b 100644 --- a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java +++ b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java @@ -11,158 +11,193 @@ import java.util.List; * 时间：2022-06-08 * 官网：www.zcloudchina.com */ -public interface SafetyEnvironmentalService{ - List getHiddenCountByDepat (PageData pd) throws Exception; - List getHiddenCountByUser (PageData pd) throws Exception; - /**新增 - * @param pd - * @throws Exception - */ - public List save(PageData pd)throws Exception; +public interface SafetyEnvironmentalService { + List getHiddenCountByDepat(PageData pd) throws Exception; - /**删除 - * @param pd - * @throws Exception - */ - public void delete(PageData pd)throws Exception; + List getHiddenCountByUser(PageData pd) throws Exception; - /**修改 - * @param pd - * @throws Exception - */ - public List edit(PageData pd)throws Exception; + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public List save(PageData pd) throws Exception; - /**修改 - * @param pd - * @throws Exception - */ - public void edieditsttust(PageData pd)throws Exception; //执行考评方法时，将检查状态改成已归档，因为bug6535提出，要是隐患考评完毕，状态应该是8已归档 + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception; - /**列表 - * @param page - * @throws Exception - */ - public List list(Page page)throws Exception; + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public List edit(PageData pd) throws Exception; - /**列表(全部) - * @param pd - * @throws Exception - */ - public List listAll(PageData pd)throws Exception; + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edieditsttust(PageData pd) throws Exception; //执行考评方法时，将检查状态改成已归档，因为bug6535提出，要是隐患考评完毕，状态应该是8已归档 - /**列表(全部) - * @param pd - * @throws Exception - */ - public List findByyin(PageData pd)throws Exception; - /**通过id获取数据 - * @param pd - * @throws Exception - */ - public PageData findById(PageData pd)throws Exception; + /** + * 列表 + * + * @param page 分页数据和条件 + * @throws Exception 可能存在的异常 + */ + List list(Page page) throws Exception; - /**批量删除 - * @param pd - * @throws Exception - */ - public void deleteAll(PageData pd)throws Exception; + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception; - /**列表(根据所选ID获取数据) - * @param pd - * @throws Exception - */ - List findByIds(PageData pd)throws Exception; + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List findByyin(PageData pd) throws Exception; - /** - * 更新检查进度状态 - * @param pd - */ - void editStatus(PageData pd)throws Exception; + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception; - PageData findShowById(PageData pd)throws Exception; + /** + * 批量删除 + * + * @param pd + * @throws Exception + */ + public void deleteAll(PageData pd) throws Exception; - /** - * 获取检查所有相关信息 - * @param pd - * @return - */ - PageData findFormById(PageData pd)throws Exception; + /** + * 列表(根据所选ID获取数据) + * + * @param pd + * @throws Exception + */ + List findByIds(PageData pd) throws Exception; - /** - * 申辩不成立时归档 - * @param pd - * @throws Exception - */ - void explain(PageData pd)throws Exception; + /** + * 更新检查进度状态 + * + * @param pd + */ + void editStatus(PageData pd) throws Exception; - /** - * 分公司安全环保检查考核分数统计 - * @param pd - * @return - * @throws Exception - */ - PageData statisticsBranch(PageData pd)throws Exception; + PageData findShowById(PageData pd) throws Exception; - /** - * 列表（股份公司安全环保检查考核分数统计） - * @param pd - * @return - * @throws Exception - */ - List statisticsJointStock(PageData pd) throws Exception; + /** + * 获取检查所有相关信息 + * + * @param pd + * @return + */ + PageData findFormById(PageData pd) throws Exception; - /** - * 被检查人签字/申辩数 - * @param pd - * @return - * @throws Exception - */ - PageData checkedCount (PageData pd)throws Exception; + /** + * 申辩不成立时归档 + * + * @param pd + * @throws Exception + */ + void explain(PageData pd) throws Exception; - /** - * 打回数 - * @param pd - * @return - * @throws Exception - */ - PageData repulseCount (PageData pd)throws Exception; + /** + * 分公司安全环保检查考核分数统计 + * + * @param pd + * @return + * @throws Exception + */ + PageData statisticsBranch(PageData pd) throws Exception; - /** - * 指派+验收数 - * @param pd - * @return - * @throws Exception - */ - PageData repulseAndCheckCountCount (PageData pd)throws Exception; + /** + * 列表（股份公司安全环保检查考核分数统计） + * + * @param pd + * @return + * @throws Exception + */ + List statisticsJointStock(PageData pd) throws Exception; - List pleadList(Page page) throws Exception; + /** + * 被检查人签字/申辩数 + * + * @param pd + * @return + * @throws Exception + */ + PageData checkedCount(PageData pd) throws Exception; - List checkList(Page page) ; + /** + * 打回数 + * + * @param pd + * @return + * @throws Exception + */ + PageData repulseCount(PageData pd) throws Exception; - /** - * description: 公司层级工具类 - * - * @param data - * @return - * @throws Exception - */ - PageData departmentUtil(PageData data) throws Exception; - /** - * 获取所有的安全环保信息 - * @param pd - * @return - * @throws Exception - */ - List statisticsBranchGroupDept(PageData pd) throws Exception; + /** + * 指派+验收数 + * + * @param pd + * @return + * @throws Exception + */ + PageData repulseAndCheckCountCount(PageData pd) throws Exception; - String getHiddenTotal(Page page); - /** - * 指派+验收数 验收数据错误,原来可以查询已经验收数据 - * @param pd - * @return - * @throws Exception - */ - PageData repulseAndCheckCountCountV2 (PageData pd)throws Exception; + List pleadList(Page page) throws Exception; + + List checkList(Page page); + + /** + * description: 公司层级工具类 + * + * @param data + * @return + * @throws Exception + */ + PageData departmentUtil(PageData data) throws Exception; + + /** + * 获取所有的安全环保信息 + * + * @param pd + * @return + * @throws Exception + */ + List statisticsBranchGroupDept(PageData pd) throws Exception; + + String getHiddenTotal(Page page); + + /** + * 指派+验收数 验收数据错误,原来可以查询已经验收数据 + * + * @param pd + * @return + * @throws Exception + */ + PageData repulseAndCheckCountCountV2(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index 45f4983f..42891d7b 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -466,9 +466,11 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic return hiddenList; } - /**列表 - * @param page - * @throws Exception + /** + * 列表 + * + * @param page 分页数据和条件 + * @throws Exception 可能存在的异常 */ public List list(Page page)throws Exception{ return safetyenvironmentalMapper.datalistPage(page); diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java index 9e88e3da..98315e39 100644 --- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjAreaServiceImpl.java @@ -4,7 +4,6 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.mkmj.MkmjAreaGateMapper; import com.zcloud.mapper.datasource.mkmj.MkmjAreaMapper; -import com.zcloud.service.map.util.ReturnMap; import com.zcloud.service.mkmj.MkmjAreaService; import com.zcloud.util.UuidUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -60,7 +59,7 @@ public class MkmjAreaServiceImpl implements MkmjAreaService { * @throws Exception */ public Object delete(PageData pd)throws Exception{ - Map map = new HashMap(); + Map map = new HashMap<>(); String errInfo = "success"; //校验区域下是否还存在区域 存在则不让删除 List childList = mkmjAreaMapper.findByChild(pd); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1c079768..86a5d55e 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -2,10 +2,16 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=dev datasource.no1.password=Zykj@dev123456 +#datasource.no1.url=jdbc:mysql://127.0.0.1:3306/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +#datasource.no1.username=root +#datasource.no1.password=123456 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=dev datasource.no2.password=Zykj@dev123456 +#datasource.no2.url=jdbc:mysql://127.0.0.1:3306/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +#datasource.no2.username=root +#datasource.no2.password=123456 #druid??? @@ -71,7 +77,7 @@ smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add -rocketmq.name-server=172.24.151.22:9876 +rocketmq.name-server=127.0.0.1:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index 9f333adc..02529d78 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -1237,7 +1237,8 @@ ) --> - and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID )>0 + and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} + and bh.HIDDEN_ID=f.HIDDEN_ID )>0 and f.CORPINFO_ID =#{CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml b/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml index ebbab79a..6c95241b 100644 --- a/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml @@ -27,7 +27,8 @@ TYPE, FOREIGN_KEY, FILE_NAME, - IMGFILES_ID + IMGFILES_ID, + MD5 @@ -36,7 +37,8 @@ #{TYPE}, #{FOREIGN_KEY}, #{FILE_NAME}, - #{IMGFILES_ID} + #{IMGFILES_ID}, + #{MD5} diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml index bced954d..6cbce4e8 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml @@ -191,7 +191,7 @@ and se.CORPINFO_ID = #{pd.CORPINFO_ID} GROUP BY se.INSPECTION_ID - ORDER BY se.CREATTIME DESC + ORDER BY se.INSPECTION_TIME_START DESC diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml index 9b542435..0635afd4 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml @@ -137,7 +137,7 @@ from f - LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_ID + INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_ID LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml index cd64e9bb..44226ae4 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml @@ -240,9 +240,9 @@ IFNULL(GROUP_CONCAT(REPLACE(siu.USER_ID,'/',',')),'') AS INSPECTION_USER_ID, IFNULL(GROUP_CONCAT( DISTINCT siu.NAME),'') AS INSPECTION_USER_NAME, CASE WHEN IFNULL(f.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME ELSE f.INSPECTION_TYPE_OTHER END INSPECTION_TYPE_NAME, - + from - f + f LEFT JOIN bus_hidden h on h.FOREIGN_ID = f.INSPECTION_ID and h.isdelete ='0' LEFT JOIN vi_user_all iou ON iou.USER_ID = f.INSPECTION_ORIGINATOR_ID LEFT JOIN OA_DEPARTMENT ild ON ild.DEPARTMENT_ID = f.INSPECTION_LEADDEPARTMENT_ID @@ -339,6 +339,16 @@ OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) + + + and REPLACE(siu.NAME,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_NAME}),'%') + + + and REPLACE(siu.PHONE,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_PHONE}),'%') + + + and biss.SITUATION like CONCAT('%', #{pd.INSPECTION_CASE}, '%') + GROUP BY f.INSPECTION_ID ORDER BY f.CREATTIME DESC @@ -711,7 +721,7 @@ ) GROUP BY f.INSPECTION_ID - ORDER BY f.CREATTIME DESC + ORDER BY f.INSPECTION_TIME_END DESC - SELECT + SELECT c.*,u.TYPE FROM bus_noticecorpuserid u diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml index 6cbce4e8..20b7571e 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml @@ -120,79 +120,96 @@ + select iou.NAME INSPECTION_ORIGINATOR_NAME, + iod.NAME INSPECTION_DEPARTMENT_NAME, + isd.NAME INSPECTED_DEPARTMENT_NAME, + isu.NAME INSPECTED_SITEUSER_NAME, + IFNULL(GROUP_CONCAT(REPLACE(siu.NAME, '/', ',')), '') AS INSPECTION_USER_NAME, + CASE + WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME + ELSE se.INSPECTION_TYPE_OTHER END INSPECTION_TYPE_NAME, + se.INSPECTION_TIME_START, + se.INSPECTION_TIME_END, + se.INSPECTION_STATUS, + se.INSPECTION_SUBJECT, + se.INSPECTED_EXPLAIN, + se.INSPECTED_EXPLAIN_FILENAME, + se.INSPECTED_EXPLAIN_FILEPATH, + se.INSPECTED_SITEUSER_SIGN_IMG, + se.INSPECTED_SITEUSER_SIGN_TIME, + se.INSPECTION_ID, + se.INSPECTED_SITEUSER_ID, + se.INSPECTED_DEPARTMENT_ID + from BUS_INSPECTION_SAFETYENVIRONMENTAL se + LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID + LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID + LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID + LEFT JOIN SYS_USER isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID + LEFT JOIN bus_inspection_safetyenvironmental_inspector si + ON si.INSPECTION_ID = se.INSPECTION_ID and si.ISDELETE = '0' + LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID + LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE + where se.ISDELETE = '0' and se.INSPECTION_STATUS = '2' + + + + + + + and siu.DEPARTMENT_ID in (${pd.supDeparIds}) + or se.INSPECTED_DEPARTMENT_ID in (${pd.supDeparIds}) + + + and siu.USER_ID in (#{pd.loginUserId}) + or se.INSPECTED_SITEUSER_ID in (#{pd.loginUserId}) + + + + + + and se.INSPECTED_SITEUSER_ID = #{pd.INSPECTED_SITEUSER_ID} + + + + and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR} + + + + and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}), '%') + + + + and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}), '%') + + + + and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}), '%') + + + + and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE} + + + + and se.INSPECTION_TIME_START >= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00') + + + + and se.INSPECTION_TIME_END <= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59') + + + + and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS} + + + + and se.CORPINFO_ID = #{pd.CORPINFO_ID} + + GROUP BY se.INSPECTION_ID + ORDER BY FIELD(se.INSPECTION_STATUS, '2', '1', '0', '3', '4', '5', '6', '7', '8', '-1', '-2'), + FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},se.INSPECTED_SITEUSER_ID,'1'), se.INSPECTED_SITEUSER_ID, '1'), + se.INSPECTION_TIME_START DESC + + insert into push_records + + + ID, + + + PHONE, + + + MESSAGE_TITLE, + + + MESSAGE_CONTENT, + + + MESSAGE_TYPE, + + + SEND_TIME, + + + values + + + #{id}, + + + #{phone}, + + + #{messageTitle}, + + + #{messageContent}, + + + #{messageType}, + + + #{sendTime}, + + + + + + \ No newline at end of file From 1a26abd93a8fb058c60df2becb2cb20eaaf16154 Mon Sep 17 00:00:00 2001 From: shanao Date: Mon, 21 Oct 2024 18:26:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=88=E4=B9=9D=E5=85=AC=E5=8F=B8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/MessagesController.java | 6 +- .../zcloud/entity/messages/PushRecords.java | 2 + .../datasource/messages/MessagesMapper.java | 2 + .../zcloud/service/messages/PushMessages.java | 17 +++ .../messages/impl/AllMessagesImpl.java | 23 +++ .../messages/impl/InsideMessagesImpl.java | 33 ++++ .../messages/impl/MessagesServiceImpl.java | 62 ++------ .../messages/impl/SmsMessagesImpl.java | 28 ++++ .../java/com/zcloud/util/SendSmsUtil.java | 141 +++++++++++------- .../datasource/messages/MessagesMapper.xml | 31 ++++ 10 files changed, 234 insertions(+), 111 deletions(-) create mode 100644 src/main/java/com/zcloud/service/messages/PushMessages.java create mode 100644 src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java create mode 100644 src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java create mode 100644 src/main/java/com/zcloud/service/messages/impl/SmsMessagesImpl.java diff --git a/src/main/java/com/zcloud/controller/messages/MessagesController.java b/src/main/java/com/zcloud/controller/messages/MessagesController.java index 5160a9c6..6d6d20af 100644 --- a/src/main/java/com/zcloud/controller/messages/MessagesController.java +++ b/src/main/java/com/zcloud/controller/messages/MessagesController.java @@ -47,7 +47,7 @@ public class MessagesController { if (body == null || !body.containsKey("key") || !body.containsKey("value")) { throw new RuntimeException("参数为空"); } - PushRecords pushRecords = JSON.parseObject(decrypt(body, privateKey), PushRecords.class); + PushRecords pushRecords = JSON.parseObject(decrypt(body), PushRecords.class); Set> validate = validator.validate(pushRecords); if (!validate.isEmpty()) { throw new ConstraintViolationException(validate); @@ -62,9 +62,9 @@ public class MessagesController { return result; } - private String decrypt(Map body, String privateKey) { + private String decrypt(Map body) { try { - RSA rsa = new RSA(privateKey, null); + RSA rsa = new RSA(MessagesController.privateKey, null); byte[] aesKey = rsa.decrypt(Convert.toStr(body.get("key")), KeyType.PrivateKey); SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, aesKey); return aes.decryptStr(Convert.toStr(body.get("value")), StandardCharsets.UTF_8); diff --git a/src/main/java/com/zcloud/entity/messages/PushRecords.java b/src/main/java/com/zcloud/entity/messages/PushRecords.java index 3ca02e19..350370d2 100644 --- a/src/main/java/com/zcloud/entity/messages/PushRecords.java +++ b/src/main/java/com/zcloud/entity/messages/PushRecords.java @@ -32,4 +32,6 @@ public class PushRecords implements Serializable { @NotBlank(message = "发送时间不能为空") private String sendTime; + + private Integer state; } diff --git a/src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java b/src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java index a3c36138..b61c1877 100644 --- a/src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java @@ -7,4 +7,6 @@ public interface MessagesMapper { void install(PushRecords pushRecords); String findUserIdByPhone(@Param("phone") String phone); + + void updateById(PushRecords pushRecords); } diff --git a/src/main/java/com/zcloud/service/messages/PushMessages.java b/src/main/java/com/zcloud/service/messages/PushMessages.java new file mode 100644 index 00000000..bd556197 --- /dev/null +++ b/src/main/java/com/zcloud/service/messages/PushMessages.java @@ -0,0 +1,17 @@ +package com.zcloud.service.messages; + +import com.zcloud.entity.messages.PushRecords; + +/** + * 发送消息接口 + */ +public interface PushMessages { + + /** + * 发送消息 + * + * @param pushRecords 消息实体 + * @param userId 用户id + */ + void push(PushRecords pushRecords, String userId) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java b/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java new file mode 100644 index 00000000..3ec8e98e --- /dev/null +++ b/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java @@ -0,0 +1,23 @@ +package com.zcloud.service.messages.impl; + +import com.zcloud.entity.messages.PushRecords; +import com.zcloud.service.messages.PushMessages; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 发送站内信 + */ +@Component("messages3") +@AllArgsConstructor +public class AllMessagesImpl implements PushMessages { + + private final InsideMessagesImpl insideMessages; + private final SmsMessagesImpl smsMessages; + + @Override + public void push(PushRecords pushRecords, String userId) throws Exception { + insideMessages.push(pushRecords, userId); + smsMessages.push(pushRecords, userId); + } +} diff --git a/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java b/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java new file mode 100644 index 00000000..cf3ae852 --- /dev/null +++ b/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java @@ -0,0 +1,33 @@ +package com.zcloud.service.messages.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.entity.messages.PushRecords; +import com.zcloud.service.bus.NoticeCorpService; +import com.zcloud.service.messages.PushMessages; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 发送站内信 + */ +@Component("messages2") +@AllArgsConstructor +public class InsideMessagesImpl implements PushMessages { + + private final NoticeCorpService noticeCorpService; + + @Override + public void push(PushRecords pushRecords, String userId) throws Exception { + PageData mes = new PageData(); + mes.put("BIANMA", "PUSH_RECORDS"); + mes.put("SENDER_ID", "九公司应急管理"); + mes.put("SENDER_NAME", "九公司应急管理"); + mes.put("SYNOPSIS", pushRecords.getMessageTitle()); + mes.put("CORPINFO_ID", "48a8ca9815814c979814ddcf041c5cd5"); + mes.put("RECEIVER_ID", userId); + PageData content = new PageData(); + content.put("msg", pushRecords.getMessageContent()); + mes.put("CONTENT", content);// 站内信内容 + noticeCorpService.sendNotice(mes); + } +} diff --git a/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java b/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java index 72af1bba..0395d214 100644 --- a/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java +++ b/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java @@ -1,11 +1,10 @@ package com.zcloud.service.messages.impl; import cn.hutool.core.util.StrUtil; -import com.zcloud.entity.PageData; import com.zcloud.entity.messages.PushRecords; import com.zcloud.mapper.datasource.messages.MessagesMapper; -import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.messages.MessagesService; +import com.zcloud.service.messages.PushMessages; import com.zcloud.util.DateUtil; import com.zcloud.util.UuidUtil; import lombok.RequiredArgsConstructor; @@ -13,13 +12,16 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Map; + @Slf4j @Service @RequiredArgsConstructor public class MessagesServiceImpl implements MessagesService { private final MessagesMapper mapper; - private final NoticeCorpService noticeCorpService; + private final Map messages; + @Override @Transactional(rollbackFor = Exception.class) @@ -27,59 +29,19 @@ public class MessagesServiceImpl implements MessagesService { // 先记录数据 pushRecords.setId(UuidUtil.get32UUID()); pushRecords.setSendTime(DateUtil.getTime()); + pushRecords.setState(1); mapper.install(pushRecords); // 根据手机号查找用户id String userId = mapper.findUserIdByPhone(pushRecords.getPhone()); if (StrUtil.isEmpty(userId)) { throw new RuntimeException("该用户不存在"); } + // 调用对应消息推送实现 Integer type = pushRecords.getMessageType(); - // 1-短信 2-平台信息 3-全发 - if (type == 1) { - pushSms(pushRecords); - } else if (type == 2) { - PageData data = pushInfo(pushRecords, userId); - noticeCorpService.sendNotice(data); - } else if (type == 3) { - pushSms(pushRecords); - PageData data = pushInfo(pushRecords, userId); - noticeCorpService.sendNotice(data); - } else { - throw new RuntimeException("消息类型：【" + type + "】错误"); - } - } - - /** - * 推送平台信息(站内信) - * 注意 不能再此方法中调用数据库 再类中直接调用 会导致事务失效 private 也会导致事务失效 - * - * @param pushRecords 消息 - * @param userId 接收人id - */ - private PageData pushInfo(PushRecords pushRecords, String userId) throws Exception { - PageData mes = new PageData(); - mes.put("BIANMA", "PUSH_RECORDS"); - mes.put("SENDER_ID", "九公司应急管理"); // 发送人员ID - mes.put("SENDER_NAME", "九公司应急管理"); // 发送人员姓名 - mes.put("SYNOPSIS", pushRecords.getMessageTitle()); // 站内信标题 - //mes.put("WORKURL", "/pages/application/high-risk-work/limited-space/gas-analysis/list?NameLikes=" + pd.getString("WORK_PERMIT_NUMBER")); // 操作链接 - mes.put("CORPINFO_ID", "48a8ca9815814c979814ddcf041c5cd5");// 企业id - mes.put("RECEIVER_ID", userId); // 接收人员ID - PageData content = new PageData(); - content.put("msg", pushRecords.getMessageContent());// 作业编号 - mes.put("CONTENT", content);// 站内信内容 - return mes; - } - - /** - * 推送平台信息(站内信) - * 注意 不能再此方法中调用数据库 再类中直接调用 会导致事务失效 private 也会导致事务失效 - * - * @param pushRecords 消息 - */ - private void pushSms(PushRecords pushRecords) { - // todo - log.error("===================>推送短信信息"); - log.error("消息内容：{}", pushRecords); + PushMessages pushMessages = messages.get("messages" + type); + pushMessages.push(pushRecords, userId); + // 修改状态 + pushRecords.setState(2); + mapper.updateById(pushRecords); } } diff --git a/src/main/java/com/zcloud/service/messages/impl/SmsMessagesImpl.java b/src/main/java/com/zcloud/service/messages/impl/SmsMessagesImpl.java new file mode 100644 index 00000000..fe5e4aea --- /dev/null +++ b/src/main/java/com/zcloud/service/messages/impl/SmsMessagesImpl.java @@ -0,0 +1,28 @@ +package com.zcloud.service.messages.impl; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.messages.PushRecords; +import com.zcloud.service.messages.PushMessages; +import com.zcloud.util.SendSmsUtil; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.text.ParseException; + +/** + * 发送短信 + */ +@Component("messages1") +@AllArgsConstructor +public class SmsMessagesImpl implements PushMessages { + + @Override + public void push(PushRecords pushRecords, String userId) throws ParseException { + JSONObject object = new JSONObject(); + object.put("messageContent", pushRecords.getMessageContent()); + // todo 应该是短信模版tpId 没有 别的OK了 + if (!SendSmsUtil.sendSms(null, object, pushRecords.getSendTime(), pushRecords.getPhone())) { + throw new RuntimeException("系统故障：短信发送失败"); + } + } +} diff --git a/src/main/java/com/zcloud/util/SendSmsUtil.java b/src/main/java/com/zcloud/util/SendSmsUtil.java index efaddd2c..c7442f49 100644 --- a/src/main/java/com/zcloud/util/SendSmsUtil.java +++ b/src/main/java/com/zcloud/util/SendSmsUtil.java @@ -1,8 +1,12 @@ package com.zcloud.util; +import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.springframework.http.MediaType; @@ -14,6 +18,7 @@ import java.util.Date; /** * 重点工程发送短信工具类 */ +@Slf4j public class SendSmsUtil { private static String USERNAME = "qhdzyhy"; @@ -27,43 +32,44 @@ public class SendSmsUtil { /** * 发送短信 + * * @param records - * @param time 发送时间 为空或小于当前时间则立即发送 - * records格式实例 records是 JSONArray 里边的内容通过调用下方方法getRecords获取 JSONObject 定义一个JSONArray后 put进去即可 - * "records":[ - * { - * "mobile":"138****0000", - * "tpContent":{ - * "var1":"变量1", - * "var2":"变量2" - * } - * }, - * { - * "mobile":"138****0001", - * "tpContent":{ - * "var1":"变量2", - * "var2":"变量2" - * } - * } - * ] + * @param time 发送时间 为空或小于当前时间则立即发送 + * records格式实例 records是 JSONArray 里边的内容通过调用下方方法getRecords获取 JSONObject 定义一个JSONArray后 put进去即可 + * "records":[ + * { + * "mobile":"138****0000", + * "tpContent":{ + * "var1":"变量1", + * "var2":"变量2" + * } + * }, + * { + * "mobile":"138****0001", + * "tpContent":{ + * "var1":"变量2", + * "var2":"变量2" + * } + * } + * ] */ - public static void sendSms(String tpId,JSONArray records ,String time) throws ParseException { + public static void sendSms(String tpId, JSONArray records, String time) throws ParseException { JSONObject json = new JSONObject(); - Long tKey = System.currentTimeMillis()/1000; - String passWord = MD5.md5(PASSWORD+tKey); + Long tKey = System.currentTimeMillis() / 1000; + String passWord = MD5.md5(PASSWORD + tKey); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //扔参数 - json.put("username",USERNAME); - json.put("password",passWord); - json.put("tKey",tKey); - json.put("signature",SIGNATURE); - json.put("tpId",tpId); - if(StringUtils.isNotBlank(time)){ - if(sdf.parse(time).after(new Date())){ - json.put("time",time); + json.put("username", USERNAME); + json.put("password", passWord); + json.put("tKey", tKey); + json.put("signature", SIGNATURE); + json.put("tpId", tpId); + if (StringUtils.isNotBlank(time)) { + if (sdf.parse(time).after(new Date())) { + json.put("time", time); } } - json.put("records",records); + json.put("records", records); System.out.println(json.toJSONString()); String result = HttpRequest.post(URL) .timeout(60000) @@ -71,45 +77,64 @@ public class SendSmsUtil { System.out.println(result); } + // {"msg":"template error","tpId":"null","code":4014,"msgId":"172950016144709288961"} + // {"msg":"success","tpId":"121487","code":200,"msgId":"172950025828957168641","invalidList":[]} + public static boolean sendSms(String tpId, JSONObject records, String time, String phone) throws ParseException { + JSONObject json = new JSONObject(); + json.put("username", USERNAME); + json.put("tKey", System.currentTimeMillis() / 1000); + json.put("password", MD5.md5(PASSWORD + json.getLong("tKey"))); + json.put("signature", SIGNATURE); + json.put("tpId", tpId); + if (StringUtils.isNotBlank(time) && DateUtil.parseDateTime(time).after(new Date())) { + json.put("time", time); + } + JSONArray array = new JSONArray(); + array.add(getRecords(phone, records)); + json.put("records", array); + HttpRequest request = HttpRequest.post(URL) + .timeout(60000) + .body(json.toJSONString(), MediaType.APPLICATION_JSON_UTF8_VALUE); + try (HttpResponse response = request.execute()) { + return JSON.parseObject(response.body()).getInteger("code") == 200; + } catch (Exception e) { + log.error("发送短信异常", e); + return false; + } + } + /** * 封装要发送的电话以及要替换的内容 - * @param mobile 手机号 + * + * @param mobile 手机号 * @param tpContent 替换内容 - * @return - * 格式实例 var1表示要替换的内容 与要替换的内容保持一致即可 变量1表示替换的内容 - * { - * "mobile":"138****0000", - * "tpContent":{ - * "var1":"变量1", - * "var2":"变量2" - * } - * } + * @return 格式实例 var1表示要替换的内容 与要替换的内容保持一致即可 变量1表示替换的内容 + * { + * "mobile":"138****0000", + * "tpContent":{ + * "var1":"变量1", + * "var2":"变量2" + * } + * } */ - public static JSONObject getRecords(String mobile, JSONObject tpContent ){ + public static JSONObject getRecords(String mobile, JSONObject tpContent) { JSONObject json = new JSONObject(); - json.put("mobile",mobile); - if(ObjectUtils.hashCode(tpContent)!=0){ - json.put("tpContent",tpContent); + json.put("mobile", mobile); + if (ObjectUtils.hashCode(tpContent) != 0) { + json.put("tpContent", tpContent); } return json; }//d22f8a5d4a35b3761dc9525186e652a0 //测试接口 - public static void main(String[] args) throws ParseException { - JSONArray jsonArray = new JSONArray(); - - //接受返回结果 - JSONObject records = new JSONObject(); - //定义替换参数 - //JSONObject tpContent = new JSONObject(); - //tpContent.put("userName","卓云企业"); - //tpContent.put("time","2023-09-21 15:56:20"); - //records = getRecords("18617456701",tpContent); - jsonArray.add(records); - - sendSms("null",jsonArray,null); - } +// public static void main(String[] args) throws ParseException { +// //定义替换参数 +// JSONObject tpContent = new JSONObject(); +// tpContent.put("HIDDENDESCR", "卓云企业测试"); +// JSONObject object = sendSms("121487", tpContent, DateUtil.formatDateTime(new Date()), "18630387571"); +// System.out.println(object.toJSONString()); +// } } diff --git a/src/main/resources/mybatis/datasource/messages/MessagesMapper.xml b/src/main/resources/mybatis/datasource/messages/MessagesMapper.xml index 56408442..58ce6b9e 100644 --- a/src/main/resources/mybatis/datasource/messages/MessagesMapper.xml +++ b/src/main/resources/mybatis/datasource/messages/MessagesMapper.xml @@ -23,6 +23,9 @@ SEND_TIME, + + STATE, + values @@ -44,10 +47,38 @@ #{sendTime}, + + #{state}, + + + + update push_records + + + PHONE = #{phone}, + + + MESSAGE_TITLE = #{messageTitle}, + + + MESSAGE_CONTENT = #{messageContent}, + + + MESSAGE_TYPE = #{messageType}, + + + SEND_TIME = #{sendTime}, + + + STATE = #{state}, + + + where ID = #{id} + \ No newline at end of file From c2c3897979aeea72bba1a4549f9fe4fa6af03e0c Mon Sep 17 00:00:00 2001 From: shanao Date: Wed, 23 Oct 2024 14:16:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=88=E4=B9=9D=E5=85=AC=E5=8F=B8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSafetyEnvironmentalController.java | 933 +++++++++--------- .../SafetyEnvironmentalController.java | 54 +- ...afetyEnvironmentalInspectorController.java | 495 +++++----- .../messages/impl/AllMessagesImpl.java | 2 + .../messages/impl/InsideMessagesImpl.java | 2 + .../messages/impl/MessagesServiceImpl.java | 5 +- .../java/com/zcloud/util/AliSmsToolUtil.java | 26 +- .../SafetyEnvironmentalInspectorMapper.xml | 6 +- .../inspection/SafetyEnvironmentalMapper.xml | 177 ++-- 9 files changed, 896 insertions(+), 804 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java index 5ad5002c..d3b5b997 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java @@ -3,7 +3,6 @@ package com.zcloud.controller.app.inspection; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.hotWorkApplication.Node; import com.zcloud.entity.hotWorkApplication.NodeApp; import com.zcloud.entity.hotWorkApplication.Overseer; import com.zcloud.service.bus.HiddenService; @@ -14,7 +13,6 @@ import com.zcloud.service.inspection.SafetyEnvironmentalInspectorService; import com.zcloud.service.inspection.SafetyEnvironmentalService; import com.zcloud.service.system.DepartmentService; import com.zcloud.util.*; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -26,9 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import java.io.File; import java.util.*; -import java.util.stream.Collectors; /** * 说明：安全环保检查 @@ -40,484 +36,511 @@ import java.util.stream.Collectors; @RequestMapping("/app/safetyenvironmental") public class AppSafetyEnvironmentalController extends BaseController { - @Autowired - private SafetyEnvironmentalService safetyenvironmentalService; - @Autowired - private SafetyEnvironmentalInspectorService safetyEnvironmentalInspectorService; - @Autowired - private SafetyEnvironmentalExplainService explainService; - @Autowired - private HiddenService hiddenService; - @Autowired - private DepartmentService departmentService; - @Resource - private SafetyEnvironmentalInspectorService inspectorService; - @Resource - private SafetyEnvironmentalAssessService assessService; - @Autowired - private NoticeCorpUtil noticeCorpUtil; + @Autowired + private SafetyEnvironmentalService safetyenvironmentalService; + @Autowired + private SafetyEnvironmentalInspectorService safetyEnvironmentalInspectorService; + @Autowired + private SafetyEnvironmentalExplainService explainService; + @Autowired + private HiddenService hiddenService; + @Autowired + private DepartmentService departmentService; + @Resource + private SafetyEnvironmentalInspectorService inspectorService; + @Resource + private SafetyEnvironmentalAssessService assessService; + @Autowired + private NoticeCorpUtil noticeCorpUtil; - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @ResponseBody - public Object list(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - page.setPd(pd); - List varList = safetyenvironmentalService.list(page); //列出SafetyEnvironmental列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = safetyenvironmentalService.list(page); //列出SafetyEnvironmental列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @ResponseBody - public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("INSPECTION_ID", this.get32UUID()); //主键 - pd.put("INSPECTION_ORIGINATOR_ID", pd.getString("CREATOR")); //检查发起人 - pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) - pd.put("CREATOR", pd.getString("CREATOR")); //添加人 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", pd.getString("CREATOR")); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID - pd.put("ACTION_USER", pd.getString("ACTION_USER")); //操作人 - String ffile = DateUtil.getDays(); - if (file != null && StringUtils.isNotBlank(pd.getString("INSPECTION_USER_OPINION"))){ - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("CONFIRM_MESSAGE",pd.getString("INSPECTION_USER_OPINION")); - pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); - } - List hiddenList = safetyenvironmentalService.save(pd); - pd.put("hiddenList", hiddenList); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("INSPECTION_ID", this.get32UUID()); //主键 + pd.put("INSPECTION_ORIGINATOR_ID", pd.getString("CREATOR")); //检查发起人 + pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) + pd.put("CREATOR", pd.getString("CREATOR")); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", pd.getString("CREATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID + pd.put("ACTION_USER", pd.getString("ACTION_USER")); //操作人 + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("INSPECTION_USER_OPINION"))) { + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd.put("CONFIRM_MESSAGE", pd.getString("INSPECTION_USER_OPINION")); + pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date())); + } + List hiddenList = safetyenvironmentalService.save(pd); + pd.put("hiddenList", hiddenList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goShow") - @ResponseBody - public Object goShow() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = safetyenvironmentalService.findShowById(pd); //根据ID读取 - safetyenvironmentalService.departmentUtil(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goShow") + @ResponseBody + public Object goShow() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = safetyenvironmentalService.findShowById(pd); //根据ID读取 + safetyenvironmentalService.departmentUtil(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = safetyenvironmentalService.findFormById(pd); //根据ID读取 - safetyenvironmentalService.departmentUtil(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = safetyenvironmentalService.findFormById(pd); //根据ID读取 + safetyenvironmentalService.departmentUtil(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @ResponseBody - public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("INSPECTION_STATUS", "0"); //状态(0.待检查人核实 1.检查人核实中、2.待被检查人确认、3.已归档 -1.检查人核实打回 -2被检查人申辩) - pd.put("OPERATOR", pd.getString("OPERATOR")); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("ACTION_USER", pd.getString("ACTION_USER")); //操作人 - String ffile = DateUtil.getDays(); - if (file != null && StringUtils.isNotBlank(pd.getString("INSPECTION_USER_OPINION"))){ - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("CONFIRM_MESSAGE",pd.getString("INSPECTION_USER_OPINION")); - pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); - } - List hiddenList = safetyenvironmentalService.edit(pd); - pd.put("hiddenList", hiddenList); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("INSPECTION_STATUS", "0"); //状态(0.待检查人核实 1.检查人核实中、2.待被检查人确认、3.已归档 -1.检查人核实打回 -2被检查人申辩) + pd.put("OPERATOR", pd.getString("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACTION_USER", pd.getString("ACTION_USER")); //操作人 + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("INSPECTION_USER_OPINION"))) { + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd.put("CONFIRM_MESSAGE", pd.getString("INSPECTION_USER_OPINION")); + pd.put("CONFIRM_MESSAGE_TIME", DateUtil.date2Str(new Date())); + } + List hiddenList = safetyenvironmentalService.edit(pd); + pd.put("hiddenList", hiddenList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/explain") - //@RequiresPermissions("safetyenvironmental:edit") - @ResponseBody - public Object explain(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (files != null && files.length > 0) { - MultipartFile file = files[0]; - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/explain") + //@RequiresPermissions("safetyenvironmental:edit") + @ResponseBody + public Object explain(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - } - safetyenvironmentalService.explain(pd); - pd.put("inspector",pd.getString("OPERATOR")); - noticeCorpUtil.FailPleadind(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + safetyenvironmentalService.explain(pd); + pd.put("inspector", pd.getString("OPERATOR")); + noticeCorpUtil.FailPleadind(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/delete") - @RequiresPermissions("safetyenvironmental:del") - @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - safetyenvironmentalService.delete(pd); - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @RequiresPermissions("safetyenvironmental:del") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + safetyenvironmentalService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @RequiresPermissions("safetyenvironmental:del") - @ResponseBody - public Object deleteAll() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String[] ArrayDATA_IDS = DATA_IDS.split(","); - pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids - safetyenvironmentalService.deleteAll(pd); - errInfo = "success"; - }else{ - errInfo = "fail"; - } - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @RequiresPermissions("safetyenvironmental:del") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String[] ArrayDATA_IDS = DATA_IDS.split(","); + pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids + safetyenvironmentalService.deleteAll(pd); + errInfo = "success"; + } else { + errInfo = "fail"; + } + map.put("result", errInfo); //返回结果 + return map; + } - /**导出到excel - * @param - * @throws Exception - */ - @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") - public ModelAndView exportExcel() throws Exception{ - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("检查发起人"); //1 - titles.add("被检查单位"); //2 - titles.add("被检查单位现场负责人"); //3 - titles.add("申辩内容"); //4 - titles.add("被检查单位现场负责人签字"); //5 - titles.add("被检查单位现场负责人签字时间"); //6 - titles.add("检查类型"); //7 - titles.add("检查场所"); //8 - titles.add("检查开始时间"); //9 - titles.add("检查结束时间"); //10 - titles.add("状态(0.暂存 1.检查人待确认、2.被检查人待确认、3.归档 -1.检查人异议打回 -2被检查人申辩)"); //11 - titles.add("是否删除(0:有效 1：删除)"); //12 - titles.add("添加人"); //13 - titles.add("添加时间"); //14 - titles.add("修改人"); //15 - titles.add("修改时间"); //16 - titles.add("企业ID"); //17 - dataMap.put("titles", titles); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - List varOList = safetyenvironmentalService.listAll(pd); - List varList = new ArrayList(); - for(int i=0;i dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("检查发起人"); //1 + titles.add("被检查单位"); //2 + titles.add("被检查单位现场负责人"); //3 + titles.add("申辩内容"); //4 + titles.add("被检查单位现场负责人签字"); //5 + titles.add("被检查单位现场负责人签字时间"); //6 + titles.add("检查类型"); //7 + titles.add("检查场所"); //8 + titles.add("检查开始时间"); //9 + titles.add("检查结束时间"); //10 + titles.add("状态(0.暂存 1.检查人待确认、2.被检查人待确认、3.归档 -1.检查人异议打回 -2被检查人申辩)"); //11 + titles.add("是否删除(0:有效 1：删除)"); //12 + titles.add("添加人"); //13 + titles.add("添加时间"); //14 + titles.add("修改人"); //15 + titles.add("修改时间"); //16 + titles.add("企业ID"); //17 + dataMap.put("titles", titles); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varOList = safetyenvironmentalService.listAll(pd); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varOList.get(i).getString("INSPECTION_ORIGINATOR_ID")); //1 + vpd.put("var2", varOList.get(i).getString("INSPECTED_DEPARTMENT_ID")); //2 + vpd.put("var3", varOList.get(i).getString("INSPECTED_SITEUSER_ID")); //3 + vpd.put("var4", varOList.get(i).getString("INSPECTED_EXPLAIN")); //4 + vpd.put("var5", varOList.get(i).getString("INSPECTED_SITEUSER_SIGN_IMG")); //5 + vpd.put("var6", varOList.get(i).getString("INSPECTED_SITEUSER_SIGN_TIME")); //6 + vpd.put("var7", varOList.get(i).getString("INSPECTION_TYPE")); //7 + vpd.put("var8", varOList.get(i).getString("INSPECTION_PLACE")); //8 + vpd.put("var9", varOList.get(i).getString("INSPECTION_TIME_START")); //9 + vpd.put("var10", varOList.get(i).getString("INSPECTION_TIME_END")); //10 + vpd.put("var11", varOList.get(i).getString("INSPECTION_STATUS")); //11 + vpd.put("var12", varOList.get(i).getString("ISDELETE")); //12 + vpd.put("var13", varOList.get(i).getString("CREATOR")); //13 + vpd.put("var14", varOList.get(i).getString("CREATTIME")); //14 + vpd.put("var15", varOList.get(i).getString("OPERATOR")); //15 + vpd.put("var16", varOList.get(i).getString("OPERATTIME")); //16 + vpd.put("var17", varOList.get(i).getString("CORPINFO_ID")); //17 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } - /**安全环保检查待办作业数统计 - * @param - * @throws Exception - */ - @RequestMapping(value="/countCheck") - @ResponseBody - public Object countCheck() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData confirmCount = safetyEnvironmentalInspectorService.confirmCount(pd); //检查人确认数 - PageData checkedCount = safetyenvironmentalService.checkedCount(pd); //被检查人签字数 - PageData repulseCount = safetyenvironmentalService.repulseCount(pd); //打回数 - PageData repulseAndCheckCount = safetyenvironmentalService.repulseAndCheckCountCount(pd); //指派+验收数 + /** + * 安全环保检查待办作业数统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/countCheck") + @ResponseBody + public Object countCheck() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData confirmCount = safetyEnvironmentalInspectorService.confirmCount(pd); //检查人确认数 + PageData checkedCount = safetyenvironmentalService.checkedCount(pd); //被检查人签字数 + PageData repulseCount = safetyenvironmentalService.repulseCount(pd); //打回数 + PageData repulseAndCheckCount = safetyenvironmentalService.repulseAndCheckCountCount(pd); //指派+验收数 - map.put("result", errInfo); - map.put("confirmCount", confirmCount); - map.put("checkedCount",checkedCount); - map.put("repulseCount",repulseCount); - map.put("repulseAndCheckCount",repulseAndCheckCount); - return map; - } + map.put("result", errInfo); + map.put("confirmCount", confirmCount); + map.put("checkedCount", checkedCount); + map.put("repulseCount", repulseCount); + map.put("repulseAndCheckCount", repulseAndCheckCount); + return map; + } - @RequestMapping(value="/getExplain") - @ResponseBody - public Object getExplain() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = this.getPageData(); - List list = explainService.findExplainById(pd); - map.put("list",list); - map.put("result", errInfo); - return map; - } + @RequestMapping(value = "/getExplain") + @ResponseBody + public Object getExplain() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List list = explainService.findExplainById(pd); + map.put("list", list); + map.put("result", errInfo); + return map; + } - /**一公司app首页安全环保检查统计 - * @param - * @throws Exception - */ - @RequestMapping(value="/countHome") - @ResponseBody - public Object countHome() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData count = safetyEnvironmentalInspectorService.countHome(pd); //一公司app首页安全环保检查统计 - map.put("result", errInfo); - map.put("count", count); - return map; - } + /** + * 一公司app首页安全环保检查统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/countHome") + @ResponseBody + public Object countHome() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData count = safetyEnvironmentalInspectorService.countHome(pd); //一公司app首页安全环保检查统计 + map.put("result", errInfo); + map.put("count", count); + return map; + } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/pleadList") - @ResponseBody - public Object pleadList(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - page.setPd(pd); - List varList = safetyenvironmentalService.pleadList(page); //列出SafetyEnvironmental列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/pleadList") + @ResponseBody + public Object pleadList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = safetyenvironmentalService.pleadList(page); //列出SafetyEnvironmental列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**列表 - * 规则: 如果当前人是，被检查人，检查人，参与人则可以查询到此条数据 - * @param page - * @throws Exception - */ - @RequestMapping(value="/checkList") - @ResponseBody - public Object checkList(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("waffle",pd.getString("ARCHIVE_USER_ID")); - page.setPd(pd); - List varList = safetyenvironmentalService.checkList(page); //列出SafetyEnvironmental列表 - /* 针对验收部分特殊处理 */ - String user_id = pd.getString("ARCHIVE_USER_ID"); - for (PageData vector : varList) { - if (StringUtils.isNotBlank(vector.getString("INSPECTION_STATUS")) && - ("6".equals(vector.getString("INSPECTION_STATUS")) - || "5".equals(vector.getString("INSPECTION_STATUS")) - || "7".equals(vector.getString("INSPECTION_STATUS"))) - ) { - PageData condition = new PageData(); - condition.put("FOREIGN_ID",vector.getString("INSPECTION_ID")); - List waffle = hiddenService.findByKey(condition); //d - if (waffle == null || waffle.isEmpty()){ - continue; - } - Long number = waffle.stream() - .filter(n -> - user_id.equals(n.getString("CREATOR")) - && (StringUtils.isNotBlank(n.getString("STATE"))&&( - "4".equals(n.getString("STATE"))|| "8".equals(n.getString("STATE")))) + /** + * 列表 + * 规则: 如果当前人是，被检查人，检查人，参与人则可以查询到此条数据 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/checkList") + @ResponseBody + public Object checkList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("waffle", pd.getString("ARCHIVE_USER_ID")); + pd.put("loginUserId", Jurisdiction.getUSER_ID()); + page.setPd(pd); + List varList = safetyenvironmentalService.checkList(page); //列出SafetyEnvironmental列表 + /* 针对验收部分特殊处理 */ + String user_id = pd.getString("ARCHIVE_USER_ID"); + for (PageData vector : varList) { + if (StringUtils.isNotBlank(vector.getString("INSPECTION_STATUS")) && + ("6".equals(vector.getString("INSPECTION_STATUS")) + || "5".equals(vector.getString("INSPECTION_STATUS")) + || "7".equals(vector.getString("INSPECTION_STATUS"))) + ) { + PageData condition = new PageData(); + condition.put("FOREIGN_ID", vector.getString("INSPECTION_ID")); + List waffle = hiddenService.findByKey(condition); //d + if (waffle == null || waffle.isEmpty()) { + continue; + } + Long number = waffle.stream() + .filter(n -> + user_id.equals(n.getString("CREATOR")) + && (StringUtils.isNotBlank(n.getString("STATE")) && ( + "4".equals(n.getString("STATE")) || "8".equals(n.getString("STATE")))) - &&(StringUtils.isBlank(n.getString("FINAL_CHECK"))|| "2".equals(n.getString("FINAL_CHECK"))) - ) - .count(); - if (number >0){ - vector.put("checkout",1); - } - } - } - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + && (StringUtils.isBlank(n.getString("FINAL_CHECK")) || "2".equals(n.getString("FINAL_CHECK"))) + ) + .count(); + if (number > 0) { + vector.put("checkout", 1); + } + } + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - @RequestMapping(value="/showFlowChart") - @ResponseBody - public Object showFlowChart() throws Exception{ - HashMap response = new HashMap<>(); - response.put("result","success"); - PageData condition = this.getPageData(); - condition.put("INSPECTION_ID",condition.getString("ID")); - PageData safety = safetyenvironmentalService.findById(condition); - if (safety == null || safety.size() <= 0) { - response.put("result", "error"); - response.put("errorMessage", "数据异常"); - } - // 1、整理基础数据 - Overseer overseer = new Overseer(); - List nodes = overseer.getSafetyAppWorkFlow(); - // 初始话安全环保发起人、被检查人数据 - nodes.get(0).safety_order(safety); - nodes.stream().forEach(n -> n.safety_creator_util(safety)); - for (NodeApp nodeApp : nodes) { - if (StringUtils.isNotBlank(nodeApp.getActive())) - overseer.setSafetyAppVector(nodeApp.getOrder()); - } - // 2、整理特殊数据 - // 2、1检查人将检查状态 - if ("2,3,4".contains(safety.getString("order"))) { - List inspectors = inspectorService.listAll(condition); - nodes.stream() - .filter(n -> "1".equals(n.getOrder())) - .forEach(n -> n.safety_inspector_util(inspectors)); - } + @RequestMapping(value = "/showFlowChart") + @ResponseBody + public Object showFlowChart() throws Exception { + HashMap response = new HashMap<>(); + response.put("result", "success"); + PageData condition = this.getPageData(); + condition.put("INSPECTION_ID", condition.getString("ID")); + PageData safety = safetyenvironmentalService.findById(condition); + if (safety == null || safety.size() <= 0) { + response.put("result", "error"); + response.put("errorMessage", "数据异常"); + } + // 1、整理基础数据 + Overseer overseer = new Overseer(); + List nodes = overseer.getSafetyAppWorkFlow(); + // 初始话安全环保发起人、被检查人数据 + nodes.get(0).safety_order(safety); + nodes.stream().forEach(n -> n.safety_creator_util(safety)); + for (NodeApp nodeApp : nodes) { + if (StringUtils.isNotBlank(nodeApp.getActive())) + overseer.setSafetyAppVector(nodeApp.getOrder()); + } + // 2、整理特殊数据 + // 2、1检查人将检查状态 + if ("2,3,4".contains(safety.getString("order"))) { + List inspectors = inspectorService.listAll(condition); + nodes.stream() + .filter(n -> "1".equals(n.getOrder())) + .forEach(n -> n.safety_inspector_util(inspectors)); + } - //隐患指派流程 - if ("3,4".contains(safety.getString("order"))) { - List hiddenz = safetyenvironmentalService.findByyin(condition); - if (hiddenz != null && hiddenz.size() > 0) { - nodes.stream() - .filter(n -> "3".equals(n.getOrder())) - .forEach(n -> n.safety_hiddenz(hiddenz)); - } - } - if ("4".equals(safety.getString("order"))) { - // 2、2 隐患发现人状态 - condition.put("FOREIGN_ID", condition.getString("INSPECTION_ID")); - List hiddens = hiddenService.findByKey(condition); - nodes.stream() - .filter(n -> "4".equals(n.getOrder())) - .forEach(n -> n.safety_hiddenCreator_util(hiddens)); - } - // 2、3 考评人 + //隐患指派流程 + if ("3,4".contains(safety.getString("order"))) { + List hiddenz = safetyenvironmentalService.findByyin(condition); + if (hiddenz != null && hiddenz.size() > 0) { + nodes.stream() + .filter(n -> "3".equals(n.getOrder())) + .forEach(n -> n.safety_hiddenz(hiddenz)); + } + } + if ("4".equals(safety.getString("order"))) { + // 2、2 隐患发现人状态 + condition.put("FOREIGN_ID", condition.getString("INSPECTION_ID")); + List hiddens = hiddenService.findByKey(condition); + nodes.stream() + .filter(n -> "4".equals(n.getOrder())) + .forEach(n -> n.safety_hiddenCreator_util(hiddens)); + } + // 2、3 考评人 // List assess = assessService.findByMainId(condition); // if (assess != null && assess.size() > 0) { // nodes.stream() // .filter(n -> "5".equals(n.getOrder())) // .forEach(n -> n.safety_assessor_util(assess)); // } - response.put("varList", nodes); - response.put("active" ,overseer.getSafetyAppVector()); - return response; - } + response.put("varList", nodes); + response.put("active", overseer.getSafetyAppVector()); + return response; + } } diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index a8b43a61..7aa6e3f4 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -737,31 +737,35 @@ public class SafetyEnvironmentalController extends BaseController { pd.put("loginUserId", Jurisdiction.getUSER_ID()); List varList = safetyenvironmentalService.checkList(page); //列出SafetyEnvironmental列表 /* 针对验收部分特殊处理 */ - for (PageData vector : varList) { - if (StringUtils.isNotBlank(vector.getString("INSPECTION_STATUS")) && - ("6".equals(vector.getString("INSPECTION_STATUS")) - || "5".equals(vector.getString("INSPECTION_STATUS")) -// || "7".equals(vector.getString("INSPECTION_STATUS")) - ) - ) { - PageData condition = new PageData(); - condition.put("FOREIGN_ID", vector.getString("INSPECTION_ID")); - List waffle = hiddenService.findByKey(condition); - if (waffle == null || waffle.isEmpty()) { - continue; - } - Long number = waffle.stream() - .filter(n -> - Jurisdiction.getUSER_ID().equals(n.getString("CREATOR")) && - (StringUtils.isNotBlank(n.getString("STATE")) && ("4".equals(n.getString("STATE")) || "8".equals(n.getString("STATE")))) && - (StringUtils.isBlank(n.getString("FINAL_CHECK")) || "2".equals(n.getString("FINAL_CHECK"))) - ) - .count(); - if (number > 0) { - vector.put("checkout", 1); - } - } - } +// for (PageData vector : varList) { +// if (StringUtils.isNotBlank(vector.getString("INSPECTION_STATUS")) && +// ("6".equals(vector.getString("INSPECTION_STATUS")) +// || "5".equals(vector.getString("INSPECTION_STATUS")) +//// || "7".equals(vector.getString("INSPECTION_STATUS")) +// ) +// ) { +// PageData condition = new PageData(); +// condition.put("FOREIGN_ID", vector.getString("INSPECTION_ID")); +// List waffle = hiddenService.findByKey(condition); +// if (waffle == null || waffle.isEmpty()) { +// continue; +// } +// Long number = waffle.stream() +// .filter(n -> Jurisdiction.getUSER_ID().equals(n.getString("CREATOR")) && +// (StringUtils.isNotBlank(n.getString("STATE")) && +// ("4".equals(n.getString("STATE")) || +// "8".equals(n.getString("STATE")))) && +// (StringUtils.isBlank(n.getString("FINAL_CHECK")) || +// "2".equals(n.getString("FINAL_CHECK"))) +// ) +// .count(); +// if (number > 0) { +// vector.put("checkout", 1); +// } else { +// vector.put("checkout", 0); +// } +// } +// } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java index 7c2072e9..42cce1a9 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java @@ -30,262 +30,269 @@ import java.util.stream.Collectors; @RequestMapping("/safetyenvironmentalinspector") public class SafetyEnvironmentalInspectorController extends BaseController { - @Autowired - private SafetyEnvironmentalInspectorService safetyenvironmentalinspectorService; + @Autowired + private SafetyEnvironmentalInspectorService safetyenvironmentalinspectorService; - @Autowired - private DepartmentService departmentService; + @Autowired + private DepartmentService departmentService; - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @RequiresPermissions("safetyenvironmentalinspector:list") - @ResponseBody - public Object list(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("INSPECTION_USER_ID", Jurisdiction.getUSER_ID()); //检查人ID - Session session = Jurisdiction.getSession(); - User loginUser = (User)session.getAttribute(Const.SESSION_USER); - if(null != loginUser){ - pd.put("supDeparIds",loginUser.getSuperviseDepartId()); - pd.put("roleLevel",loginUser.getRoleLevel()); - pd.put("loginUserId",loginUser.getUSER_ID()); - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @RequiresPermissions("safetyenvironmentalinspector:list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("INSPECTION_USER_ID", Jurisdiction.getUSER_ID()); //检查人ID + Session session = Jurisdiction.getSession(); + User loginUser = (User) session.getAttribute(Const.SESSION_USER); + if (null != loginUser) { + pd.put("supDeparIds", loginUser.getSuperviseDepartId()); + pd.put("roleLevel", loginUser.getRoleLevel()); + pd.put("loginUserId", loginUser.getUSER_ID()); + } + pd.put("loginUserId", Jurisdiction.getUSER_ID()); + page.setPd(pd); + List varList = safetyenvironmentalinspectorService.list(page); //列出SafetyEnvironmentalInspector列表 + for (PageData vector : varList) { + PageData condition = new PageData(); + condition.put("DEPARTMENT_ID", vector.getString("INSPECTED_DEPARTMENT_ID")); + List parent_list = departmentService.getGenealogy(condition); + if (parent_list == null || parent_list.size() < 1) { + String corp_infos = ""; + vector.put("INSPECTED_DEPARTMENT_NAMES", corp_infos); + } else { + String corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-")); + vector.put("INSPECTED_DEPARTMENT_NAMES", corp_infos); + } + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - page.setPd(pd); - List varList = safetyenvironmentalinspectorService.list(page); //列出SafetyEnvironmentalInspector列表 - for (PageData vector: varList) { - PageData condition = new PageData(); - condition.put("DEPARTMENT_ID",vector.getString("INSPECTED_DEPARTMENT_ID")); - List parent_list = departmentService.getGenealogy(condition); - if (parent_list == null || parent_list.size() < 1) { - String corp_infos = ""; - vector.put("INSPECTED_DEPARTMENT_NAMES", corp_infos); - } else { - String corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-")); - vector.put("INSPECTED_DEPARTMENT_NAMES",corp_infos); - } - } - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + /** + * 检查人核实 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/verify") + @RequiresPermissions("safetyenvironmentalinspector:add") + @ResponseBody + public Object verify() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData uBean = safetyenvironmentalinspectorService.findById(pd); + uBean.put("INSPECTION_USER_OPINION", pd.getString("INSPECTION_USER_OPINION")); + uBean.put("INSPECTION_USER_SIGN_TIME", DateUtil.date2Str(new Date())); + uBean.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + uBean.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + uBean.put("INSPECTION_STATUS", pd.getString("INSPECTION_STATUS")); //检查进度状态 + uBean.put("ACTION_USER", Jurisdiction.getName()); //检查进度状态 - /**检查人核实 - * @param - * @throws Exception - */ - @RequestMapping(value="/verify") - @RequiresPermissions("safetyenvironmentalinspector:add") - @ResponseBody - public Object verify() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData uBean= safetyenvironmentalinspectorService.findById(pd); - uBean.put("INSPECTION_USER_OPINION", pd.getString("INSPECTION_USER_OPINION")); - uBean.put("INSPECTION_USER_SIGN_TIME", DateUtil.date2Str(new Date())); - uBean.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - uBean.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - uBean.put("INSPECTION_STATUS", pd.getString("INSPECTION_STATUS")); //检查进度状态 - uBean.put("ACTION_USER", Jurisdiction.getName()); //检查进度状态 + if (StringUtils.isNotBlank(pd.getString("INSPECTION_USER_SIGN_IMG"))) { + MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTION_USER_SIGN_IMG")); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - if (StringUtils.isNotBlank(pd.getString("INSPECTION_USER_SIGN_IMG"))) { - MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTION_USER_SIGN_IMG")); - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - - uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - } - safetyenvironmentalinspectorService.verify(uBean); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + safetyenvironmentalinspectorService.verify(uBean); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @RequiresPermissions("safetyenvironmentalinspector:add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("INSPECTION_INSPECTOR_ID", this.get32UUID()); //主键 + pd.put("ISDELETE", ""); //是否删除(0:有效 1：删除) + pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + safetyenvironmentalinspectorService.save(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @RequiresPermissions("safetyenvironmentalinspector:del") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + safetyenvironmentalinspectorService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @RequiresPermissions("safetyenvironmentalinspector:edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + safetyenvironmentalinspectorService.edit(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @RequiresPermissions("safetyenvironmentalinspector:edit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = safetyenvironmentalinspectorService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @RequiresPermissions("safetyenvironmentalinspector:del") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String[] ArrayDATA_IDS = DATA_IDS.split(","); + pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids + safetyenvironmentalinspectorService.deleteAll(pd); + errInfo = "success"; + } else { + errInfo = "fail"; + } + map.put("result", errInfo); //返回结果 + return map; + } - - - - - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @RequiresPermissions("safetyenvironmentalinspector:add") - @ResponseBody - public Object add() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("INSPECTION_INSPECTOR_ID", this.get32UUID()); //主键 - pd.put("ISDELETE", ""); //是否删除(0:有效 1：删除) - pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - safetyenvironmentalinspectorService.save(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - - /**删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/delete") - @RequiresPermissions("safetyenvironmentalinspector:del") - @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - safetyenvironmentalinspectorService.delete(pd); - map.put("result", errInfo); //返回结果 - return map; - } - - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @RequiresPermissions("safetyenvironmentalinspector:edit") - @ResponseBody - public Object edit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - safetyenvironmentalinspectorService.edit(pd); - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @RequiresPermissions("safetyenvironmentalinspector:edit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = safetyenvironmentalinspectorService.findById(pd); //根据ID读取 - map.put("pd", pd); - map.put("result", errInfo); - return map; - } - - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @RequiresPermissions("safetyenvironmentalinspector:del") - @ResponseBody - public Object deleteAll() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String[] ArrayDATA_IDS = DATA_IDS.split(","); - pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids - safetyenvironmentalinspectorService.deleteAll(pd); - errInfo = "success"; - }else{ - errInfo = "fail"; - } - map.put("result", errInfo); //返回结果 - return map; - } - - /**导出到excel - * @param - * @throws Exception - */ - @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") - public ModelAndView exportExcel() throws Exception{ - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("安全环保检查ID"); //1 - titles.add("检查人"); //2 - titles.add("检查人意见（有异议时必填）"); //3 - titles.add("检查人签字"); //4 - titles.add("检查人签字时间"); //5 - titles.add("是否删除(0:有效 1：删除)"); //6 - titles.add("添加人"); //7 - titles.add("添加时间"); //8 - titles.add("修改人"); //9 - titles.add("修改时间"); //10 - titles.add("企业ID"); //11 - dataMap.put("titles", titles); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID - List varOList = safetyenvironmentalinspectorService.listAll(pd); - List varList = new ArrayList(); - for(int i=0;i dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("安全环保检查ID"); //1 + titles.add("检查人"); //2 + titles.add("检查人意见（有异议时必填）"); //3 + titles.add("检查人签字"); //4 + titles.add("检查人签字时间"); //5 + titles.add("是否删除(0:有效 1：删除)"); //6 + titles.add("添加人"); //7 + titles.add("添加时间"); //8 + titles.add("修改人"); //9 + titles.add("修改时间"); //10 + titles.add("企业ID"); //11 + dataMap.put("titles", titles); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + List varOList = safetyenvironmentalinspectorService.listAll(pd); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varOList.get(i).getString("INSPECTION_ID")); //1 + vpd.put("var2", varOList.get(i).getString("INSPECTION_USER_ID")); //2 + vpd.put("var3", varOList.get(i).getString("INSPECTION_USER_OPINION")); //3 + vpd.put("var4", varOList.get(i).getString("INSPECTION_USER_SIGN_IMG")); //4 + vpd.put("var5", varOList.get(i).getString("INSPECTION_USER_SIGN_TIME")); //5 + vpd.put("var6", varOList.get(i).getString("ISDELETE")); //6 + vpd.put("var7", varOList.get(i).getString("CREATOR")); //7 + vpd.put("var8", varOList.get(i).getString("CREATTIME")); //8 + vpd.put("var9", varOList.get(i).getString("OPERATOR")); //9 + vpd.put("var10", varOList.get(i).getString("OPERATTIME")); //10 + vpd.put("var11", varOList.get(i).getString("CORPINFO_ID")); //11 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } } diff --git a/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java b/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java index 3ec8e98e..001493fb 100644 --- a/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java +++ b/src/main/java/com/zcloud/service/messages/impl/AllMessagesImpl.java @@ -4,6 +4,7 @@ import com.zcloud.entity.messages.PushRecords; import com.zcloud.service.messages.PushMessages; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; /** * 发送站内信 @@ -16,6 +17,7 @@ public class AllMessagesImpl implements PushMessages { private final SmsMessagesImpl smsMessages; @Override + @Transactional(rollbackFor = Exception.class) public void push(PushRecords pushRecords, String userId) throws Exception { insideMessages.push(pushRecords, userId); smsMessages.push(pushRecords, userId); diff --git a/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java b/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java index cf3ae852..603e2db8 100644 --- a/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java +++ b/src/main/java/com/zcloud/service/messages/impl/InsideMessagesImpl.java @@ -6,6 +6,7 @@ import com.zcloud.service.bus.NoticeCorpService; import com.zcloud.service.messages.PushMessages; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; /** * 发送站内信 @@ -17,6 +18,7 @@ public class InsideMessagesImpl implements PushMessages { private final NoticeCorpService noticeCorpService; @Override + @Transactional(rollbackFor = Exception.class) public void push(PushRecords pushRecords, String userId) throws Exception { PageData mes = new PageData(); mes.put("BIANMA", "PUSH_RECORDS"); diff --git a/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java b/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java index 0395d214..51b1e0fa 100644 --- a/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java +++ b/src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java @@ -10,7 +10,6 @@ import com.zcloud.util.UuidUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Map; @@ -21,10 +20,8 @@ public class MessagesServiceImpl implements MessagesService { private final MessagesMapper mapper; private final Map messages; - - + @Override - @Transactional(rollbackFor = Exception.class) public void push(PushRecords pushRecords) throws Exception { // 先记录数据 pushRecords.setId(UuidUtil.get32UUID()); diff --git a/src/main/java/com/zcloud/util/AliSmsToolUtil.java b/src/main/java/com/zcloud/util/AliSmsToolUtil.java index 8847ead8..95ef2958 100644 --- a/src/main/java/com/zcloud/util/AliSmsToolUtil.java +++ b/src/main/java/com/zcloud/util/AliSmsToolUtil.java @@ -117,9 +117,33 @@ public class AliSmsToolUtil { //发短信 Map map = new HashMap(); map.put("infoDetail", "阿斯顿发"); - map.put("phone", "18630363710"); + map.put("phone", "18630387571"); map.put("infoType", "阿三地方"); + map.put("templateCode", "SMS_227260789"); List paramsList = new ArrayList(); + PageData params1 = new PageData(); + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", 2);// 存入上面参数名称所传递的值 + paramsList.add(params1); + + PageData params2 = new PageData(); + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "盲板作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + + PageData params3 = new PageData(); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "生产部门意见");// 存入上面参数名称所传递的值 + paramsList.add(params3); + + PageData params4 = new PageData(); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); SendSmsResponse response = sendSms(map,paramsList); System.out.println("短信接口返回的数据----------------"); System.out.println("Code=" + response.getCode()); diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml index 0635afd4..f786f694 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml @@ -194,7 +194,11 @@ ) GROUP BY f.INSPECTION_ID - ORDER BY FIELD (se.INSPECTION_STATUS , '0','1','2','3','4','5','6','7','8','-1','-2') asc, se.INSPECTION_TIME_START DESC , se.INSPECTION_TIME_END DESC + ORDER BY + FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null,'2','1'), '1','2'), + FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},#{pd.loginUserId},'1'), #{pd.loginUserId}, '1'), + FIELD (se.INSPECTION_STATUS , '0','1','2','3','4','5','6','7','8','-1','-2') , + se.INSPECTION_TIME_START DESC , se.INSPECTION_TIME_END DESC diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml index d765acb9..ac29f748 100644 --- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml +++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml @@ -649,82 +649,111 @@ + + + and ( + isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%') + OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%') + ) + + GROUP BY f.INSPECTION_ID + ORDER BY CASE + WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1 + WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2 + ELSE 3 + END, + field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'), + f.INSPECTION_TIME_END DESC +