diff --git a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java index 3f74e2e..7e4fb6c 100644 --- a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java @@ -79,7 +79,7 @@ public class AppCheckRecordController extends BaseController { @RequestMapping(value = "/add") @ResponseBody @Transactional - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "新增记录") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单排查",instructionsType = "新增记录") public Object add() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java new file mode 100644 index 0000000..74f85b9 --- /dev/null +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java @@ -0,0 +1,535 @@ +package com.zcloud.controller.hiddenDangerCheckStandard; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.check.*; +import com.zcloud.service.corp.CorpInfoService; +import com.zcloud.service.hidden.HiddenService; +import com.zcloud.service.hiddenDangerCheckStandard.*; +import com.zcloud.service.offduty.OffDutyService; +import com.zcloud.service.risk.IdentificationPartsService; +import com.zcloud.service.sms.MSMLoginService; +import com.zcloud.service.sms.SMSManagementService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.ImgFilesService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.SendMessageUtil; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.*; + +/** + * 说明：清单检查记录 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/customCheckRecord") +public class AppCustomCheckRecordController extends BaseController { + + @Autowired + private CustomCheckRecordService customCheckRecordService; + @Autowired + private CustomCheckRecordItemService customCheckRecordItemService; + @Autowired + private CustomItemService customItemService; + @Autowired + private CustomService customService; + + @Autowired + private CustomHiddenService customHiddenService; + @Autowired + private CheckUserService checkuserService; + @Autowired + private CorpInfoService corpinfoService; + @Autowired + private UsersService usersService; + @Autowired + private SMSManagementService smsmanagementService; + @Autowired + private MSMLoginService msmloginService; + @Autowired + private IdentificationPartsService identificationPartsService; + @Autowired + private DepartmentService departmentService; + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private OffDutyService offDutyService; + @Autowired + private SysDateService sysDateService; + @Autowired + private ListDisableTimeService listDisableTimeService; + @Autowired + private SendMessageUtil sendMessageUtil; + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @Transactional + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单排查",instructionsType = "新增记录") + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (pd.get("CHECKRECORD_ID") == null || Tools.isEmpty(pd.getString("CHECKRECORD_ID"))) { + pd.put("CHECKRECORD_ID", this.get32UUID()); // 主键 + pd.put("ISDELETE", "0"); // 是否删除 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 创建时间 + pd.put("FINISHED", "0"); // 是否完成 + pd.put("ISSTATISTICS", "1"); + pd.put("TYPE", "1"); + customCheckRecordService.save(pd); + } + + if (pd.get("ITEMS") != null && !pd.get("ITEMS").equals("")) { + List list = (List) JSON.parse(pd.get("ITEMS").toString()); + for (JSONObject json : list) { + PageData item = new PageData(); + item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 + item = customCheckRecordItemService.findById(item); + if (item == null) { + item = new PageData(); + item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 + item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID")); + PageData chei = customItemService.findById(item); + item.put("ISNORMAL", json.get("ISNORMAL")); + item.put("CHECK_RESULT", json.get("CHECK_RESULT")); + item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + item.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + item.put("CHECK_CATEGORY", chei.get("CHECK_CATEGORY")); + item.put("CHECK_CATEGORY_NAME", chei.get("CHECK_CATEGORY_NAME")); + item.put("CHECK_ITEM", chei.get("CHECK_ITEM")); + item.put("CHECK_ITEM_NAME", chei.get("CHECK_ITEM_NAME")); + item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); + item.put("CHECK_STANDARD", chei.get("CHECK_STANDARD")); + item.put("REFERENCE_BASIS", chei.get("REFERENCE_BASIS")); + item.put("COMMON_ITEM_SORT", chei.get("COMMON_ITEM_SORT")); + item.put("LONGITUDE", pd.get("LONGITUDE")); + item.put("LATITUDE", pd.get("LATITUDE")); + item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + item.put("ISDELETE", pd.get("0")); + item.put("CREATOR_ID", pd.get("USER_ID")); + item.put("CREATOR_NAME", pd.get("CREATOR")); + item.put("CREATE_TIME", DateUtil.date2Str(new Date())); + customCheckRecordItemService.save(item); + } else { + item.put("LONGITUDE", pd.get("LONGITUDE")); + item.put("LATITUDE", pd.get("LATITUDE")); + item.put("ISNORMAL", json.get("ISNORMAL")); + item.put("CHECK_RESULT", json.get("CHECK_RESULT")); + customCheckRecordItemService.edit(item); + } + + } + } + if (pd.get("IDS") != null && !pd.get("IDS").equals("")) { + String ids = pd.get("IDS").toString(); + String ArrayDATA_IDS[] = ids.split(","); + PageData hiddens = new PageData(); + hiddens.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + PageData list = customService.findById(pd); + if(list.getString("TYPE").equals("listType0001")){ + hiddens.put("STATE", "0"); + }else{ + hiddens.put("STATE", "1"); + } + hiddens.put("IDS", ArrayDATA_IDS); + customHiddenService.updateAll(hiddens); + } + map.put("result", errInfo); + return map; + } + + + + + + + + + /** + * 完成检查 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/finish") + @ResponseBody + @Transactional + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "完成检查") + public Object finish() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData sysdate = new PageData(); + sysdate.put("DATE", pd.get("CHECK_TIME")); + sysdate = sysDateService.findByDate(sysdate); + PageData list = customService.findById(pd); + String periodstart = ""; + String periodend = ""; + if(!list.get("TYPE").toString().equals("listType0005")) { + switch (list.get("PERIOD").toString()) { + case "checkPeriod0001": + periodstart = sysdate.getString("DAY_START"); + periodend = sysdate.getString("DAY_END"); + break; + case "checkPeriod0002": + periodstart = sysdate.getString("WEEK_START"); + periodend = sysdate.getString("WEEK_END"); + break; + case "checkPeriod0003": + periodstart = sysdate.getString("XUN_START"); + periodend = sysdate.getString("XUN_END"); + break; + case "checkPeriod0004": + periodstart = sysdate.getString("MONTH_START"); + periodend = sysdate.getString("MONTH_END"); + break; + case "checkPeriod0005": + periodstart = sysdate.getString("QUARTER_START"); + periodend = sysdate.getString("QUARTER_END"); + break; + case "checkPeriod0006": + periodstart = sysdate.getString("YEAR_START"); + periodend = sysdate.getString("YEAR_END"); + break; + case "checkPeriod0007": + periodstart = sysdate.getString("HALFYEAR_START"); + periodend = sysdate.getString("HALFYEAR_END"); + break; + } + pd.put("PERIODSTART", periodstart); + pd.put("PERIODEND", periodend); + } else { + pd.put("PERIODSTART", list.get("START_DATE")); + pd.put("PERIODEND", list.get("END_DATE")); + } + pd.put("FINISHED", "1"); // 是否完成 + customCheckRecordService.edit(pd); + checkuserService.delete(pd); + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List list1 = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : list1) { + if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null + && json.get("USER_ID") != "") { + PageData other = new PageData(); + other.put("CHECKUSER_ID", this.get32UUID()); // 主键 + other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + other.put("DEPARTMENT_NAME", json.get("DEPARTMENT_NAME")); + other.put("USER_NAME", json.get("USER_NAME")); + checkuserService.save(other); + } + } + } + customHiddenService.submit(pd);// 清单内隐患提交 + customHiddenService.submitList(pd);// 其他隐患提交 + List hList = customHiddenService.getHiddenByRecord(pd);// 查询隐患，并发短信 + if (hList.size() > 0) { + for (PageData h : hList) { + if ("2".equals(h.get("RECTIFICATIONTYPE").toString())) {// 给整改人发送短信，暂时先用发验证码代替 + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", h.get("RECTIFICATIONOR"));// 收信人userid + mes.put("templateCode", "SMS_215820677");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "time");// 存入短信模板中的参数名称 + params1.put("value", h.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + + sendMessageUtil.sendMessages(mes, paramsList); + } + } + } + + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/goMapWeui") + @ResponseBody + public Object goMapWeui() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData checkrecord = customCheckRecordService.findById(pd); + List varList = customCheckRecordItemService.listAllForMap(checkrecord); + pd.put("CORPINFO_ID", checkrecord.get("CORPINFO_ID")); + PageData cinfo = corpinfoService.findById(pd); + checkrecord.put("FIND_CHECKRECORD_ID", checkrecord.get("CHECKRECORD_ID")); + List hdList = customHiddenService.listAll(checkrecord); + map.put("varList", varList); + map.put("hdList", hdList); + map.put("pd", pd); + map.put("cinfo", cinfo); + map.put("checkrecord", checkrecord); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param out + * @throws Exception + */ + @RequestMapping(value = "/delete") + // @RequiresPermissions("checkrecord:del") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "删除检查记录") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customCheckRecordService.delete(pd); + map.put("result", errInfo); // 返回结果 + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + // @RequiresPermissions("checkrecord:edit") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "修改") + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customCheckRecordService.edit(pd); + map.put("result", errInfo); + return map; + } + + /** + * 指定辨识部位检查记录 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/recordByIde") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "指定辨识部位检查记录") + public Object recordByIde() 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()); + List varList = customCheckRecordService.recordByIde(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "检查记录列表") + public Object list() 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()); + PageData ls = customService.findById(pd); + + List varList = customCheckRecordService.appdatalist(pd); + map.put("varList", varList); + map.put("ls", ls); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = customCheckRecordService.findById(pd); // 根据ID读取 + PageData users = checkuserService.getCheckUser(pd); + List varList = customCheckRecordItemService.listAll(pd); + pd.put("USERS", users.get("USERS")); + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY",pd.get("CHECKRECORD_ID")); + pd2.put("TYPE","13"); + List qianming = imgFilesService.listAll(pd2); + + + map.put("qianming", qianming); + map.put("varList", varList); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + /** + * 去修改页面获取数据Weui + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEditWeui") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "去修改页面获取数据") + public Object goEditWeui() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String IDENTIFICATION_ID = pd.getString("IDENTIFICATION_ID"); + pd = customCheckRecordService.findById(pd); // 根据ID读取 + PageData users = checkuserService.getCheckUser(pd); + pd.put("IDENTIFICATION_ID", IDENTIFICATION_ID); + List varList = customCheckRecordItemService.listAll(pd); + PageData idData = new PageData(); + idData.put("IDENTIFICATIONPARTS_ID", IDENTIFICATION_ID); + idData = identificationPartsService.findById(idData); + pd.put("USERS", users.get("USERS")); + map.put("varList", varList); + map.put("pd", pd); + map.put("idData", idData); + map.put("result", errInfo); + return map; + } + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + // @RequiresPermissions("checkrecord:del") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "批量删除") + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + customCheckRecordService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); // 返回结果 + return map; + } + + /** + * 导出到excel + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/excel") + @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "导出到excel") + 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("修改人"); // 6 + titles.add("修改时间"); // 7 + titles.add("是否删除"); // 8 + dataMap.put("titles", titles); + List varOList = customCheckRecordService.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("CUSTOM_ID")); // 1 + vpd.put("var2", varOList.get(i).getString("LIST_NAME")); // 2 + vpd.put("var3", varOList.get(i).getString("CORPINFO_ID")); // 3 + vpd.put("var4", varOList.get(i).getString("CREATOR")); // 4 + vpd.put("var5", varOList.get(i).getString("CREATTIME")); // 5 + vpd.put("var6", varOList.get(i).getString("OPERATOR")); // 6 + vpd.put("var7", varOList.get(i).getString("OPERATTIME")); // 7 + vpd.put("var8", varOList.get(i).get("ISDELETE").toString()); // 8 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } + + @RequestMapping(value = "/goMap") + @ResponseBody + public Object goMap() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData checkrecord = customCheckRecordService.findById(pd); + List varList = customCheckRecordItemService.listAllForMap(checkrecord); + PageData cinfo = corpinfoService.findById(pd); + checkrecord.put("FIND_CHECKRECORD_ID", checkrecord.get("CHECKRECORD_ID")); + List hdList = customHiddenService.listAll(checkrecord); + map.put("varList", varList); + map.put("hdList", hdList); + map.put("pd", pd); + map.put("cinfo", cinfo); + map.put("checkrecord", checkrecord); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java index f2a9b90..2366c34 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomController.java @@ -166,7 +166,7 @@ public class AppCustomController extends BaseController { @RequestMapping(value = "/getCheckItem") @ResponseBody @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "获取清单风险点") - public Object getRisk() throws Exception { + public Object getCheckItem() throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -197,7 +197,7 @@ public class AppCustomController extends BaseController { checkmap.put(item.getString("CHECK_ITEM"), checkmap.get(item.getString("CHECK_ITEM")) + 1); } } - map.put("CHECK_ITEM", records.get(0).get("CHECK_ITEM")); + map.put("CHECKRECORD_ID", records.get(0).get("CHECKRECORD_ID")); map.put("checkmap", checkmap); } } @@ -453,7 +453,7 @@ public class AppCustomController extends BaseController { if (pd.getString("TYPE").equals("listType0005")) { if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_XUN", 1);//查询方法和旬一样,直接借用 type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -473,7 +473,7 @@ public class AppCustomController extends BaseController { String cycle = pd.getString("PERIODNAME"); if (cycle.equals("每日")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_DAY", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -486,7 +486,7 @@ public class AppCustomController extends BaseController { } } else if (cycle.equals("每周")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_WEEK", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -501,7 +501,7 @@ public class AppCustomController extends BaseController { //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"))) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_XUN", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -518,7 +518,7 @@ public class AppCustomController extends BaseController { //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"))) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_XUN", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -535,7 +535,7 @@ public class AppCustomController extends BaseController { //20-月底 if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_XUN", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -551,7 +551,7 @@ public class AppCustomController extends BaseController { } } else if (cycle.equals("每月")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_MONTH", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -564,7 +564,7 @@ public class AppCustomController extends BaseController { } } else if (cycle.equals("每季")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_QUARTER", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -577,7 +577,7 @@ public class AppCustomController extends BaseController { } } else if (cycle.equals("半年")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_HALFYEAR", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); @@ -590,7 +590,7 @@ public class AppCustomController extends BaseController { } } else if (cycle.equals("每年")) { PageData type = new PageData(); - type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("CUSTOM_ID", pd.get("CUSTOM_ID")); type.put("IS_YEAR", 1); type.put("FINISHED", '0'); type.put("USER_ID", USER_ID); diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java index 5847678..c6b69d1 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomHiddenController.java @@ -1,1191 +1,1876 @@ package com.zcloud.controller.hiddenDangerCheckStandard; -// -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONObject; -//import com.zcloud.controller.base.BaseController; -//import com.zcloud.entity.Page; -//import com.zcloud.entity.PageData; -//import com.zcloud.logs.LogAnno; -//import com.zcloud.service.check.CheckRecordService; -//import com.zcloud.service.check.ListCheckItemService; -//import com.zcloud.service.check.ListManagerService; -//import com.zcloud.service.corp.CorpInfoService; -//import com.zcloud.service.hidden.HiddenCheckService; -//import com.zcloud.service.hidden.HiddenSchemeService; -//import com.zcloud.service.hidden.HiddenService; -//import com.zcloud.service.sms.MSMLoginService; -//import com.zcloud.service.sms.SMSManagementService; -//import com.zcloud.service.system.DepartmentService; -//import com.zcloud.service.system.ImgFilesService; -//import com.zcloud.service.system.UsersService; -//import com.zcloud.util.*; -//import org.apache.commons.io.FileUtils; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.transaction.annotation.Transactional; -//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 java.io.File; -//import java.text.SimpleDateFormat; -//import java.util.*; -// -///** -// * 说明：隐患 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com -// */ -//@Controller -//@RequestMapping("/app/hidden") -//public class AppHiddenController extends BaseController { -// -// @Autowired -// private HiddenService hiddenService; -// @Autowired -// private ImgFilesService imgFilesService; -// @Autowired -// private UsersService usersService; -// @Autowired -// private ListCheckItemService listcheckitemService; -// @Autowired -// private DepartmentService departmentService; -// @Autowired -// private HiddenSchemeService hiddenSchemeService; -// @Autowired -// private HiddenCheckService hiddenCheckService; -// @Autowired -// private CorpInfoService corpinfoService; -// @Autowired -// private ListManagerService listmanagerService; -// @Autowired -// private CheckRecordService checkrecordService; -// -// @Autowired -// private SMSManagementService smsmanagementService; -// @Autowired -// private MSMLoginService msmloginService; -// @Autowired -// private SendMessageUtil sendMessageUtil; -// @Autowired -// private Smb smb; -// /** -// * app首页获取数量 -// * -// * @param page -// * @throws Exception -// */ -// @RequestMapping(value = "/getCountByUserId") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "首页获取数据") -// public Object getCountByUserId(Page page) throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// Map hidCount = new HashMap<>(); -// pd.put("userId", pd.getString("userId")); // 发现人 -// Integer dzg = 0;// 待整改 1 -// Integer ycq = 0;// 已超期 5 -// Integer dfc = 0;// 待复查 2 -// Integer yys = 0;// 已验收 4 -// Integer dys = 0;// 待验收 3 -// Integer dpc = 0;// 待排查 -// // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 -// if (Tools.notEmpty(pd.get("userId").toString())) { -// pd.put("APPSELFUSERID", pd.get("userId")); -// pd.put("SELFUSERID", pd.get("userId")); -// List rectifiHid = hiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 -// for (int i = 0; i < rectifiHid.size(); i++) { -// PageData rec = rectifiHid.get(i); -// if (null == rec.get("STATE")) { -// continue; -// } -// if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1")) { -// dzg++; -// } -// if (rec.get("STATE").equals("-1")) { -// ycq++; -// } -// } -// -// List checkorHid = hiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 -// for (int i = 0; i < checkorHid.size(); i++) { -// PageData che = checkorHid.get(i); -// if (null == che.get("STATE")) { -// continue; -// } -// if (che.get("STATE").equals("3")) { + +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.logs.LogAnno; +import com.zcloud.service.bus.*; +import com.zcloud.service.check.ListCheckItemService; +import com.zcloud.service.check.ListManagerService; +import com.zcloud.service.corp.CorpInfoService; +import com.zcloud.service.hidden.HiddenCheckService; +import com.zcloud.service.hidden.HiddenSchemeService; +import com.zcloud.service.hidden.HiddenService; +import com.zcloud.service.hiddenApi.HiddenApiService; +import com.zcloud.service.hiddenApi.HiddenCheckApiService; +import com.zcloud.service.hiddenApi.HiddenExamineApiService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenExamineService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenUserService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService; +import com.zcloud.service.inspection.SafetyEnvironmentalService; +import com.zcloud.service.sms.MSMLoginService; +import com.zcloud.service.sms.SMSManagementService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.ImgFilesService; +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; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +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 javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 说明：隐患 作者：luoxiaobao 时间：2021-01-04 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/customHidden") +public class AppCustomHiddenController extends BaseController { + + @Autowired + private CustomHiddenService customHiddenService; + + @Autowired + private CustomHiddenExamineService customHiddenExamineService; //隐患审核 + @Autowired + private CustomHiddenUserService customHiddenUserService; // 隐患相关人员信息 + + + + @Autowired + private ImgFilesService imgFilesService; + @Autowired + private UsersService usersService; + @Autowired + private CustomItemService customItemService; + @Autowired + private DepartmentService departmentService; + @Autowired + private HiddenSchemeService hiddenSchemeService; + @Autowired + private HiddenCheckService hiddenCheckService; + @Autowired + private CorpInfoService corpinfoService; + @Autowired + private ListManagerService listmanagerService; + //@Autowired + //private CheckRecordService checkrecordService; + + @Autowired + private SMSManagementService smsmanagementService; + @Autowired + private MSMLoginService msmloginService; + @Autowired + private HiddenRegionService hiddenRegionService; + @Autowired + private SafetyEnvironmentalService safetyenvironmentalService; + @Autowired + private HiddenMailService hiddenMailService; + @Autowired + private FHlogService FHLOG;//日志记录 + + @Autowired + private NoticeCorpUtil noticeUtil; + @Resource + private ApplicationContext applicationContext; + @Autowired + private HiddenCheckApiService hiddenCheckApiService ; //隐患验收人 + @Autowired + private HiddenApiService hiddenApiService; + @Autowired + private HiddenExamineApiService hiddenExamineApiService; //隐患审核 隐患的审核步骤的人员的信息的记录 + @Autowired + private MessageService messageService; + @Autowired + private Smb smb; + /** + * app首页获取数量 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountByUserId") + @ResponseBody + public Object getCountByUserId(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map hidCount = new HashMap<>(); + pd.put("userId", pd.getString("userId")); // 发现人 + Integer dzg = 0;// 待整改 1 + Integer ycq = 0;// 已超期 5 + Integer dfc = 0;// 待复查 2 + Integer yys = 0;// 已验收 4 + Integer dys = 0;// 待验收 3 + Integer dpc = 0;// 待排查 + Integer dqr = 0;// 待确认 + Integer tscz = 0;//特殊处置1 + Integer yq = 0;//延期2 + // STATE -- 隐患状态 0-未提交 1- 未整改 2-已整改 3-已复查 4-已验收 5-已过期 + if (Tools.notEmpty(pd.get("userId").toString())) { + pd.put("SELFUSERID", pd.get("userId")); + List rectifiHid = customHiddenService.getCountByRectifiCationorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + for (int i = 0; i < rectifiHid.size(); i++) { + PageData rec = rectifiHid.get(i); + if (null == rec.get("STATE")) { + continue; + } + if (rec.get("STATE").equals("1") || rec.get("STATE").equals("-1") || rec.get("STATE").equals("10")) { + dzg++; + } + } + + List checkorHid = customHiddenService.getCountByCheckorId(pd); // 根据人员id获取整改隐患信息 state 1 5 + for (int i = 0; i < checkorHid.size(); i++) { + PageData che = checkorHid.get(i); + if (null == che.get("STATE")) { + continue; + } + if (che.get("STATE").equals("2")) { //原来是3，但是手机端待验收数据与列表数据不对。调整为2 + dys++; + } + } + + List confirmHid = customHiddenService.getCountByConfirmId(pd); // 根据人员id获取整改隐患信息 state 1 5 + for (int i = 0; i < confirmHid.size(); i++) { + PageData che = confirmHid.get(i); + if (null == che.get("STATE")) { + continue; + } + if (che.get("STATE").equals("-2")) { //待确认是-2 + dqr++; + } + } + // userId -> 85437f01be1f4c959f71a850b1d731a1 + List specialHid = customHiddenService.getCountSpecialByhId(pd); // 根据人员id获取特殊处理隐患和延期隐患信息 state 1 5 + for (int i = 0; i < specialHid.size(); i++) { + PageData che = specialHid.get(i); + if (null == che.get("TYPE")) { + continue; + } + if (che.get("TYPE").toString().equals("1")) { //特殊处置1 + tscz++; + } + if (che.get("TYPE").toString().equals("2")) { //延期是2 + yq++; + } + } + + + + + List creatorHid = customHiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 + for (int i = 0; i < creatorHid.size(); i++) { + PageData cre = creatorHid.get(i); + if (null == cre.get("STATE")) { + continue; + } + if (cre.get("STATE").equals("2")) { + dfc++; + } + if (cre.get("STATE").equals("4")) { + yys++; + } +// if(cre.get("STATE").equals("3")) { // dys++; // } -// } -// -// List creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息 -// for (int i = 0; i < creatorHid.size(); i++) { -// PageData cre = creatorHid.get(i); -// if (null == cre.get("STATE")) { -// continue; -// } -// if (cre.get("STATE").equals("2")) { -// dfc++; -// } -// if (cre.get("STATE").equals("4")) { -// yys++; -// } -//// if(cre.get("STATE").equals("3")) { -//// dys++; -//// } -//// if (cre.get("STATE").equals("-1")) { -//// ycq++; -//// } -// } + if (cre.get("STATE").equals("-1")) { + ycq++; + } + } + } + hidCount.put("dys", dys); + hidCount.put("dzg", dzg); + hidCount.put("ycq", ycq); + hidCount.put("dfc", dfc); + hidCount.put("yys", yys); + hidCount.put("dqr", dqr); + hidCount.put("tscz", tscz); + hidCount.put("yq",yq); + + // 待排查数量 + String USER_NAME = pd.getString("USER_NAME"); + String DEPARTMENT_ID = pd.getString("CHECK_DEPARTMENT_ID"); + String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); +// if(pd.getString("IS_MAIN").equals("0")) { + if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) { + ids = ids.substring(0, ids.lastIndexOf(",")); + pd.put("DEPARTMENT_IDS", ids.split(",")); + } else { + pd.put("DEPARTMENT_ID", DEPARTMENT_ID); + } // } -// hidCount.put("dys", dys); -// hidCount.put("dzg", dzg); -// hidCount.put("ycq", ycq); -// hidCount.put("dfc", dfc); -// hidCount.put("yys", yys); -// -// // 待排查数量 -// PageData cpd = new PageData(); -// cpd = usersService.findById(pd); -// pd.put("ISLEADER", cpd.getString("ISLEADER")); -// PageData dept = new PageData(); -// dept.put("DEPARTMENT_ID",pd.getString("CHECK_DEPARTMENT_ID")); -// dept = departmentService.findById(dept); -// pd.put("ISSUPERVISE",dept.getString("ISSUPERVISE")); -// if(dept != null && dept.getString("ISSUPERVISE").equals("1")){ -// pd.put("SUP_DEPARTMENT_ID", dept.getString("DEPARTMENT_ID")); -// }else{ -// pd.put("DEPARTMENT_ID", pd.getString("CHECK_DEPARTMENT_ID")); -// } -// if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ -// String DEPARTMENT_ID = pd.getString("CHECK_DEPARTMENT_ID"); -// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); -// ids=pd.getString("CHECK_DEPARTMENT_ID")+","+ids; //把自己部门插入进去 -// if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { -// ids = ids.substring(0,ids.lastIndexOf(",")); -// pd.put("DEPARTMENT_IDS", ids.split(",")); -// }else { -// pd.put("DEPARTMENT_IDS", DEPARTMENT_ID); -// } -// } -// int wjcNum = 0; -// int yjcNum = 0; -// List varList = listmanagerService.listAll(pd);// 列出ListManager列表 -// for (PageData list : varList) { -// String cycle = list.getString("PERIODNAME"); -// 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) { -// yjcNum++; -// } else { -// wjcNum++; -// } -// } -// hidCount.put("dpc", wjcNum); -// map.put("hidCount", hidCount); -// -// map.put("page", page); -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 新增 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "新增") -// public Object add() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// pd.put("HIDDEN_ID", this.get32UUID()); // 主键 -// pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 -// pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 -// pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 -// pd.put("ISCONFIRM", "0"); // -// if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { -// if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { -// pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 -// pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 -// pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); -//// pd.put("STATE", "4"); -// } else { -//// pd.put("STATE", "1"); -// } -// } -// if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { + int wjcNum = 0; + int yjcNum = 0; + List varList = listmanagerService.listAll(pd);// 列出ListManager列表 + for (PageData list : varList) { + String cycle = list.getString("PERIODNAME"); + 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) { + yjcNum++; + } else { + wjcNum++; + } + } + hidCount.put("dpc", wjcNum); + map.put("hidCount", hidCount); + + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + PageData mes = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("CREATOR", pd.get("CREATOR")); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("ISCONFIRM", "0"); // +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + } + } +// if (pd.get("CUSTOM_ITEM_ID") != null && Tools.notEmpty(pd.get("CUSTOM_ITEM_ID").toString())) { // PageData item = new PageData(); -// item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); -// item = this.listcheckitemService.findById(item); +// item.put("CUSTOM_ITEM_ID", pd.get("CUSTOM_ITEM_ID")); +// item = customItemService.findById(item); // pd.put("RISK_UNIT", item.get("RISKUNITNAME")); // pd.put("IDENTIFICATION", item.get("PARTSNAME")); // pd.put("RISK_DESCR", item.get("RISK_DESCR")); // pd.put("RISK_POSITION", item.get("POSITIONNAME")); // pd.put("LEVEL", item.get("DNAME5")); // } -// hiddenService.save(pd); -// // 清除同检查记录合格图片 -// if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { -// imgFilesService.delete(pd); -// PageData img = new PageData(); -// img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); -// img.put("TYPE", "14"); -//// List imgs = imgFilesService.listAll(img); //根据ID读取 -//// if(imgs != null && imgs.size() > 0) { -//// for(PageData i: imgs) { -//// File file = new File(PathUtil.getProjectpath()+i.getString("FILEPATH")); -//// file.delete(); -//// imgFilesService.delete(i); -//// } -//// } -// -// } -// map.put("result", errInfo); -// map.put("pd", pd); -// return map; -// } -// -// /** -// * 新增 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/appAdd") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "新增") -// public Object appAdd() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// pd.put("HIDDEN_ID", this.get32UUID()); // 主键 -//// pd.put("CREATOR", Jurisdiction.getUSER_ID()); //发现人 -//// pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); -// pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 -// pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 -// pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 -//// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id -// if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { -// if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { -// pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 -// pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 -// pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); -// pd.put("STATE", "4"); -// } else { -// pd.put("STATE", "1"); -// } -// } -// if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) { -// PageData item = new PageData(); -// item.put("LISTCHECKITEM_ID", pd.get("RISKITEM_ID")); -// item = this.listcheckitemService.findById(item); -// pd.put("RISK_UNIT", item.get("RISKUNITNAME")); -// pd.put("IDENTIFICATION", item.get("PARTSNAME")); -// pd.put("RISK_DESCR", item.get("RISK_DESCR")); -// pd.put("RISK_POSITION", item.get("POSITIONNAME")); -// pd.put("LEVEL", item.get("DNAME5")); -// } -// pd.put("ISCONFIRM", "0"); -// hiddenService.save(pd); -// -// // 发短信 -// if ("2".equals(pd.get("RECTIFICATIONTYPE").toString())) {// 给整改人发送短信，暂时先用发验证码代替 -// PageData mes = new PageData(); -// mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid -// mes.put("templateCode", "SMS_215820677");// 短信模板编码 -// mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id -// -// // 参数集合 -// List paramsList = new ArrayList(); -// // 第1个参数 -// PageData params1 = new PageData(); -// params1.put("name", "time");// 存入短信模板中的参数名称 -// params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 -// paramsList.add(params1); -// -// sendMessageUtil.sendMessages(mes, paramsList); -// } -// -// map.put("result", errInfo); -// map.put("pd", pd); -// return map; -// } -// -// public String getCode() { -// String code = ""; -// Random random = new Random(); -// for (int i = 0; i < 6; i++) { -// -// int r = random.nextInt(10); // 每次随机出一个数字（0-9） -// -// code = code + r; // 把每次随机出的数字拼在一起 -// -// } -// return code; -// } -// -// /** -// * 上传图片 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/uploadImg") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "上传图片") -// public Object uploadImg(@RequestParam(value = "FFILE", required = false) MultipartFile file, -// @RequestParam(value = "TYPE", required = false) String TYPE, -// @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY) throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// File tempFile = new File(file.getOriginalFilename()); -// FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); -// if (!FileUpload.isImage(tempFile)) { -// tempFile.delete(); -// map.put("result", "failed"); -// map.put("exception", "上传图片格式不正确，请重新上传"); -// return map; -// } -// if (tempFile.exists()) { -// tempFile.delete(); -// } -// String ffile = DateUtil.getDays(); -//// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 -//// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 -// String fileName = this.get32UUID() -// + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); -// pd.put("IMGFILES_ID", this.get32UUID()); -// pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); -// pd.put("TYPE", TYPE); -// pd.put("FOREIGN_KEY", FOREIGN_KEY); -// imgFilesService.save(pd); -// -// return map; -// } -// -// /**去修改页面获取数据 -// * @param -// * @throws Exception -// */ -// @RequestMapping(value="/goEditWeui") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "去修改页面获取数据") -// public Object goEditWeui() throws Exception{ -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// pd = hiddenService.findById(pd); //根据ID读取 -// PageData pd2 = new PageData(); -// pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); -// pd2.put("TYPE",3); -// List hImgs = imgFilesService.listAll(pd2);//隐患图片 -// pd2.put("TYPE",4); -// List rImgs = imgFilesService.listAll(pd2);//整改图片 -// /*pd2.put("TYPE",5); -// List cImgs = imgFilesService.listAll(pd2);//验收图片 -//*/ //查询整改方案 -// PageData hs = hiddenSchemeService.findByHdId(pd); -// List sImgs = new ArrayList(); -// -// if(hs != null && hs.getString("HIDDENSCHEME_ID") != null) { -// PageData pd3 = new PageData(); -// pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); -// pd3.put("TYPE",8); -// sImgs = imgFilesService.listAll(pd3);//方案图片 -// } -// -// List pImgs = new ArrayList(); -// if("1".equals(pd.get("HAVEPLAN"))) { -// PageData pd3 = new PageData(); -// pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); -// pd3.put("TYPE",22); -// pImgs = imgFilesService.listAll(pd3);//方案图片 -// } -// -// List checkList = hiddenCheckService.listAll(pd); -// if(checkList != null && checkList.size() > 0) { -// PageData pd3 = new PageData(); -// pd3.put("TYPE",5); -// for(PageData check: checkList) { -// pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); -// check.put("cImgs", imgFilesService.listAll(pd3));//验收图片 -// } -// } -// map.put("pd", pd); -// map.put("hs", hs); -// map.put("hImgs", hImgs); -// map.put("rImgs", rImgs); -//// map.put("cImgs", cImgs); -// map.put("sImgs", sImgs); -// map.put("pImgs", pImgs); -// map.put("checkList", checkList); -// -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 获取个人检查数据 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getUserIndexData") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取个人检查数据") -// public Object getUserIndexData() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// map.put("pd", hiddenService.getUserIndexData(pd)); -// map.put("result", errInfo); // 返回结果 -// return map; -// } -// -// /** -// * 获取部门检查数据 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getDeptIndexData") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取部门检查数据") -// public Object getDeptIndexData() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// map.put("pd", hiddenService.getDeptIndexData(pd)); -// map.put("result", errInfo); // 返回结果 -// return map; -// } -// -// /** -// * 获取监管部门检查数据 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getSuperviseDeptIndexData") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取监管部门检查数据") -// public Object getSuperviseDeptIndexData() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// PageData od = departmentService.findById(pd); -// if(od != null){ -// if(od.getString("ISSUPERVISE").equals("1")){ //判断是否是监管部门 -// pd.put("SUP_DEPARTMENT_ID", od.getString("DEPARTMENT_ID")); -// List subdept = departmentService.findBySubId(pd); //查询监管哪些部门 -// ArrayList arr = new ArrayList(); -// for(int i=0;i map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// hiddenService.delete(pd); -// map.put("result", errInfo); // 返回结果 -// return map; -// } -// -// /** -// * 获取清单风险点 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getOtherHidden") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "获取清单风险点") -// public Object getOtherHidden() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// String USER_ID = pd.getString("USER_ID"); -// pd = listmanagerService.findById(pd); -// if (pd.getString("TYPE").equals("listType0005")) { -// if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), -// DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { -// PageData type = new PageData(); -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); -// type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); -// List hiddenList = hiddenService.getOtherHidden(type); -// map.put("hiddenList", hiddenList); -// } -// map.put("result", errInfo); -// return map; -// } -// String cycle = pd.getString("PERIODNAME"); -// PageData type = new PageData(); -// if (cycle.equals("每日")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_DAY", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } else if (cycle.equals("每周")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_WEEK", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } else if (cycle.equals("每旬")) { -// // 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"))) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_XUN", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); -// type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); -// } -// // 11-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"))) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_XUN", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); -// type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); -// } -// // 21-月底 -// if (DateUtil.timeCalendar(new Date(), -// DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), -// DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_XUN", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); -// type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); -// } -// -// } else if (cycle.equals("每月")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_MONTH", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } else if (cycle.equals("每季")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_QUARTER", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } else if (cycle.equals("半年")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_HALFYEAR", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } else if (cycle.equals("每年")) { -// type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); -// type.put("IS_YEAR", 1); -// type.put("STATE", "0"); -// type.put("USER_ID", USER_ID); -// } -// -// List hiddenList = hiddenService.getOtherHidden(type); -// map.put("result", errInfo); -// map.put("hiddenList", hiddenList); -// return map; -// } -// -// /** -// * 修改 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/edit") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "修改") -// public Object edit() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// hiddenService.editInfo(pd); -// map.put("pd", pd); -// map.put("result", errInfo); -// return map; -// } -// -// -// -// /** -// * 修改 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/editRec") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "修改") -// public Object editRec() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// hiddenService.edit(pd); -// -// pd = hiddenService.findById(pd); -// PageData corpinfo = new PageData(); -// corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); -// corpinfo = corpinfoService.findById(pd); -// -// PageData lpd = new PageData(); -// lpd.put("STATE", "OK"); -// lpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); -// int usedCount = msmloginService.msUsedCount(lpd); -// PageData sms = new PageData(); -// sms.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); -// sms.put("ISENABLE", "1"); -// sms.put("SMSCODE", "SMS_215820677"); -// List sList = smsmanagementService.listAll(sms); -// if (corpinfo.getString("ISRECEIVE").equals("1") -// && Integer.parseInt(corpinfo.getString("SMS_COUNT")) - usedCount > 0 && sList.size() > 0) { -// if (!"1".equals(pd.get("RECTIFICATIONTYPE").toString())) { -// -// // 发短信 -// PageData mes = new PageData(); -// mes.put("RECEIVER_ID", pd.get("RECTIFICATIONOR"));// 收信人userid -// mes.put("templateCode", "SMS_215820677");// 短信模板编码 -// mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id -// -// // 参数集合 -// List paramsList = new ArrayList(); -// // 第1个参数 -// PageData params1 = new PageData(); -// params1.put("name", "time");// 存入短信模板中的参数名称 -// params1.put("value", pd.get("RECTIFICATIONDEADLINE"));// 存入上面参数名称所传递的值 -// paramsList.add(params1); -// -// sendMessageUtil.sendMessages(mes, paramsList); -// } -// } -// -// map.put("pd", pd); -// map.put("result", errInfo); -// return map; -// } -// -// @RequestMapping(value = "/upFile") -// @ResponseBody -// public Object upFile(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// if (null != file && !file.isEmpty()) { -// PageData hs = hiddenSchemeService.findById(pd); -// String ffile = DateUtil.getDays(); -//// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 -//// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 -// String fileName = this.get32UUID() -// + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); -// pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); -// hs.put("ISDELETE", "0"); -// hiddenSchemeService.edit(hs); -// } -// -// return map; -// } -// -// /** -// * 整改 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/rectify") -// @ResponseBody -// @Transactional -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "整改") -// public Object rectify() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// PageData corpinfo = new PageData(); -// corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); -// corpinfo = corpinfoService.findById(pd); -// // 给发现人发送短信，提示其进行复查，暂时先用发验证码代替 -//// PageData user = new PageData(); -//// user.put("USER_ID", pd.get("CREATOR")); -//// user = usersService.findById(user); -//// if(user.get("USERNAME") != null && Tools.notEmpty(user.get("USERNAME").toString())) { -//// String phone=user.get("USERNAME").toString(); -//// Map mes = new HashMap(); -//// String code=getCode(); -//// mes.put("phone", phone); -//// mes.put("code", code); -//// SendSmsResponse ssms= AliSmsUtil.sendSms(mes); -//// //System.out.println(ssms.getCode()); -//// if(ssms.getCode().equals("OK")){ -//// map.put("result", "success"); -//// map.put("code",code); -//// }else{ -//// map.put("result", "fail"); -//// map.put("msg", "您的操作过去频繁，请稍后重试!"); -//// } -//// } -// hiddenService.rectify(pd); -// this.hiddenCheckService.delete(pd); -// -// if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { -// List list = (List) JSON.parse(pd.get("OTHER").toString()); -// for (JSONObject json : list) { -// if (json != null && Tools.notEmpty(json.get("DEPARTMENT_ID").toString()) && Tools.notEmpty(json.get("USER_ID").toString())) { -// PageData other = new PageData(); -// other.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 -// other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); -// other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); -// other.put("USER_ID", json.get("USER_ID")); -// other.put("STATUS", "0"); -// hiddenCheckService.save(other); -// -// // 发短信 -// PageData mes = new PageData(); -// mes.put("RECEIVER_ID", json.get("USER_ID"));// 收信人userid -// mes.put("templateCode", "SMS_215800731");// 短信模板编码 -// mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id -// -// // 参数集合 -// List paramsList = new ArrayList(); -// -// sendMessageUtil.sendMessages(mes, paramsList); -// } -// } -// } -// hiddenSchemeService.deleteHd(pd); -// pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 -// if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { -// pd.put("CREATOR", pd.get("USER_ID")); // -// pd.put("CREATTIME", DateUtil.date2Str(new Date())); // -// pd.put("OPERATOR", pd.get("USER_ID")); // -// pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // -// pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 -// pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); // 企业id -// hiddenSchemeService.save(pd); -// -// } -// -// map.put("result", errInfo); -// map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); -// return map; -// } -// -// /** -// * 复查 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/review") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "复查") -// public Object review() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// hiddenService.review(pd); -// // 删除整改照片 -// if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { -// if ("0".equals(pd.get("ISPASS").toString())) { -// PageData pic = new PageData(); -//// List picList = new ArrayList(); -//// pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); -//// pic.put("TYPE", "4"); -//// picList = imgFilesService.listAll(pic); -//// if (picList != null && picList.size() > 0) { -//// for (PageData deletePic : picList) { -//// File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); -//// file.delete(); -//// } -//// } -// imgFilesService.deleteList(pic); -//// List picsList = new ArrayList(); -//// pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); -//// pic.put("TYPE", "8"); -//// picsList = imgFilesService.listAll(pic); -//// if (picsList != null && picsList.size() > 0) { -//// for (PageData deletePic : picsList) { -//// File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); -//// file.delete(); -//// } -//// } -// hiddenSchemeService.deleteHd(pd); -// imgFilesService.deleteList(pic); -// -//// List planPicList = new ArrayList(); -//// pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); -//// pic.put("TYPE", "22"); -//// planPicList = imgFilesService.listAll(pic); -//// if (planPicList != null && planPicList.size() > 0) { -//// for (PageData deletePic : planPicList) { -//// File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); -//// file.delete(); -//// } -//// } -// imgFilesService.deleteList(pic); -// } -// -// } -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 验收 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/check") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "验收") -// public Object check() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// if (pd.get("ISQUALIFIED").equals("1")) { -// PageData pd2 = this.hiddenCheckService.findByHidden(pd); -// pd.put("STATUS", 1); -// pd.put("HIDDENCHECK_ID", pd2.get("HIDDENCHECK_ID")); -// pd.put("DEPARTMENT_ID", pd2.get("DEPARTMENT_ID")); -// pd.put("USER_ID", pd2.get("USER_ID")); -// hiddenCheckService.edit(pd); -// + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list){ + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); + hiddenconUserAdd.put("TYPE","1"); + hiddenconUserAdd.put("IS_MAIN","0"); + customHiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + if(pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")){//判断是否是重大隐患 + PageData userpd = new PageData(); + userpd.put("USER_ID",pd.getString("CREATOR")); + userpd.put("DEPARTMENT_ID",usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID + if(departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")){//判断部门级别是不是班组 + userpd.put("DEPARTMENT_ID",departmentService.findById(userpd).getString("DEPARTMENT_ID")); + if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))){//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + }else { + userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); + pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + mes.put("RECEIVER_ID",usersService.findById(userpd).getString("USER_ID")); // 如果是较大或重大隐患在这里给站内信接收人赋值 + } + }else{ + if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + }{ + userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); + userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + if (Tools.isEmpty(usersService.findById(userpd))) { + map.put("msg", "所在部门未维护部门负责人"); + return map; + }else{ + pd.put("CONFIRM_USER", usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + } + } + } + + } + PageData before = new PageData();// 添加隐患初始信息 + before.put("TYPE","0"); + before.put("STATE","2"); + before.put("HIDDEN_ID",pd.get("HIDDEN_ID")); + before.put("spare1",pd.getString("HIDDENLEVEL")); + before.put("spare2",pd.getString("RECTIFICATIONOR")); + before.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); + before.put("spare4",pd.getString("RECTIFICATIONDEPT")); + before.put("CREATOR", pd.getString("loginUserId")); + before.put("OPERATOR",pd.getString("loginUserId")); + customHiddenExamineService.saveApp(before); + customHiddenService.save(pd); + if(!pd.getString("STATE").equals("0")){ + messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确认",pd.getString("CORPINFO_ID"),pd.getString("CONFIRM_USER"),pd.getString("HIDDEN_ID"), + pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); + } + // 清除同检查记录合格图片 + if(pd.get("CLEARIMG") != null && Tools.notEmpty(pd.get("CLEARIMG").toString()) && "1".equals(pd.get("CLEARIMG").toString())) { + imgFilesService.delete(pd); + PageData img = new PageData(); + img.put("FOREIGN_KEY", pd.get("RECORDITEM_ID")); + img.put("TYPE", "14"); + List imgs = imgFilesService.listAll(img); //根据ID读取 + if(imgs != null && imgs.size() > 0) { + for(PageData i: imgs) { + File file = new File(PathUtil.getProjectpath()+i.getString("FILEPATH")); + file.delete(); + imgFilesService.delete(i); + } + } + + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/appAdd") + @ResponseBody + public Object appAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HIDDEN_ID", this.get32UUID()); // 主键 +// pd.put("CREATOR", Jurisdiction.getUSER_ID()); //发现人 +// pd.put("HIDDENFINDDEPT", Jurisdiction.getDEPARTMENT_ID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 发现时间 + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业id + if (pd.get("RECTIFICATIONTYPE") != null && Tools.notEmpty(pd.get("RECTIFICATIONTYPE").toString())) { + if ("1".equals(pd.get("RECTIFICATIONTYPE").toString())) { // 立即整改 + pd.put("RECTIFICATIONTIME", DateUtil.getDay()); // 整改时间 + pd.put("RECTIFICATIONOR", pd.get("CREATOR")); // 整改人 + pd.put("RECTIFICATIONDEPT", pd.get("HIDDENFINDDEPT")); + pd.put("RECTIFICATIONDEADLINE", DateUtil.date2Str(new Date())); + pd.put("STATE", "-2"); + } else { + pd.put("STATE", "-2"); + } + } + PageData before = new PageData();// 添加隐患初始信息 + before.put("TYPE","0"); + before.put("STATE","2"); + before.put("HIDDEN_ID",pd.get("HIDDEN_ID")); + before.put("spare1",pd.getString("HIDDENLEVEL")); + before.put("spare2",pd.getString("RECTIFICATIONOR")); + before.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); + before.put("spare4",pd.getString("RECTIFICATIONDEPT")); + before.put("CREATOR", pd.getString("loginUserId")); + before.put("OPERATOR",pd.getString("loginUserId")); + customHiddenExamineService.saveApp(before); + if (pd.get("CUSTOM_ITEM_ID") != null && Tools.notEmpty(pd.get("CUSTOM_ITEM_ID").toString())) { + if("2".equals(pd.getString("SOURCE"))){ + PageData item = new PageData(); + item.put("CUSTOM_ITEM_ID", pd.get("CUSTOM_ITEM_ID")); + item = this.customItemService.findById(item); + pd.put("RISK_UNIT", item.get("RISKUNITNAME")); // 风险单元 + pd.put("IDENTIFICATION", item.get("PARTSNAME")); //辨识部位 + pd.put("RISK_DESCR", item.get("RISK_DESCR")); //存在风险 + pd.put("RISK_POSITION", item.get("POSITIONNAME")); // 风险点位置 + pd.put("LEVEL", item.get("DNAME5")); //风险分级 + }else if("6".equals(pd.getString("SOURCE"))){ + // 消防点检 切换为为提交的状态 + // 隐患状态 0-未提交 + // 1- 未整改 2-已整改 + // 3-已复查 4-已验收 + // 7待处理的特殊申请隐患 8已处理的特殊隐患 + // -1-已过期 -2待确认 + // ,5忽略隐患6重大隐患。 + // 7待处理的特殊隐患。8处理的特殊隐患。 + // 10验收打回。11分公司安委会办公室副主任核定。 + // 12分公司安委会办公室副主任核实 + //13港股分公司安委会办公室副主任核定、重大隐患待整改 + //14重大隐患待验收 + //15重大隐患已归档 + //16确认打回 + //100-安全环保检查暂存的隐患 + //101.检查已归档，待指派 + //102.检查已归档，指派中 + pd.put("STATE", "0"); + } + + } + + if("6".equals(pd.getString("SOURCE"))){ + // 消防点检 切换为为提交的状态 + // 隐患状态 0-未提交 + // 1- 未整改 2-已整改 + // 3-已复查 4-已验收 + // 7待处理的特殊申请隐患 8已处理的特殊隐患 + // -1-已过期 -2待确认 + // ,5忽略隐患6重大隐患。 + // 7待处理的特殊隐患。8处理的特殊隐患。 + // 10验收打回。11分公司安委会办公室副主任核定。 + // 12分公司安委会办公室副主任核实 + //13港股分公司安委会办公室副主任核定、重大隐患待整改 + //14重大隐患待验收 + //15重大隐患已归档 + //16确认打回 + //100-安全环保检查暂存的隐患 + //101.检查已归档，待指派 + //102.检查已归档，指派中 + pd.put("STATE", "0"); + } + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list){ + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); + hiddenconUserAdd.put("TYPE","1"); + hiddenconUserAdd.put("IS_MAIN","0"); + customHiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + pd.put("ISCONFIRM", "0"); + if(pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")){//判断是否是重大隐患 + PageData userpd = new PageData(); + userpd.put("USER_ID",pd.getString("CREATOR")); + userpd.put("DEPARTMENT_ID",usersService.findById(userpd).getString("DEPARTMENT_ID"));//获取登录人的部门ID + if(departmentService.findById(userpd).getString("LEVEL").equals("departmentLevel0003")){//判断部门级别是不是班组 + userpd.put("DEPARTMENT_ID",departmentService.findById(userpd).getString("DEPARTMENT_ID")); + if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))){//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + }else { + userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); + if(Tools.notEmpty(usersService.findById(userpd).getString("USER_ID"))){ + pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + }else { + map.put("msg", "未查询到部门负责人"); + } + } + }else{ + if(Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人 + map.put("msg", "所在部门未维护部门负责人"); + return map; + }{ + userpd.put("USER_ID",departmentService.findById(userpd).getString("HEADMAN")); + userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + PageData usersPd = usersService.findById(userpd); + if(usersPd != null && Tools.notEmpty(usersPd.getString("USER_ID"))){ + pd.put("CONFIRM_USER",usersService.findById(userpd).getString("USER_ID"));//通过名字查询用户获取出ID + }else { + map.put("msg", "所在部门未维护部门负责人"); + return map; + } + } + } + } + customHiddenService.save(pd); + // 发送短信 + if(Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")){ + messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确认",pd.getString("CORPINFO_ID"),pd.getString("CONFIRM_USER"),pd.getString("HIDDEN_ID"), + pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + public String getCode() { + String code = ""; + Random random = new Random(); + for (int i = 0; i < 6; i++) { + + int r = random.nextInt(10); // 每次随机出一个数字（0-9） + + code = code + r; // 把每次随机出的数字拼在一起 + + } + return code; + } + + /** + * 上传图片 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/uploadImg") + @ResponseBody + public Object uploadImg(@RequestParam(value = "FFILE", required = false) MultipartFile file, + @RequestParam(value = "TYPE", required = false) String TYPE, + @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + 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; + } + File tempFile = new File(file.getOriginalFilename()); + FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); + if (!FileUpload.isImage(tempFile)) { + tempFile.delete(); + map.put("result", "failed"); + map.put("exception", "上传图片格式不正确，请重新上传"); + return map; + } + if (tempFile.exists()) { + tempFile.delete(); + } + String ffile = DateUtil.getDays(); +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String fileName = this.get32UUID() + + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + PageData pd = new PageData(); + pd.put("IMGFILES_ID", this.get32UUID()); + pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + pd.put("TYPE", TYPE); + pd.put("FOREIGN_KEY", FOREIGN_KEY); + imgFilesService.save(pd); + + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEditWeui") + @ResponseBody + public Object goEditWeui() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = customHiddenService.findById(pd); //根据ID读取 + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE",3); + List hImgs = imgFilesService.listAll(pd2);//隐患图片 + pd2.put("TYPE",4); + List rImgs = imgFilesService.listAll(pd2);//整改图片 + pd2.put("TYPE",102); + List hiddenVideo = imgFilesService.listAll(pd2);//隐患视频 + /*pd2.put("TYPE",5); + List cImgs = imgFilesService.listAll(pd2);//验收图片 +*/ //查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); + + if(hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd3.put("TYPE",8); + sImgs = imgFilesService.listAll(pd3);//方案图片 + } + + List checkList = hiddenCheckService.listAll(pd); + if(checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE",5); + for(PageData check: checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));//验收图片 + } + } + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); +// map.put("cImgs", cImgs); + map.put("sImgs", sImgs); + map.put("checkList", checkList); + map.put("hiddenVideo",hiddenVideo); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() throws Exception { + // 获取IP + HttpServletRequest request = this.getRequest(); + String ip = ""; + if (request.getHeader("x-forwarded-for") == null) { + ip = request.getRemoteAddr(); + }else{ + ip = request.getHeader("x-forwarded-for"); + } + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.delete(pd); + FHLOG.save(pd.getString("loginUserName"), "删除隐患ID:"+pd.getString("HIDDEN_ID"),ip); //记录日志 用户ID 隐患id 时间 + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"1")); + map.put("result", errInfo); // 返回结果 + return map; + } + + /** + * 获取清单风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getOtherHidden") + @ResponseBody + public Object getOtherHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String USER_ID = pd.getString("USER_ID"); + pd = listmanagerService.findById(pd); + if (pd.getString("TYPE").equals("listType0005")) { + if (DateUtil.timeCalendar(new Date(), DateUtil.fomatDateTime(pd.getString("START_DATE") + " 00:00:00"), + DateUtil.fomatDateTime(pd.getString("END_DATE") + " 23:59:59"))) { + PageData type = new PageData(); + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1);// 查询方法和旬一样,直接借用 + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", pd.getString("START_DATE") + " 00:00:00"); + type.put("ENDTIME", pd.getString("END_DATE") + " 23:59:59"); + List hiddenList = customHiddenService.getOtherHidden(type); + map.put("hiddenList", hiddenList); + } + map.put("result", errInfo); + return map; + } + String cycle = pd.getString("PERIODNAME"); + PageData type = new PageData(); + if (cycle.equals("每日")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_DAY", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每周")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_WEEK", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每旬")) { + // 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"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"); + } + // 11-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"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"); + type.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"); + } + // 21-月底 + if (DateUtil.timeCalendar(new Date(), + DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"), + DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_XUN", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + type.put("BEGINTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"); + type.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59"); + } + + } else if (cycle.equals("每月")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_MONTH", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每季")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_QUARTER", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("半年")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_HALFYEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } else if (cycle.equals("每年")) { + type.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); + type.put("IS_YEAR", 1); + type.put("STATE", "0"); + type.put("USER_ID", USER_ID); + } + + List hiddenList = customHiddenService.getOtherHidden(type); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + customHiddenUserService.delete(pd); //删除隐患相关人员 -- 隐患发现人 + if(pd.getString("STATE").equals("16")){//如果状态等于16进入此方法肯定是提交过来的，赋值给待确认 + pd.put("STATE","-2"); + if(Tools.notEmpty(pd.getString("POSITIONDESC"))){customHiddenService.editInformation(pd);} + customHiddenService.editstate(pd); + } + customHiddenService.editInfo(pd); + + List list = (List) JSON.parse(pd.get("other").toString()); // 隐患发现人 + for (JSONObject json : list){ + PageData hiddenconUserAdd = new PageData(); + hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID()); + hiddenconUserAdd.put("HIDDEN_ID",pd.getString("HIDDEN_ID")); + hiddenconUserAdd.put("USER_ID",json.get("USER_ID")); + hiddenconUserAdd.put("TYPE","1"); + hiddenconUserAdd.put("IS_MAIN","0"); + customHiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人 + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editRec") + @ResponseBody + public Object editRec() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.edit(pd); + + pd = customHiddenService.findById(pd); + PageData corpinfo = new PageData(); + corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + corpinfo = corpinfoService.findById(pd); + + PageData lpd = new PageData(); + lpd.put("STATE", "OK"); + lpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + int usedCount = msmloginService.msUsedCount(lpd); + PageData sms = new PageData(); + sms.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + sms.put("ISENABLE", "1"); + sms.put("SMSCODE", "SMS_215820677"); + List sList = smsmanagementService.listAll(sms); + if (corpinfo.getString("ISRECEIVE").equals("1") + && Integer.parseInt(corpinfo.getString("SMS_COUNT")) - usedCount > 0 && sList.size() > 0) { + if (!"1".equals(pd.get("RECTIFICATIONTYPE").toString())) { + + PageData user = new PageData(); + user.put("USER_ID", pd.get("RECTIFICATIONOR")); + user = usersService.findById(user); + if (user.get("USERNAME") != null && Tools.notEmpty(user.get("USERNAME").toString())) { + String phone = user.get("USERNAME").toString(); + Map mes = new HashMap(); + mes.put("phone", phone); + mes.put("templateCode", "SMS_215820677"); + mes.put("time", pd.get("RECTIFICATIONDEADLINE")); + mes.put("type", "1"); + SendSmsResponse ssms = AliSmsUtil.sendSms(mes); + msmloginService.addForAliSmsUtil(mes, pd.getString("CORPINFO_ID"), ssms); + // System.out.println(ssms.getCode()); + if (ssms.getCode().equals("OK")) { + map.put("result", "success"); + } else { + map.put("result", "fail"); + map.put("msg", "您的操作过去频繁，请稍后重试!"); + } + } + if (sList.get(0).getString("ADDRESSEE") != null) { + String[] uid = sList.get(0).getString("ADDRESSEE").split(","); + for (int i = 0; i < uid.length; i++) { + PageData suser = new PageData(); + suser.put("USER_ID", uid[i].toString()); + suser = usersService.findById(suser); + if (suser.get("USERNAME") != null && Tools.notEmpty(suser.get("USERNAME").toString())) { + String uphone = suser.get("USERNAME").toString(); + Map umes = new HashMap(); + umes.put("phone", uphone); + umes.put("templateCode", "SMS_215820677"); + umes.put("time", pd.get("RECTIFICATIONDEADLINE")); + umes.put("type", "1"); + PageData ewpd = new PageData(); + ewpd.put("STATE", "OK"); + ewpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + int ewusedCount = msmloginService.msUsedCount(ewpd); + if (Integer.parseInt(corpinfo.getString("SMS_COUNT")) - ewusedCount > 0) { + SendSmsResponse ussms = AliSmsUtil.sendSms(umes); + msmloginService.addForAliSmsUtil(umes, pd.getString("CORPINFO_ID"), ussms); + } + } + + } + } + + } + } + + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/upFile") + @ResponseBody + public Object upFile(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (null != file && !file.isEmpty()) { + 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; + } + PageData hs = hiddenSchemeService.findById(pd); + String ffile = DateUtil.getDays(); +// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 +// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String fileName = this.get32UUID() + + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); + pd.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName); + hs.put("ISDELETE", "0"); + hiddenSchemeService.edit(hs); + } + + return map; + } + + /** + * 整改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/rectify") + @ResponseBody + @Transactional + public Object rectify() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData corpinfo = new PageData(); + corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); + corpinfo = corpinfoService.findById(pd); + pd.put("STATE","2"); + pd.put("INVESTMENT_FUNDS",pd.getString("INVEST_FUNDS")); + customHiddenService.rectify(pd); + + pd.put("HIDDENSCHEME_ID", this.get32UUID()); // 主键 + hiddenSchemeService.deleteHd(pd); + if (Tools.notEmpty(pd.get("HAVESCHEME").toString())) { + pd.put("CREATOR", pd.get("USER_ID")); // + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // + pd.put("OPERATOR", pd.get("USER_ID")); // + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // + pd.put("ISDELETE", "0"); // 是否删除 1 删除 0未删除 + pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); // 企业id + hiddenSchemeService.save(pd); + } + this.hiddenCheckService.delete(pd); + if(Tools.notEmpty(pd.getString("CHECKOR"))){//判断验收人是否空，否就发送站内信 + PageData mes = new PageData(); + PageData hiddenPd = customHiddenService.findById(pd); + messageService.sendMessageByParameter("HIDDEN_MAIL_004","友情提示：有一条隐患需要验收", + hiddenPd.getString("CORPINFO_ID"),pd.getString("USER_ID"),hiddenPd.getString("HIDDEN_ID"), + hiddenPd.getString("HIDDENDESCR"),"隐患验收","验收","",""); + } + + if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { + List list = (List) JSON.parse(pd.get("OTHER").toString()); + for (JSONObject json : list) { +// if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null +// && json.get("USER_ID") != "") { + if(!Tools.isEmpty(json.get("DEPARTMENT_ID")) && !Tools.isEmpty(json.get("USER_ID")) ){ + PageData other = new PageData(); + other.put("HIDDENCHECK_ID", this.get32UUID()); // 主键 + other.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + other.put("USER_ID", json.get("USER_ID")); + other.put("STATUS", "0"); + hiddenCheckService.save(other); + PageData hiddenPd = customHiddenService.findById(pd); + messageService.sendMessageByParameter("HIDDEN_MAIL_004","友情提示：有一条隐患需要验收", + hiddenPd.getString("CORPINFO_ID"),json.get("USER_ID").toString(),hiddenPd.getString("HIDDEN_ID"), + hiddenPd.getString("HIDDENDESCR"),"隐患验收","验收","",""); + } + } + } + map.put("result", errInfo); + map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID")); + return map; + } + + /** + * 复查 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/review") + @ResponseBody + public Object review() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.review(pd); + // 删除整改照片 + if (pd.get("ISPASS") != null && Tools.notEmpty(pd.get("ISPASS").toString())) { + if ("0".equals(pd.get("ISPASS").toString())) { + PageData pic = new PageData(); + List picList = new ArrayList(); + pic.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pic.put("TYPE", "4"); + picList = imgFilesService.listAll(pic); + if (picList != null && picList.size() > 0) { + for (PageData deletePic : picList) { + File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); + file.delete(); + } + } + imgFilesService.deleteList(pic); + List picsList = new ArrayList(); + pic.put("FOREIGN_KEY", pd.get("HIDDENSCHEME_ID")); + pic.put("TYPE", "8"); + picsList = imgFilesService.listAll(pic); + if (picsList != null && picsList.size() > 0) { + for (PageData deletePic : picsList) { + File file = new File(PathUtil.getProjectpath() + deletePic.getString("FILEPATH")); + file.delete(); + } + } + hiddenSchemeService.deleteHd(pd); + imgFilesService.deleteList(pic); + } + + } + map.put("result", errInfo); + return map; + } + + /** + * 验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/check") + @ResponseBody + public Object check() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (pd.get("ISQUALIFIED").equals("1")) { //验收合格 + List pd2 = (List) this.hiddenCheckService.findByHidden(pd); //获取这个隐患的验收人信息 + if(pd2.size()>0){ + for(PageData checklist: pd2){ + pd.put("STATUS", 1); + pd.put("HIDDENCHECK_ID", checklist.get("HIDDENCHECK_ID")); + pd.put("DEPARTMENT_ID", checklist.get("DEPARTMENT_ID")); + pd.put("USER_ID", checklist.get("USER_ID")); + hiddenCheckService.edit(pd); + } + } + // List checkList = hiddenCheckService.listAll(pd); // for (PageData check : checkList) { // if (check.get("STATUS").toString().equals("0")) { -// map.put("result", errInfo); -// map.put("check", pd); -// return map; +// break; // } // } -// hiddenService.check(pd); -// -// } else { -// PageData hidden = new PageData(); -// hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); -// hidden.put("STATE", 1); -// hidden.put("BUHEGE", 1); -// -// hiddenService.changeState(hidden); -// -// hidden.put("FOREIGN_KEY",pd.get("HIDDEN_ID")); -// hidden.put("TYPE",4); -// List zgimgs = imgFilesService.listAll(hidden); -// hidden.put("TYPE",5); -// List ysimgs = imgFilesService.listAll(hidden); -// hidden.put("TYPE",8); -// List fsimgs = imgFilesService.listAll(hidden); -// hidden.put("TYPE",22); -// List jsimgs = imgFilesService.listAll(hidden); -// List imgs = new ArrayList(); -// imgs.addAll(zgimgs); -// imgs.addAll(ysimgs); -// imgs.addAll(fsimgs); -// imgs.addAll(jsimgs); -// for (PageData img : imgs) { -// smb.deleteFile(img.getString("FILEPATH")); -// imgFilesService.delete(img); -// } + List checkList = hiddenCheckService.listAll(pd); + for (PageData check : checkList) { + if (check.get("STATUS").toString().equals("0")) { + map.put("result", errInfo); + map.put("code","1000"); + map.put("errorMessage","此次检查还有未合格项，不能验收"); + map.put("check", pd); + return map; + } + } + if(Tools.isEmpty(pd.getString("CHECKTIME")) && Tools.notEmpty(pd.getString("CHECK_TIME"))){//用于手机端传验收时间，存隐患表20220920 + pd.put("CHECKTIME",pd.getString("CHECK_TIME")); + } + customHiddenService.check(pd); + if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 + pd.put("ACCEPTSTEP", 6); + List list = customHiddenService.listOtherNotAccept(pd); + PageData inspection = new PageData(); + if (list.size() == 0) { + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "6"); // 已验收 + safetyenvironmentalService.editStatus(inspection); + } + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("CHECKOR")); + inspection.put("HIDDEN_vector",pd.getString("HIDDEN_ID")); + noticeUtil.SE_ThreeStepUtil(inspection); + } + // 隐患验收清理点检处的状态 + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"0")); + } else { + PageData pd2 = new PageData(); //验收打回 + pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pd2.put("TYPE", "4"); + List zgImgs = imgFilesService.listAll(pd2); + for (PageData pageData : zgImgs) { + + imgFilesService.delete(pageData); + if(Tools.notEmpty(pageData.getString("FILEPATH"))) { + smb.deleteFile(pageData.getString("FILEPATH")); + } + + } + /** 删除所有验收人数据。**/ + hiddenCheckApiService.deleteByHiddenId(pd.getString("HIDDEN_ID")); + /** 验收打回 **/ + hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID")); + /** 记录打回 **/ + hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"),pd.getString("CONTENT"),pd.getString("CHECKOR")); + } + hiddenMailService.apphiddneCheckAdopt(pd); + map.put("check", pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + Page page = new Page(); + pd = this.getPageData(); + page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); + page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); + page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); +// String DEPARTMENT_ID = pd.getString("USERDEPT"); +// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); +// if(ids!=null && Tools.notEmpty(ids)) { +// ids = ids.substring(0,ids.lastIndexOf(",")); +// pd.put("DEPARTMENT_IDS", ids.split(",")); // } -// map.put("check", pd); -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 列表 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "列表") -// public Object list() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// Page page = new Page(); -// pd = this.getPageData(); -// page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); -// page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); -// page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); -//// String DEPARTMENT_ID = pd.getString("USERDEPT"); -//// String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); -//// if(ids!=null && Tools.notEmpty(ids)) { -//// ids = ids.substring(0,ids.lastIndexOf(",")); -//// pd.put("DEPARTMENT_IDS", ids.split(",")); -//// } -// String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 -// if (Tools.notEmpty(KEYWORDS)) -// pd.put("KEYWORDS", KEYWORDS.trim()); -// String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 -// if (Tools.notEmpty(HIDDENDESCR)) -// pd.put("HIDDENDESCR", HIDDENDESCR.trim()); -// String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 -// if (Tools.notEmpty(ISQUALIFIED)) -// pd.put("ISQUALIFIED", ISQUALIFIED.trim()); -// String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 -// if (Tools.notEmpty(HIDDENLEVELE)) -// pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); -// String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 -// if (Tools.notEmpty(STARTTIME)) -// pd.put("STARTTIME", STARTTIME.trim()); -// String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 -// if (Tools.notEmpty(ENDTIME)) -// pd.put("ENDTIME", ENDTIME.trim()); -// if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) -// && pd.get("isIndex").toString().equals("1")) { -// pd.put("SELF_USER_ID", pd.get("SELFUSERID")); -// } else { -// pd.put("isIndex", 0); -// } -// pd.put("ISMAIN", "0"); -// String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 -// if (Tools.notEmpty(DISPOSESTATE)) { -// pd.put("DISPOSESTATE", DISPOSESTATE.trim()); -// pd.put("SELFUSERID", pd.get("SELFUSERID")); -// pd.put("USERDEPT", pd.get("USERDEPT")); -// } -// page.setPd(pd); -// List varList = hiddenService.list(page); // 列出Hidden列表 -// map.put("varList", varList); -// map.put("page", page); -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 去修改页面获取数据 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/goEdit") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "去修改页面获取数据") -// public Object goEdit() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// pd = hiddenService.findById(pd); // 根据ID读取 -// PageData pd2 = new PageData(); -// pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); -// pd2.put("TYPE", 3); -// List hImgs = imgFilesService.listAll(pd2);// 隐患图片 -// pd2.put("TYPE", 4); -// List rImgs = imgFilesService.listAll(pd2);// 整改图片 -// /* -// * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 -// */ // 查询整改方案 -// PageData hs = hiddenSchemeService.findByHdId(pd); -// List sImgs = new ArrayList(); -// -// if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { -// PageData pd3 = new PageData(); -// pd3.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); -// pd3.put("TYPE", 8); -// sImgs = imgFilesService.listAll(pd3);// 方案图片 -// } -// -// List pImgs = new ArrayList(); -// if("1".equals(pd.get("HAVEPLAN"))) { -// PageData pd3 = new PageData(); -// pd3.put("FOREIGN_KEY", hs.getString("HIDDEN_ID")); -// pd3.put("TYPE",22); -// pImgs = imgFilesService.listAll(pd3);//方案图片 -// } -// -// List checkList = hiddenCheckService.listAll(pd); -// if (checkList != null && checkList.size() > 0) { -// PageData pd3 = new PageData(); -// pd3.put("TYPE", 5); -// for (PageData check : checkList) { -// pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); -// check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 -// } -// } -// map.put("pd", pd); -// map.put("hs", hs); -// map.put("hImgs", hImgs); -// map.put("rImgs", rImgs); -// map.put("sImgs", sImgs); -// map.put("pImgs", pImgs); -// map.put("checkList", checkList); -// -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 首页统计 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/statistic") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "首页统计") -// public Object statistic() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 -// Date now = new Date(); -// String endDay = sdf.format(now); -// Calendar calendar = Calendar.getInstance(); -// calendar.setTime(now); -// calendar.add(Calendar.DATE, -15); -// String startDay = sdf.format(calendar.getTime()); -// pd.put("START_DAY", startDay); -// pd.put("END_DAY", endDay); -// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); -// pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 -// List nhds = hiddenService.hiddenStatisticsByDay(pd); -// System.out.println(nhds.toString()); -// pd.put("HIDDENLEVEL", "hiddenLevel0002");// 一般隐患 -// List zhds = hiddenService.hiddenStatisticsByDay(pd); -// -// List hdAll = hiddenService.hiddenStatisticsAll(pd); -// map.put("nhds", nhds); -// map.put("zhds", zhds); -// map.put("hdAll", hdAll); -// map.put("result", errInfo); -// return map; -// } -// -// /** -// * 首页统计 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getIndexCount") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "首页统计") -// public Object getIndexCount() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// List varList = hiddenService.getBICount(pd); -// if (varList != null && varList.size() > 0) { -// map.put("total", varList.size()); -// int checked = 0; -// int uncheck = 0; -// for (PageData hidden : varList) { -// if (hidden.get("STATE").toString().equals("4")) { -// 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; -// } -// /** -// * 获取检查记录风险点 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getChcenkHidden") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "获取检查记录风险点") -// public Object getChcenkHidden() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// List hiddenList = hiddenService.getOtherHidden(pd); -// map.put("result", errInfo); -// map.put("hiddenList", hiddenList); -// return map; -// } -// -// /** -// * 获取检查记录风险点 -// * -// * @param -// * @throws Exception -// */ -// @RequestMapping(value = "/getHiddenByCorp") -// @ResponseBody -// @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "获取检查记录风险点") -// public Object getHiddenByCorp() throws Exception { -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// List hiddenList = hiddenService.listAllRoll(pd); -// map.put("result", errInfo); -// map.put("hiddenList", hiddenList); -// return map; -// } -//} + String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) + pd.put("KEYWORDS", KEYWORDS.trim()); + String HIDDENDESCR = pd.getString("HIDDENDESCR"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENDESCR)) + pd.put("HIDDENDESCR", HIDDENDESCR.trim()); + String ISQUALIFIED = pd.getString("ISQUALIFIED"); // 关键词检索条件 + if (Tools.notEmpty(ISQUALIFIED)) + pd.put("ISQUALIFIED", ISQUALIFIED.trim()); + String HIDDENLEVELE = pd.getString("HIDDENLEVELE"); // 关键词检索条件 + if (Tools.notEmpty(HIDDENLEVELE)) + pd.put("HIDDENLEVELE", HIDDENLEVELE.trim()); + String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件 + if (Tools.notEmpty(STARTTIME)) + pd.put("STARTTIME", STARTTIME.trim()); + String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件 + if (Tools.notEmpty(ENDTIME)) + pd.put("ENDTIME", ENDTIME.trim()); + if (pd.get("isIndex") != null && Tools.notEmpty(pd.get("isIndex").toString()) + && pd.get("isIndex").toString().equals("1")) { + pd.put("SELF_USER_ID", pd.get("SELFUSERID")); + } + pd.put("ISMAIN", "0"); + String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 + if (Tools.notEmpty(DISPOSESTATE)) { + pd.put("DISPOSESTATE", DISPOSESTATE.trim()); + pd.put("SELFUSERID", pd.get("SELFUSERID")); + pd.put("USERDEPT", pd.get("USERDEPT")); + } + page.setPd(pd); + List varList = customHiddenService.list(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); + map.put("varList", varList); + map.put("page", page); + 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 = customHiddenService.findById(pd); // 根据ID读取 + if(pd.get("CONFIRM_USER")!=null || pd.getString("CONFIRM_USER").equals("undefined")){ + pd.put("USER_ID",pd.getString("CONFIRM_USER")); + PageData user = usersService.findById(pd); + if(user!=null){ + pd.put("confirmDeptId",user.getString("DEPARTMENT_ID")); + pd.put("conUserId",pd.getString("CONFIRM_USER")); + } + } + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd2.put("TYPE", 3); + List hImgs = imgFilesService.listAll(pd2);// 隐患图片 + pd2.put("TYPE", 4); + List rImgs = imgFilesService.listAll(pd2);// 整改图片 + /* + * pd2.put("TYPE",5); List cImgs = imgFilesService.listAll(pd2);//验收图片 d770367816c34f53bf22177da3965f6c + */ // 查询整改方案 + PageData hs = hiddenSchemeService.findByHdId(pd); + List sImgs = new ArrayList(); + + if (hs != null && hs.getString("HIDDENSCHEME_ID") != null) { + PageData pd3 = new PageData(); + pd3.put("FOREIGN_KEY", pd.getString("HIDDEN_ID")); + pd3.put("TYPE", 8); + sImgs = imgFilesService.listAll(pd3);// 方案图片 + + + PageData pd31 = new PageData(); + pd31.put("FOREIGN_KEY", hs.getString("HIDDENSCHEME_ID")); + pd31.put("TYPE", 8); + List sImgs2 = imgFilesService.listAll(pd31);// 方案图片 + sImgs.addAll(sImgs2); + } + + List checkList = hiddenCheckService.listAll(pd); + if (checkList != null && checkList.size() > 0) { + PageData pd3 = new PageData(); + pd3.put("TYPE", 5); + for (PageData check : checkList) { + pd3.put("FOREIGN_KEY", check.get("HIDDENCHECK_ID")); + check.put("cImgs", imgFilesService.listAll(pd3));// 验收图片 + } + } + List hiddenExa = customHiddenExamineService.listAllByHiddenId(pd.getString("HIDDEN_ID")); // 隐患流程信息 + List repulsecause = customHiddenExamineService.findByHiddenId(pd);//确认人打回信息 + for (PageData pageData :hiddenExa){ + if("0".equals(pageData.getString("TYPE"))){ + pd.put("editUserName",pageData.get("editUserName")); + pd.put("editDeptName",pageData.get("editDeptName")); + pd.put("editLevelName",pageData.get("editLevelName")); + pd.put("editRectificationDeadline",pageData.get("spare3")); + } + } + map.put("hiddenExa", hiddenExa); // //特殊审批信息 + List hiddenFindPeople = customHiddenUserService.listAll(pd);// 隐患相关人员信息 --隐患发现人 + map.put("pd", pd); + map.put("hs", hs); + map.put("hImgs", hImgs); + map.put("rImgs", rImgs); + map.put("hiddenVideo", imgFilesService.getListByKeyAndType(pd.getString("HIDDEN_ID"),"102"));// 隐患视频 +// map.put("cImgs", cImgs); + map.put("sImgs", sImgs); + map.put("hiddenFindPeople", hiddenFindPeople); // 隐患相关人员信息 + map.put("checkList", checkList); + map.put("repulsecause",repulsecause); + map.put("result", errInfo); + return map; + } + + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/statistic") + @ResponseBody + public Object statistic() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式 + Date now = new Date(); + String endDay = sdf.format(now); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(now); + calendar.add(Calendar.DATE, -15); + String startDay = sdf.format(calendar.getTime()); + pd.put("START_DAY", startDay); + pd.put("END_DAY", endDay); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("HIDDENLEVEL", "hiddenLevel0001");// 一般隐患 + List nhds = customHiddenService.hiddenStatisticsByDay(pd); + System.out.println(nhds.toString()); + pd.put("HIDDENLEVEL", "hiddenLevel0002");// 一般隐患 + List zhds = customHiddenService.hiddenStatisticsByDay(pd); + + List hdAll = customHiddenService.hiddenStatisticsAll(pd); + map.put("nhds", nhds); + map.put("zhds", zhds); + map.put("hdAll", hdAll); + map.put("result", errInfo); + return map; + } + + /** + * 首页统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getIndexCount") + @ResponseBody + public Object getIndexCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = customHiddenService.getBICount(pd); + if (varList != null && varList.size() > 0) { + 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("2")) { + 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; + } + /** + * 获取检查记录风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getChcenkHidden") + @ResponseBody + public Object getChcenkHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List hiddenList = customHiddenService.getOtherHidden(pd); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } + /** + * 列表 隐患列表接口 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listGwj") + @ResponseBody + public Object listGwj(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(Tools.isEmpty(pd.get("loginUserId"))){ // 由我确认的隐患 + map.put("varList", new ArrayList<>()); + map.put("page", page); + map.put("result", "Error"); + map.put("msg", "未找到登录人信息，请联系管理员"); + } + /* + 1. 让我确认的信息 -- 确认人是我的隐患 + + 2. 让我整改的隐患 + + 3.让我验收的隐患 + */ + if("0".equals(pd.getString("stateConfirm"))){ //确认的隐患 stateConfirm：0全部 。1未确认的，2已确认的 + pd.put("CONFIRM_USER",pd.get("loginUserId")); + } + if("0".equals(pd.getString("stateRectify"))){ //我整改的隐患 + pd.put("RECTIFICATIONOR",pd.get("loginUserId")); + pd.put("STATE","1"); + } + if (!Tools.isEmpty(pd.get("corpinfoId"))){ + pd.put("CORPINFO_ID",pd.getString("corpinfoId")); + } + page.setPd(pd); + List varList = customHiddenService.listGwj(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); //添加发现人 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 列表 隐患列表接口 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listIgnore") + @ResponseBody + public Object listIgnore(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(Tools.isEmpty(pd.get("loginUserId"))){ // 由我确认的隐患 + map.put("varList", new ArrayList<>()); + map.put("page", page); + map.put("result", "Error"); + map.put("msg", "未找到登录人信息，请联系管理员"); + } + pd.put("CONFIRM_USER",pd.getString("loginUserId")); + if (!Tools.isEmpty(pd.get("corpinfoId"))){ + pd.put("CORPINFO_ID",pd.getString("corpinfoId")); + } + page.setPd(pd); + List varList = customHiddenService.listIgnore(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); //添加发现人 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * --确认隐患 + * + * @throws Exception + */ + @RequestMapping(value = "/confirm") + @ResponseBody + public Object confirmUpdate() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if("1".equals(pd.get("isEmis"))){ + errInfo = customHiddenService.goEmis(pd); + if("success".equals(errInfo)){ + map.put("result", errInfo); + return map; + }else{ + map.put("result", "errInfo"); + map.put("msg", errInfo); + return map; + } + + } + PageData editHidden = new PageData(); + if("hiddenLevel1001".equals(pd.getString("HIDDENLEVEL"))){ // 如果是忽略隐患 + editHidden.put("STATE","5"); + applicationContext.publishEvent(new DeviceHiddenEvent(new Object(),pd.getString("HIDDEN_ID"),"0")); + }else if("hiddenLevel2002".equals(pd.getString("HIDDENLEVEL"))){ // 如果是是重大隐患 + editHidden.put("STATE","6"); + }else { + editHidden.put("STATE","1"); + } + + editHidden.put("CONFIRM_USER",pd.get("USER_ID")); // 隐患确认人 + editHidden.put("CONFIRM_TIME",DateUtil.date2Str(new Date())); // 隐患确认时间 + editHidden.put("RECTIFICATIONDEPT",pd.get("RECTIFICATIONDEPT")); // 整改部门 + editHidden.put("RECTIFICATIONOR",pd.get("RECTIFICATIONOR")); // 整改人 + editHidden.put("RECTIFICATIONDEADLINE",pd.get("RECTIFICATIONDEADLINE")); // 整改期限 + editHidden.put("HIDDENLEVEL",pd.get("HIDDENLEVEL")); // 隐患级别 + editHidden.put("HIDDEN_ID",pd.get("HIDDEN_ID")); // 隐患id + PageData hidden = customHiddenService.findById(pd); + if("1".equals(hidden.get("RECTIFICATIONTYPE").toString())){ + editHidden.put("STATE","4"); + } + PageData exaPd = new PageData(); // 添加隐患确认信息 + exaPd.put("TYPE","4"); + exaPd.put("STATE","2"); + exaPd.put("HIDDEN_ID",hidden.get("HIDDEN_ID")); + exaPd.put("spare1",pd.getString("HIDDENLEVEL")); + exaPd.put("spare2",pd.getString("RECTIFICATIONOR")); + exaPd.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); + exaPd.put("spare4",pd.getString("RECTIFICATIONDEPT")); + exaPd.put("CREATOR", pd.getString("loginUserId")); + exaPd.put("OPERATOR",pd.getString("loginUserId")); + customHiddenExamineService.saveApp(exaPd); + if("1".equals(hidden.get("RECTIFICATIONTYPE").toString())){ //确认时判断是否是立即整改 + if(pd.getString("isTrue").equals("1")){ + editHidden.put("STATE","4"); + editHidden.put("CHECKOR",hidden.getString("CREATOR")); + }else { + editHidden.put("STATE","1"); + editHidden.put("RECTIFICATIONTYPE","2"); + } + + } + customHiddenService.confirmHidden(editHidden); // 隐患确认 + if(Tools.notEmpty(pd.getString("RECTIFICATIONOR")) && !hidden.getString("RECTIFICATIONTYPE").equals("1")){ + messageService.sendMessageByParameter("HIDDEN_MAIL_002","友情提示：有一条隐患需要整改", + hidden.getString("CORPINFO_ID"),pd.getString("USER_ID"),hidden.getString("HIDDEN_ID"), + hidden.getString("HIDDENDESCR"),"隐患整改","整改","",""); + }else if("1".equals(hidden.getString("RECTIFICATIONTYPE"))){ + messageService.sendMessageByParameter("HIDDEN_MAIL_003","友情提示：有一条隐患已验收", + hidden.getString("CORPINFO_ID"),pd.getString("USER_ID"),hidden.getString("HIDDEN_ID"), + hidden.getString("HIDDENDESCR"),"通过","整改","",""); + } + List repulsecause = customHiddenExamineService.findByHiddenId(pd);//确认人打回信息 + if(repulsecause.size()>0){ + for(PageData IDS:repulsecause){ + PageData repulse = new PageData(); + repulse.put("HIDDENEXAMINE_ID",IDS.getString("HIDDENEXAMINE_ID")); + customHiddenExamineService.editrepulse(repulse); //有打回记录的隐患信息，把spare5改成1。确认通过后就不显示出来 + } + } + + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + + /** + * 获取隐患部位列表(菜单管理) + * @return + */ + @RequestMapping(value="/getTreehiddenRegionListAll") + @ResponseBody + public Object getTreehiddenRegionListAll()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + JSONArray arr = JSONArray.fromObject(hiddenRegionService.listAll("0" , pd.getString("CORPINFO_ID"))); + String json = arr.toString(); + json = json.replaceAll("HIDDENREGION_ID", "id") + .replaceAll("PARENT_ID", "pId") + .replaceAll("HIDDENREGION", "name") + .replaceAll("subhiddenRegion", "children") + .replaceAll("hashiddenRegion", "checked") + .replaceAll("HIDDENREGION_URL", "url"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } + + /** + * 获取部门检查数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getDeptIndexData") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取部门检查数据") + public Object getDeptIndexData() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("pd", customHiddenService.getDeptIndexData(pd)); + map.put("result", errInfo); // 返回结果 + return map; + } + + /** + * 获取检查记录风险点 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getHiddenByCorp") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "隐患",instructionsOperate = "隐患",instructionsType = "获取检查记录风险点") + public Object getHiddenByCorp() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List hiddenList = customHiddenService.listAllRoll(pd); + map.put("result", errInfo); + map.put("hiddenList", hiddenList); + return map; + } + + /** + * 获取监管部门检查数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getSuperviseDeptIndexData") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "首页",instructionsOperate = "首页",instructionsType = "获取监管部门检查数据") + public Object getSuperviseDeptIndexData() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData od = departmentService.findById(pd); + if(od != null){ + if(od.getString("ISSUPERVISE").equals("1")){ //判断是否是监管部门 + pd.put("SUP_DEPARTMENT_ID", od.getString("DEPARTMENT_ID")); + List subdept = departmentService.findBySubId(pd); //查询监管哪些部门 + ArrayList arr = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + map.put("pd", customHiddenService.getUserIndexData(pd)); + map.put("result", errInfo); // 返回结果 + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listForSafetyEnvironmental") + @ResponseBody + public Object listForSafetyEnvironmental(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + page.setPd(pd); + + List varList = customHiddenService.listForSafetyEnvironmental(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); + //对于超期数据状态的 + varList.stream() + .filter(n -> "1".equals(n.getString("STATE"))) + .forEach(n -> { + String limit_date = n.getString("RECTIFICATIONDEADLINE"); + if (StringUtils.isNotBlank(limit_date)) { + if ("1".equals(n.getString("RECTIFICATIONTYPE"))) { + if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) + n.put("OVERTIME_FLAG", "1"); + } else { + if (DateUtil.fomatDate(limit_date).getTime() < new Date().getTime()) + n.put("OVERTIME_FLAG", "2"); + } + } + }); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + /** + * 安全环保检查隐患指派 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/assign") + @ResponseBody + public Object assign() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// PageData hidden = customHiddenService.findById(pd); + pd.put("STATE", pd.getString("HIDDEN_STATUS")); + List list = customHiddenService.listOtherNotAssign(pd); + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("OPERATOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + if ("-2".equals(pd.getString("HIDDEN_STATUS"))) { + pd.put("ISCONFIRM", "0"); // + pd.put("CONFIRM_TIME",DateUtil.date2Str(new Date())); + if (list.size() == 0) { + inspection.put("INSPECTION_STATUS", "5"); // 指派完成 + } else { + inspection.put("INSPECTION_STATUS", "4"); // 指派中 + } + safetyenvironmentalService.editStatus(inspection); + } + customHiddenService.assign(pd); + if(Tools.notEmpty(pd.getString("CONFIRM_USER"))){ + messageService.sendMessageByParameter("HIDDEN_MAIL_001","友情提示：有一条隐患需要确定",pd.getString("CORPINFO_ID"), + pd.getString("CONFIRM_USER"),"", + pd.getString("HIDDENDESCR"),"隐患确认","确认","",""); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 安全环保检查验收 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/finalcheck") + @ResponseBody + public Object finalcheck() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.finalcheck(pd); + if ("1".equals(pd.get("FINAL_CHECK").toString())) { + if (Tools.notEmpty(pd.getString("INSPECTION_ID"))) { //安全环保检查验收 + pd.put("ACCEPTSTEP", 7); + List list = customHiddenService.listOtherNotAccept4pc(pd); + if (list.size() == 0) { + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "7"); // 已验收 + safetyenvironmentalService.editStatus(inspection); + } + } + } else { + PageData pd2 = new PageData(); + pd2.put("FOREIGN_KEY", pd.get("HIDDEN_ID")); + pd2.put("TYPE", "4"); + List zgImgs = imgFilesService.listAll(pd2); + for (PageData pageData : zgImgs) { + + imgFilesService.delete(pageData); + if(Tools.notEmpty(pageData.getString("FILEPATH"))) { + smb.deleteFile(pageData.getString("FILEPATH")); + } + } + PageData hidden = new PageData(); + hidden.put("HIDDEN_ID", pd.get("HIDDEN_ID")); + hidden.put("STATE", "101"); //修改隐患表状态为验收打回 + customHiddenService.changeState(hidden); + + PageData inspection = new PageData(); + inspection.put("INSPECTION_ID", pd.getString("INSPECTION_ID")); + inspection.put("OPERATOR", pd.getString("FINAL_CHECKOR")); + inspection.put("OPERATTIME", DateUtil.date2Str(new Date())); + inspection.put("INSPECTION_STATUS", "3"); // 安全环保检查打回到归档，隐患待指派 + safetyenvironmentalService.editStatus(inspection); + + inspection.put("SENDER_ID",pd.getString("FINAL_CHECKOR")); + inspection.put("SENDER_NAME",pd.getString("FINAL_CHECKOR")); + noticeUtil.SE_Repulse(inspection); + // customHiddenExamineService.deleteByHiddenId(pd); //如果验收打回删除隐患相关信息 +// hidden.put("HIDDENEXAMINE_ID",this.get32UUID()); +// hidden.put("EXAMINE",pd.get("CONTENT"));//打回意见 +// hidden.put("CREATOR",pd.getString("FINAL_CHECKOR")); +// hidden.put("CREATTIME",DateUtil.date2Str(new Date())); +// hidden.put("OPERATOR",pd.getString("FINAL_CHECKOR")); +// hidden.put("OPERATTIME",DateUtil.date2Str(new Date())); +// hidden.put("TYPE",3);//验收打回 +// hidden.put("STATE",-1);//验收打回变成初始状态-1 +// customHiddenExamineService.saveApp(hidden); + } + map.put("check", pd); + map.put("result", errInfo); + return map; + } + + /** + * 隐患确认打回 + * @param + * @throws Exception + */ + @RequestMapping(value = "/repulseHidden") + //// @RequiresPermissions("hidden:edit") + @ResponseBody + public Object repulseHidden() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + customHiddenService.editstate(pd); + pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATTIME",DateUtil.date2Str(new Date())); + customHiddenExamineService.saverepulse(pd); + hiddenMailService.reject(pd); + map.put("result",errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listV2") + @ResponseBody + public Object listV2() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + Page page = new Page(); + pd = this.getPageData(); + page.setCurrentPage(Integer.parseInt(pd.get("currentPage").toString())); + page.setShowCount(Integer.parseInt(pd.get("showCount").toString())); + page.setTotalResult(Integer.parseInt(pd.get("totalResult").toString())); + + + pd.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + pd.put("queryUserId",pd.getString("SELFUSERID")); + page.setPd(pd); + List varList = customHiddenService.getListForTianzhang(page); // 列出Hidden列表 + varList = customHiddenUserService.getHiddebFind(varList); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 判断登录人是否已经验收 + * @param + * @throws Exception + */ + @RequestMapping(value = "/isChek") + //// @RequiresPermissions("hidden:edit") + @ResponseBody + public Object isChek() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List checkList = (List) hiddenCheckService.findByHidden(pd); + if(checkList.size()>0){ + for(PageData arr:checkList){ + if(arr.getString("STATUS").equals("1")){ + map.put("istrue","1"); + } else if (arr.getString("STATUS").equals("0")){ + map.put("istrue","0"); + } + } + } + map.put("result",errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.java new file mode 100644 index 0000000..89ebfcf --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.java @@ -0,0 +1,80 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：隐患审核 + * 作者：luoxiaobao + * 时间：2022-04-14 + * 官网：www.zcloudchina.com + */ +public interface CustomHiddenExamineMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**修改确认打回的信息 + * @param pd + * @throws Exception + */ + void editrepulse(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + /**修改 + * @param pd + * @throws Exception + */ + void updateBySpecial(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List listAndHiddendatalistPage(Page page); + public PageData findByIdAndHidden(PageData pd); + + List findByHiddenId(PageData pd); + + void deleteByHiddenId(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.java new file mode 100644 index 0000000..fb2bed8 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：隐患 相关人员信息 + * 作者：luoxiaobao + * 时间：2022-04-22 + * 官网：www.zcloudchina.com + */ +public interface CustomHiddenUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + List listAllUser(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 根据隐患id删除 + * @param pd + */ + void deleteByHidden (PageData pd); + + List verifylist(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenExamineService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenExamineService.java new file mode 100644 index 0000000..f68c8c3 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenExamineService.java @@ -0,0 +1,121 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：隐患审核 + * 作者：luoxiaobao + * 时间：2022-04-14 + * 官网：www.zcloudchina.com + */ +public interface CustomHiddenExamineService { + + /**新增 + * @param pd + * @throws Exception + */ + public PageData save(PageData pd)throws Exception; + PageData appSave(PageData pd) throws Exception; + + + /**手机端打回保存 + * @param pd + * @throws Exception + */ + public void saverepulse(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**修改确认打回的信息 + * @param pd + * @throws Exception + */ + public void editrepulse(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**查询隐患确认打回的数据 + * @param pd + * @throws Exception + */ + public List findByHiddenId(PageData pd)throws Exception; + + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByHiddenId(String hiddenId)throws Exception; + + + /** 特殊审核通过的时候使用，存意见 和 附件 + * @param pd + * @throws Exception + */ + public void updateBySpecial(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listAndHidden(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByIdAndHidden(PageData pd)throws Exception; + + public PageData saveApp(PageData pd)throws Exception; + + /**通过隐患id删除数据 + * @param pd + * @throws Exception + */ + public void deleteByHiddenId(PageData pd)throws Exception; + + /** + * pc的隐患确认信息初始化 + * @param pd + * @return + * @throws Exception + */ + public PageData saveConfirm(PageData pd)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenUserService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenUserService.java new file mode 100644 index 0000000..51862d5 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomHiddenUserService.java @@ -0,0 +1,95 @@ +package com.zcloud.service.hiddenDangerCheckStandard; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：隐患 相关人员信息 + * 作者：luoxiaobao + * 时间：2022-04-22 + * 官网：www.zcloudchina.com + */ +public interface CustomHiddenUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 添加隐患整改人 + * @throws Exception + */ + public void saveRectificationo (String userIds ,String hiddenId ,String type)throws Exception; + + /** + * 根据隐患ids获取隐患相关人员 + * @param hiddenIds + * @return + * @throws Exception + */ + public List getHiddenUserByHiddenIds (String [] hiddenIds ,String type) throws Exception; + + /** + * 获取隐患发现人 + * @param varList + * @return + * @throws Exception + */ + public List getHiddebFind (List varList) throws Exception; + + /** + * 获取安全管理部门责任人 + * @param pd + * @return + * @throws Exception + */ + public List verifylist(PageData pd) throws Exception; + + /** + * 根据隐患id删除 + * @param pd + * @throws Exception + */ + void deleteByHidden (PageData pd) throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenExamineServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenExamineServiceImpl.java new file mode 100644 index 0000000..f2b5d4b --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenExamineServiceImpl.java @@ -0,0 +1,190 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.HiddenExamineMapper; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenExamineMapper; +import com.zcloud.service.bus.HiddenExamineService; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenExamineService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.UuidUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * 说明：隐患审核 + * 作者：luoxiaobao + * 时间：2022-04-14 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomHiddenExamineServiceImpl implements CustomHiddenExamineService { + + @Resource + private CustomHiddenExamineMapper customHiddenExamineMapper; + /**新增 + * @param pd + * @throws Exception + */ + public PageData save(PageData pd)throws Exception{ + pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + 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())); + customHiddenExamineMapper.save(pd); + return pd; + } + + /**手机端打回保存 + * @param pd + * @throws Exception + */ + public void saverepulse(PageData pd)throws Exception{ + customHiddenExamineMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + customHiddenExamineMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ +// pd.put("OPERATOR",Jurisdiction.getUSER_ID()); +// pd.put("OPERATTIME",DateUtil.date2Str(new Date())); + customHiddenExamineMapper.edit(pd); + } + + /**修改确认打回的信息 + * @param pd + * @throws Exception + */ + public void editrepulse(PageData pd)throws Exception{ + customHiddenExamineMapper.editrepulse(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return customHiddenExamineMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return customHiddenExamineMapper.listAll(pd); + } + + /**查询隐患确认打回的数据 + * @param pd + * @throws Exception + */ + public List findByHiddenId(PageData pd)throws Exception{ + return customHiddenExamineMapper.findByHiddenId(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return customHiddenExamineMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + customHiddenExamineMapper.deleteAll(ArrayDATA_IDS); + } + public List listAllByHiddenId(String hiddenId)throws Exception{ + PageData pd = new PageData(); + pd.put("HIDDEN_ID",hiddenId); + return customHiddenExamineMapper.listAll(pd); + } + public void updateBySpecial(PageData pd)throws Exception{ + customHiddenExamineMapper.updateBySpecial(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List listAndHidden(Page page)throws Exception{ + return customHiddenExamineMapper.listAndHiddendatalistPage(page); + } + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findByIdAndHidden(PageData pd)throws Exception{ + return customHiddenExamineMapper.findByIdAndHidden(pd); + } + public PageData saveApp(PageData pd)throws Exception{ + pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATTIME",DateUtil.date2Str(new Date())); + customHiddenExamineMapper.save(pd); + return pd; + } + + public PageData appSave(PageData pd)throws Exception{ + pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + pd.put("CREATOR", pd.getString("CREATOR")); + pd.put("CREATTIME", DateUtil.date2Str(new Date())); + pd.put("OPERATOR",pd.getString("OPERATOR")); + pd.put("OPERATTIME",DateUtil.date2Str(new Date())); + customHiddenExamineMapper.save(pd); + return pd; + } + + public void deleteByHiddenId(PageData pd)throws Exception{ + customHiddenExamineMapper.deleteByHiddenId(pd); + } + /** + * pc的隐患确认信息初始化 + * 需求：隐患确认之后，显示隐患发现人填入的隐患等级等信息 + * @param pd + * @return + * @throws Exception + */ + public PageData saveConfirm(PageData pd)throws Exception{ + + PageData before = new PageData();// 添加隐患初始信息 + before.put("TYPE","0"); //.0.隐患开始数据;1.特殊审核;2.延期审核 3.验收打回。4.隐患确认记录,.5重大隐患修改，6确认时打回; + before.put("STATE","2");//是否通过审核 ,1未通过。2通过 -1（初始）16隐患确认打回 + before.put("HIDDEN_ID",pd.get("HIDDEN_ID")); + before.put("spare1",pd.getString("HIDDENLEVEL")); // 隐患级别 + before.put("spare2",pd.getString("RECTIFICATIONOR"));//整改负责人 + before.put("spare3",pd.getString("RECTIFICATIONDEADLINE")); //整改完成期限 + before.put("spare4",pd.getString("RECTIFICATIONDEPT")); //整改负责人部门 + + before.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID()); + before.put("CREATOR", Jurisdiction.getUSER_ID()); + before.put("CREATTIME", DateUtil.date2Str(new Date())); + before.put("OPERATOR",Jurisdiction.getUSER_ID()); + before.put("OPERATTIME",DateUtil.date2Str(new Date())); + + customHiddenExamineMapper.save(before); + return pd; + } +} + diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenUserServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenUserServiceImpl.java new file mode 100644 index 0000000..10a61a9 --- /dev/null +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenUserServiceImpl.java @@ -0,0 +1,196 @@ +package com.zcloud.service.hiddenDangerCheckStandard.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomHiddenUserMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CustomHiddenUserService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：隐患 相关人员信息 + * 作者：luoxiaobao + * 时间：2022-04-22 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CustomHiddenUserServiceImpl implements CustomHiddenUserService { + + @Autowired + private CustomHiddenUserMapper customHiddenUserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + customHiddenUserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + customHiddenUserMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + customHiddenUserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return customHiddenUserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return customHiddenUserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return customHiddenUserMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + customHiddenUserMapper.deleteAll(ArrayDATA_IDS); + } + + /** + * 添加隐患相关人员信息 -- 有主要处理人 + * @param userIds 用户ids + * @param hiddenId 隐患id + * @param type 类别 + * @throws Exception + */ + public void saveRectificationo(String userIds ,String hiddenId,String type)throws Exception{ + if(!Tools.isEmpty(hiddenId)){ + PageData del = new PageData(); + del.put("TYPE",type); + del.put("HIDDEN_ID",hiddenId); + customHiddenUserMapper.deleteByHidden(del); // 先删除后添加 + } + if(!Tools.isEmpty(userIds)){ + String removeLoginUser = userIds.replaceAll(Jurisdiction.getUSER_ID(),""); //去除当前登录人的用户id + String userID [] = removeLoginUser.split(","); + for (int i =0;i getHiddenUserByHiddenIds (String [] hiddenIds ,String type) throws Exception{ + PageData pageData = new PageData(); + pageData.put("TYPE",type); + if(hiddenIds.length>0){ + pageData.put("hiddenIds",hiddenIds); + } + return customHiddenUserMapper.listAllUser(pageData); + } + /** + * 获取隐患发现人 + * @param varList + * @return + * @throws Exception + */ + public List getHiddebFind (List varList) throws Exception{ + if(varList.size() == 0){ + return varList; + } + Map mapKey = new HashMap<>(); + String [] hiddenIds = new String[varList.size()]; + for (int i =0 ;i hiddenFindUserList = this.getHiddenUserByHiddenIds(hiddenIds,"1"); + Map hiddenUserMap = new HashMap<>(); + for (PageData pageData : hiddenFindUserList){ + String hiddenId = pageData.getString("HIDDEN_ID"); + String userName = pageData.getString("NAME") +";"; + String deptName = pageData.getString("deptName")+";"; + if(hiddenUserMap.containsKey(hiddenId + "findUserNames")){ + userName += hiddenUserMap.get(hiddenId +"findUserNames"); + deptName += hiddenUserMap.get(hiddenId +"findDeptNames"); + } + hiddenUserMap.put(hiddenId +"findUserNames",userName); + hiddenUserMap.put(hiddenId +"findDeptNames",deptName); + } + for (PageData pageData:varList){ + String hiddenId = pageData.getString("HIDDEN_ID"); + if(hiddenUserMap.containsKey(hiddenId + "findUserNames")){ + pageData.put("findUserNames" ,hiddenUserMap.get(hiddenId + "findUserNames") ); + if(pageData.getString("findUserNames").lastIndexOf(";") == pageData.getString("findUserNames").length() - 1){ //判断最后一个的索引是否是； + pageData.put("findUserNames" ,pageData.getString("findUserNames").substring(0,pageData.getString("findUserNames").length() - 1)); + } + } + if(hiddenUserMap.containsKey(hiddenId + "findDeptNames")){ + pageData.put("findDeptNames" ,hiddenUserMap.get(hiddenId + "findDeptNames") ); + if(pageData.getString("findDeptNames").lastIndexOf(";") == pageData.getString("findDeptNames").length() - 1){ //判断最后一个的索引是否是； + pageData.put("findDeptNames" ,pageData.getString("findDeptNames").substring(0,pageData.getString("findDeptNames").length() - 1)); + } + } + } + return varList; + } + + @Override + public List verifylist(PageData pd) throws Exception { + return customHiddenUserMapper.verifylist(pd); + } + + @Override + public void deleteByHidden(PageData pd) throws Exception { + customHiddenUserMapper.deleteByHidden(pd); + } +} + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml index a0aed63..23ec3d8 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordItemMapper.xml @@ -114,6 +114,9 @@ set ISNORMAL = #{ISNORMAL}, + + CHECK_RESULT = #{CHECK_RESULT}, + LONGITUDE=#{LONGITUDE}, LATITUDE=#{LATITUDE} where diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.xml new file mode 100644 index 0000000..147cfbf --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenExamineMapper.xml @@ -0,0 +1,427 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_HIDDENEXAMINE + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.EXAMINE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.STATE, + f.TYPE, + f.DISPOSAL_PLAN, + f.DISPOSAL_FILE, + f.DELAY_TIME, + f.spare1, + f.spare2, + f.spare3, + f.spare4, + f.spare5, + f.HIDDENEXAMINE_ID, + f.REPULSE_CAUSE + + + + + HIDDEN_ID, + EXAMINE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + STATE, + TYPE, + DISPOSAL_PLAN, + DISPOSAL_FILE, + DELAY_TIME, + spare1, + spare2, + spare3, + spare4, + spare5, + HIDDENEXAMINE_ID, + REPULSE_CAUSE + + + + + #{HIDDEN_ID}, + #{EXAMINE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{STATE}, + #{TYPE}, + #{DISPOSAL_PLAN}, + #{DISPOSAL_FILE}, + #{DELAY_TIME}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{HIDDENEXAMINE_ID}, + #{REPULSE_CAUSE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + STATE = #{STATE} + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + update + f + set + f.spare5 = 1 + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + + + + + + + + + + + + + update + set + ISDELETE = '1' + where + HIDDENEXAMINE_ID in + + #{item} + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + STATE = #{STATE}, + DISPOSAL_PLAN = #{DISPOSAL_PLAN}, + DISPOSAL_FILE = #{DISPOSAL_FILE} + + , spare1 = #{spare1} + + + , spare2 = #{spare2} + + + , spare3 = #{spare3} + + + , spare4 = #{spare4} + + + , NEW_RECTIFICATIONOR = #{NEW_RECTIFICATIONOR} + + where + HIDDENEXAMINE_ID = #{HIDDENEXAMINE_ID} + + + + + + diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.xml new file mode 100644 index 0000000..7430ef0 --- /dev/null +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenUserMapper.xml @@ -0,0 +1,165 @@ + + + + + + + BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN_USER + + + + + SYS_DICTIONARIES + + + + + f.HIDDEN_ID, + f.USER_ID, + f.TYPE, + f.IS_MAIN, + f.HIDDENUSER_ID + + + + + HIDDEN_ID, + USER_ID, + TYPE, + IS_MAIN, + HIDDENUSER_ID + + + + + #{HIDDEN_ID}, + #{USER_ID}, + #{TYPE}, + #{IS_MAIN}, + #{HIDDENUSER_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from where HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + HIDDEN_ID = #{HIDDEN_ID}, + USER_ID = #{USER_ID}, + TYPE = #{TYPE}, + IS_MAIN = #{IS_MAIN}, + HIDDENUSER_ID = HIDDENUSER_ID + where + HIDDENUSER_ID = #{HIDDENUSER_ID} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDENUSER_ID in + + #{item} + + + + + delete + from + + where HIDDEN_ID = #{HIDDEN_ID} + and TYPE = #{TYPE} + + + +