diff --git a/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java b/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java new file mode 100644 index 00000000..0cb70ccb --- /dev/null +++ b/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java @@ -0,0 +1,363 @@ +package com.zcloud.controller.api; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.BiTongjiService; +import com.zcloud.service.system.DepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import java.util.*; + +@Controller +@RequestMapping("/api/biTongji") +public class ApiBiTongjiCotroller extends BaseController { + + @Autowired + private BiTongjiService biTongjiService; + @Autowired + private RestTemplate restTemplate; + + @Value("${preventionxgf.api.url}") + private String url; + + @Autowired + private DepartmentService departmentService; + + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountInsByCorpSource") + @ResponseBody + public Object getCountInsByCorpSource() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List insList = biTongjiService.getCountInsByCorpSource(pd); // 数据库中有的 + Map insMap = new HashMap<>(); // key= 企业id + 标识 ；val = 数量 ; 检查来源（4-监管端 5-企业端） + for (PageData pageData : insList) { + String key = pageData.getString("CORPINFO_ID") + "_" + pageData.getString("INSPECTION_SOURCE"); + String val = pageData.getString("count"); + insMap.put(key, val); + } + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList) { + String supeCount = "0"; + String corpCount = "0"; + String corpinfoID = corpinfo.getString("CORPINFO_ID"); + if (insMap.containsKey(corpinfoID + "_4")) { + supeCount = insMap.get(corpinfoID + "_4"); + } + if (insMap.containsKey(corpinfoID + "_5")) { + corpCount = insMap.get(corpinfoID + "_5"); + } + Map corpinfoCount = new HashMap<>(); + corpinfoCount.put("corpinfName", corpinfo.getString("CORP_NAME")); + corpinfoCount.put("supeCount", supeCount); + corpinfoCount.put("corpCount", corpCount); + valList.add(corpinfoCount); + } + map.put("varList", valList); + map.put("result", errInfo); + return map; + } + + /** + * @Description: 按照隐患类型bi页进行统计 + * @Author: dearLin + * @Date: 2023/10/30/030 15:21 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getHiddenCountByHiddenType") + @ResponseBody + public Object getHiddenCountByHiddenType() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = this.getPageData(); + new ArrayList(); + //物的不安全状态 + //管理的缺陷 + //其他 + //环境的不安全因素 + //人的不安全因素 + List typeList = Arrays.asList( + "rdbaqys", + "wdbaqzt", + "hjdbaqys", + "gldqx", + "aqyh-qt" + ); + pageData.put("typeList", typeList); + List varList = biTongjiService.getHiddenCountByHiddenType(pageData); + map.put("result", errInfo); + map.put("varList", varList); + + return map; + } + + + /** + * 客户数据 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getUserCount") + @ResponseBody + public Object getUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// Integer corpUserCount = biTongjiService.getCorpUser(pd); // 企业的所有人数 + List corpUserCount = biTongjiService.getCorpUser2(pd); // 企业的所有人数 + +// Integer superUserCount = biTongjiService.getSupeUser(pd); // 部门的所有人数 + List superUserCount = biTongjiService.getSupeUser2(pd); // 部门的所有人数 + + map.put("corpUserCount", corpUserCount.size()); + map.put("superUserCount", superUserCount.size()); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 人员数量 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpUserCountTop10") + @ResponseBody + public Object getCorpUserCountTop10() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpUserCountTop10 = biTongjiService.getCorpUserCountTop10(pd); // 所有需要统计的企业信息 + map.put("corpUserCountTop10", corpUserCountTop10); + map.put("result", errInfo); + return map; + } + + //分子公司数量 + @RequestMapping(value = "/getCorpCount") + @ResponseBody + public Object getCorpCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = biTongjiService.listAllCorp(pd); + int size = pageData.size(); + map.put("corpCount", size); + map.put("result", errInfo); + return map; + } + + // 股份公司部门数量 + @RequestMapping(value = "/getRegulatoryDepartmentCount") + @ResponseBody + public Object getRegulatoryDepartmentCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("PARENT_ID", "28945926d1e34cad8c6a91e2a18ae0ce"); // BI页统计只查询港股第一级部门 + List pageData = (List) departmentService.listAll(pd); + int size = pageData.size(); + map.put("regulatoryDepartmentCount", size); + map.put("result", errInfo); + return map; + } + + // 相关方单位数 + @RequestMapping("/unitCorpCount") + @ResponseBody + public Map getUnitCorpCount() { + Map result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class); + String errInfo = "success"; + List unitCorp = (List) result.get("unitCorp"); + int size = unitCorp.size(); + Map map = new HashMap<>(); + map.put("unitCorpCount", size); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 部门使用情况 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpDeptCount") + @ResponseBody + public Object getCorpDeptCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpDeptCount = biTongjiService.getCorpDeptCount(pd); // 所有需要统计的企业信息 + Map corpLevelMap = new HashMap<>(); + for (PageData pageData : corpDeptCount) { + corpLevelMap.put(pageData.getString("CORPINFO_ID") + "-" + pageData.getString("LEVEL"), pageData.getString("count")); + } + String[] levelAll = {"departmentLevel0001", "departmentLevel0002", "departmentLevel0003",}; + + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList) { + Map valMap = new HashMap<>(); + for (int le = 0; le < levelAll.length; le++) { + String key = corpinfo.getString("CORPINFO_ID") + "-" + levelAll[le]; + String deptLevelCount = "0"; + if (corpLevelMap.containsKey(key)) { + deptLevelCount = corpLevelMap.get(key).toString(); + } + valMap.put(levelAll[le], deptLevelCount); + } + valMap.put("corpName", corpinfo.getString("CORP_NAME")); + valList.add(valMap); + } + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsCountAndHiddeCount") + @ResponseBody + public Object getSuperInsCountAndHiddeCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Integer superInsCount = biTongjiService.getInsCountBySuper(pd); + Integer superHiddenCount = biTongjiService.getHiddenCountBySuper(pd); + map.put("superInsCount", superInsCount); + map.put("superHiddenCount", superHiddenCount); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsBySubjectAndTop") + @ResponseBody + public Object getSuperInsBySubjectAndTop() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + + List count = biTongjiService.getSuperInsCountBySubjec(pd); + List insList = biTongjiService.getSuperInsTop(pd); + map.put("count", count); + map.put("insList", insList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患来源 日常检查 安环环保检查 隐患快报 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountBySubject") + @ResponseBody + public Object getHiddenCountBySubject() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountBySubjec(pd); + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患处置情况 忽略 一般 重大 特殊 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHiddenLevel") + @ResponseBody + public Object getHiddenCountByHiddenLevel() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByHiddenLevel(pd); + Integer countByStateIsSpecial = biTongjiService.getHiddenCountBySpecial(pd); + PageData pecial = new PageData(); + pecial.put("count", countByStateIsSpecial); + pecial.put("HIDDENLEVEL", "pecial"); + valList.add(pecial); + + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getHiddenCountByCorpInfoHandle") + @ResponseBody + public Object getHiddenCountByCorpInfoHandle() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByCorpInfoHandle(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 获取高危作业数量 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHighriskworkCount") + @ResponseBody + public Object getHighriskworkCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHighriskworkCount(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/bus/BiTongjiController.java b/src/main/java/com/zcloud/controller/bus/BiTongjiController.java new file mode 100644 index 00000000..3dd51d36 --- /dev/null +++ b/src/main/java/com/zcloud/controller/bus/BiTongjiController.java @@ -0,0 +1,454 @@ +package com.zcloud.controller.bus; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.bus.HiddenService; +import com.zcloud.service.map.BiTongjiService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.service.system.corpsystem.CorpUsersService; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/biTongji") +public class BiTongjiController extends BaseController { + + @Autowired + private BiTongjiService biTongjiService; + @Autowired + private UsersService usersService; + @Autowired + private CorpInfoService corpInfoService; + @Autowired + private DepartmentService departmentService; + @Autowired + private CorpUsersService corpUsersService; + @Autowired + private HiddenService hiddenService; + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountInsByCorpSource") + @ResponseBody + public Object getCountInsByCorpSource() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("istongji","1"); //2023年10月31日17:34:28 孙部提出的BI右侧中间的只统计 19加数据 + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List insList = biTongjiService.getCountInsByCorpSource(pd); // 数据库中有的 + List hidList = biTongjiService.getHiddenBySource(pd); + Map insMap = new HashMap<>(); // key= 企业id + 标识 ；val = 数量 ; 检查来源（4-监管端 5-企业端） + for (PageData pageData: insList){ + String key = pageData.getString("CORPINFO_ID") +"_" + pageData.getString("INSPECTION_SOURCE"); + String val = pageData.getString("count"); + insMap.put(key,val); + } + Map hidMap = new HashMap<>(); + for (PageData pageData: hidList){ + String key = pageData.getString("CORPINFO_ID") +"_" + pageData.getString("SOURCE"); + String val = pageData.getString("count(*)"); + hidMap.put(key,val); + } + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList){ + String supeCount = "0"; + String corpCount = "0"; + String supeHiddenCount = "0"; + String corpHiddenCount = "0"; + String corpinfoID = corpinfo.getString("CORPINFO_ID"); + if(insMap.containsKey(corpinfoID + "_4")){ + supeCount = insMap.get(corpinfoID + "_4"); + } + if(insMap.containsKey(corpinfoID + "_5")){ + corpCount = insMap.get(corpinfoID + "_5"); + } + if(hidMap.containsKey(corpinfoID + "_4")){ + supeHiddenCount = hidMap.get(corpinfoID + "_4"); + } + if(hidMap.containsKey(corpinfoID + "_5")){ + corpHiddenCount = hidMap.get(corpinfoID + "_5"); + } + Map corpinfoCount = new HashMap<>(); + corpinfoCount.put("corpinfName",corpinfo.getString("CORP_NAME")); + corpinfoCount.put("supeCount",supeCount); + corpinfoCount.put("corpCount",corpCount); + corpinfoCount.put("supeHiddenCount",supeHiddenCount); + corpinfoCount.put("corpHiddenCount",corpHiddenCount); + valList.add(corpinfoCount); + } + map.put("varList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 客户数据 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getUserCount") + @ResponseBody + public Object getUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Integer corpUserCount = biTongjiService.getCorpUser(pd); // 企业的所有人数 + Integer superUserCount = biTongjiService.getSupeUser(pd); // 部门的所有人数 + map.put("corpUserCount", corpUserCount); + map.put("superUserCount", superUserCount); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 人员数量 + * @return + * @throws Exception + */ + + //分子公司人员数量 + @RequestMapping(value = "/getcorpUserCount") + @ResponseBody + public Object getcorpUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = corpUsersService.listAllUser(pd); + int size = pageData.size(); + map.put("corpUserCount",size); + map.put("result", errInfo); + return map; + } + + //监控端用户数量 + @RequestMapping(value = "/getRegulatoryUserCount") + @ResponseBody + public Object getRegulatoryUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = usersService.listAllUser(pd); + int size = pageData.size(); + map.put("regulatoryUserCount",size); + map.put("result", errInfo); + return map; + } + + //分子公司数量 + @RequestMapping(value = "/getCorpCount") + @ResponseBody + public Object getCorpCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = corpInfoService.listAll(pd); + int size = pageData.size(); + map.put("corpCount",size); + map.put("result", errInfo); + return map; + } + + //股份公司部门数量 + @RequestMapping(value = "/getRegulatoryDepartmentCount") + @ResponseBody + public Object getRegulatoryDepartmentCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("PARENT_ID", "28945926d1e34cad8c6a91e2a18ae0ce"); // BI页统计只查询港股第一级部门 + List pageData = (List)departmentService.listAll(pd); + int size = pageData.size(); + map.put("regulatoryDepartmentCount",size); + map.put("result", errInfo); + return map; + } + + //隐患数 港股检查发现隐患数 分子公司发现隐患数 + @RequestMapping(value = "/getHiddenDangerCount") + @ResponseBody + public Object getHiddenDangerCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List hiddenList = hiddenService.listAll(pd); + int allHiddenCount = hiddenList.size(); + int regulatoryHiddenCount = hiddenService.findBySource(5).size(); + int corpHiddenCount = hiddenService.findBySource(4).size(); + map.put("allHiddenCount",allHiddenCount); + map.put("regulatoryHiddenCount",regulatoryHiddenCount); + map.put("corpHiddenCount",corpHiddenCount); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getCorpUserCountTop10") + @ResponseBody + public Object getCorpUserCountTop10() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpUserCountTop10 = biTongjiService.getCorpUserCountTop10(pd); // 所有需要统计的企业信息 + map.put("corpUserCountTop10", corpUserCountTop10); + map.put("result", errInfo); + return map; + } + /** + * 分公司使用统计 -- 部门使用情况 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpDeptCount") + @ResponseBody + public Object getCorpDeptCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpDeptCount = biTongjiService.getCorpDeptCount(pd); // 所有需要统计的企业信息 + Map corpLevelMap = new HashMap<>(); + for (PageData pageData : corpDeptCount){ + corpLevelMap.put(pageData.getString("CORPINFO_ID") + "-" + pageData.getString("LEVEL") ,pageData.getString("count")); + } + String[] levelAll = {"departmentLevel0001", "departmentLevel0002", "departmentLevel0003",}; + + List> valList = new ArrayList<>(); + for (PageData corpinfo :corpinfoAllList){ + Map valMap = new HashMap<>(); + for (int le = 0;le map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); +// Integer superInsCount = biTongjiService.getInsCountBySuper(pd); +// Integer superHiddenCount = biTongjiService.getHiddenCountBySuper(pd); + + List superInsCount = biTongjiService.getInsCountPageBySuper(pd); + List superHiddenCount = biTongjiService.getHiddenCountPageBySuper(pd); + + map.put("superInsCount", superInsCount); + map.put("superHiddenCount", superHiddenCount); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsBySubjectAndTop") + @ResponseBody + public Object getSuperInsBySubjectAndTop() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + + List count = biTongjiService.getSuperInsCountBySubjec(pd); + List insList = biTongjiService.getSuperInsTop(pd); + map.put("count", count); + map.put("insList", insList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患来源 隐患排查 安环环保检查 隐患快报 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountBySubject") + @ResponseBody + public Object getHiddenCountBySubject() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountBySubjec(pd); + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 海因里希 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHeinrich") + @ResponseBody + public Object getHiddenCountByHeinrich() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + PageData valList = biTongjiService.getHiddenCountByHeinrich(pd); + map.put("pd", valList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患处置情况 忽略 一般 重大 特殊 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHiddenLevel") + @ResponseBody + public Object getHiddenCountByHiddenLevel() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByHiddenLevel(pd); + Integer countByStateIsSpecial = biTongjiService.getHiddenCountBySpecial(pd); + PageData pecial = new PageData(); + pecial.put("count",countByStateIsSpecial); + pecial.put("HIDDENLEVEL","pecial"); + valList.add(pecial); + + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + @RequestMapping(value = "/getHiddenCountByCorpInfoHandle") + @ResponseBody + public Object getHiddenCountByCorpInfoHandle() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByCorpInfoHandle(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + /** + * 获取高危作业数量 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHighriskworkCount") + @ResponseBody + public Object getHighriskworkCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHighriskworkCount(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + /** + * 列表 + * + * @throws Exception + */ + @RequestMapping(value = "/statisticsByCorpinfo") + @ResponseBody + public Object mainStatisticsByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("CITY_CODE", Jurisdiction.getUserCityCode()); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpinfoCount = biTongjiService.mainStatisticsByCorpinfo(pd); + Map corpMap = new HashMap<>(); + for (PageData pageData :corpinfoCount){ + corpMap.put(pageData.getString("corpId"),pageData); + } + + + List varList = new ArrayList<>(); + for (PageData corpinfo:corpinfoAllList){ + PageData valMap = new PageData(); + valMap.put("SBHD_NUM","0"); + valMap.put("ZGHD_NUM","0"); + valMap.put("corpId",corpinfo.getString("CORPINFO_ID")); + valMap.put("corpName",corpinfo.getString("CORP_NAME")); + if(corpMap.containsKey(corpinfo.getString("CORPINFO_ID"))){ + PageData countMap = corpMap.get(corpinfo.getString("CORPINFO_ID")); + valMap.put("SBHD_NUM",countMap.getString("SBHD_NUM")); + valMap.put("ZGHD_NUM",countMap.getString("ZGHD_NUM")); + } + varList.add(valMap); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/mainInsByCorpinfo") + @ResponseBody + public Object mainInsByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List varList = this.biTongjiService.mainInsByCorpinfo(pd); + + + map.put("varList", varList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java b/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java index 6804d04c..5e2a9df1 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java @@ -293,7 +293,7 @@ public class CorpPromiseController extends BaseController { corpPromiseDetailsService.save(promise); corpPromiseDetails.add(promise); } - dockData.put("corpPromiseDetails",JSON.toJSONString(corpPromiseDetails)); + dockData.put("corpPromiseDetailsSave", JSON.toJSONString(corpPromiseDetails)); } corpPromisePeopleService.deletePromiseId(pd); //先删除承诺人数据，再新增 dockData.put("baseData",JSON.toJSONString(pd)); diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index 56747cf2..1e3c78c7 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -301,6 +301,8 @@ public class IdentificationPartsController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -505,10 +507,12 @@ public class IdentificationPartsController extends BaseController { @SuppressWarnings("unchecked") @ResponseBody @Transactional + @DockAnnotation public Object readExcel(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; StringBuffer errorStr = new StringBuffer(); + List pageDataList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -611,6 +615,7 @@ public class IdentificationPartsController extends BaseController { } if(Tools.isEmpty(errorStr.toString())) { for (PageData pageData : saveList) { + pageDataList.add(pageData); identificationpartsService.save(pageData); } errorStr.append("成功导入"+saveList.size()+"条数据!"); @@ -637,6 +642,7 @@ public class IdentificationPartsController extends BaseController { map.put("result", errInfo); //返回结果 map.put("isExcel","1"); //返回类型 map.put("resultStr", errorStr.toString()); + map.put("dockData", JSON.toJSONString(pageDataList)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/PromiseController.java b/src/main/java/com/zcloud/controller/bus/PromiseController.java index 0cc23ccb..acee005c 100644 --- a/src/main/java/com/zcloud/controller/bus/PromiseController.java +++ b/src/main/java/com/zcloud/controller/bus/PromiseController.java @@ -187,6 +187,7 @@ public class PromiseController extends BaseController { */ @RequestMapping(value = "/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -206,6 +207,7 @@ public class PromiseController extends BaseController { } else { promiseService.delete(pd); // 删除 } + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointController.java b/src/main/java/com/zcloud/controller/bus/RiskPointController.java index 7ce4bf50..4b1fb35a 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointController.java @@ -427,6 +427,7 @@ public class RiskPointController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); map.put("result", errInfo); //返回结果 map.put("dockData",JSON.toJSONString(pd)); return map; @@ -808,6 +809,7 @@ public class RiskPointController extends BaseController { @SuppressWarnings("unchecked") @ResponseBody @Transactional + @DockAnnotation public Object readExcel2(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -815,6 +817,7 @@ public class RiskPointController extends BaseController { pdPublic = this.getPageData(); StringBuffer errorStr = new StringBuffer(); List rList = new ArrayList(); + List pageDataList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -1040,6 +1043,7 @@ public class RiskPointController extends BaseController { if(Tools.isEmpty(errorStr.toString())) { for(PageData r:rList) { + pageDataList.add(r); riskpointService.save(r); PageData riskcheckitem = new PageData(); riskcheckitem.put("RISKCHECKITEM_ID", this.get32UUID()); //主键 @@ -1064,6 +1068,8 @@ public class RiskPointController extends BaseController { map.put("msg",errorStr.toString()); //返回结果 map.put("isExcel","1"); //返回类型 map.put("resultStr", errorStr.toString()); + pdPublic.put("pageDataList",JSON.toJSONString(pageDataList)); + map.put("dockData", JSON.toJSONString(pdPublic)); return map; } } diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index be169677..c59c9485 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -294,6 +294,8 @@ public class RiskUnitController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -406,11 +408,13 @@ public class RiskUnitController extends BaseController { @SuppressWarnings("unchecked") @ResponseBody @Transactional + @DockAnnotation public Object readExcel(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception { Map map = new HashMap(); String errInfo = "success"; String type = "warning"; StringBuffer errorStr = new StringBuffer(); + List pageDataList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -509,6 +513,7 @@ public class RiskUnitController extends BaseController { } if (Tools.isEmpty(errorStr.toString())) { for (PageData riskunit : riskunitList) { + pageDataList.add(riskunit); riskunitService.save(riskunit); } errorStr.append("成功导入" + riskunitList.size() + "条数据!"); @@ -532,6 +537,7 @@ public class RiskUnitController extends BaseController { map.put("msg", errorStr.toString()); //返回结果 map.put("type", type); //返回结果 map.put("isExcel", "1"); //返回类型 + map.put("dockData", JSON.toJSONString(pageDataList)); map.put("resultStr", errorStr.toString()); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java index cc666094..03794ac7 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java @@ -181,6 +181,7 @@ public class RiskWarningController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("riskwarning:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -194,6 +195,7 @@ public class RiskWarningController extends BaseController { }else{ errInfo = "fail"; } + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java new file mode 100644 index 00000000..de091519 --- /dev/null +++ b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java @@ -0,0 +1,185 @@ +package com.zcloud.controller.czksmap; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.HttpRequestUtil; +import com.zcloud.util.ReturnMap; +import com.zcloud.util.examUntil.ErrorOperation; +import com.zcloud.util.hk.HKUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * 说明：沧州矿石地图,摄像头同步数据 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/api/czks/map") +@ErrorOperation +public class ApiCzksMapController extends BaseController { + @Autowired + private UsersService usersService; + @Autowired + private DepartmentService departmentService; + + + /** + * @Description: 今日进出港数据 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "carInOutToday") + @ResponseBody + public ReturnMap carInOutToday() throws Exception { + ReturnMap returnMap = new ReturnMap(); + HashMap hashMap = new HashMap<>(); + hashMap.put("oreIn", "3252"); + hashMap.put("oreOut", "2356"); + hashMap.put("groceryIn", "200"); + hashMap.put("groceryOut", "125"); + hashMap.put("oreInAll", "33252"); + hashMap.put("oreOutAll", "32356"); + hashMap.put("groceryInAll", "2200"); + hashMap.put("groceryOutAll", "1125"); + returnMap.put("czksCarToday", hashMap); + return returnMap; + } + + /** + * @Description: 定位在线人员数 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "allPersonList") + @ResponseBody + public ReturnMap getOlinePersonCount() throws Exception { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", 1); + request.put("pageSize", 10); + request.put("online", "true"); + // 人员定位在线 + ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + pageData.put("CORPINFO_ID", "f8da1790b1034058ae2efefd69af3284"); + // 系统人员数 + int userCount = usersService.getUserCount(pageData); + // 系统部门数 + int departCount = departmentService.getDepartmentCount(pageData); + online.put("userCount", userCount); + online.put("departCount", departCount); + return online; + } + + /** + * @Description: 定位基础信息 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getCzksBasicLocationInfoData") + @ResponseBody + public ReturnMap getCzksBasicLocationInfoData() { + return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", ""); + } + + /** + * @Description: 定位标签状态 + * @Author: dearLin + * @Date: 2024/1/15/015 17:28 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/personStaffList") + @ResponseBody + public ReturnMap getCzksPersonStaffListPage() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("pageNum")); + request.put("pageSize", pageData.getString("pageSize")); + // 普通员工 + if ("1".equals(pageData.getString("type"))) { + return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString()); + } else { + // 相关方 员工 + return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + } + } + + /** + * @Description: 人员定位告警数据 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getAlarmData") + @ResponseBody + public Object getAlarmData() { + return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", ""); + } + + /** + * @Description: 摄像头列表 + * @Author: dearLin + * @Date: 2024/1/17/017 13:44 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value="/platformList") + @ResponseBody + public Object platformList() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKUtil.cameraSearch(pd); + if(ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } + map.put("result", "success"); + return map; + } + + + /** + * @Description: 解析摄像头播放地址 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getCameraHlsPath") + @ResponseBody + public ReturnMap getCameraHlsPath() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("INDEXCODE", pageData.getString("INDEXCODE")); + return HttpRequestUtil.getCameraHlsPathApi("/platformvideomanagement/getHlsPath", request.toString()); + } + @RequestMapping(value="/getHlsPath") + @ResponseBody + public Object getHlsPath() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); + if(ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } + map.put("result", "success"); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java new file mode 100644 index 00000000..34e323f9 --- /dev/null +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java @@ -0,0 +1,556 @@ +package com.zcloud.controller.czksmap; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.czksbimap.CzksBiMapService; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.fireresources.CzksFireResourcesService; +import com.zcloud.service.gatemachine.GateMachineService; +//import com.zcloud.service.keyProjects.MeteorologicalService; +//import com.zcloud.service.keyProjects.MeteorologicalinfoService; +import com.zcloud.service.keyProjects.PlatformvideomanagementService; +import com.zcloud.service.keyProjects.VideoManagerService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.HttpRequestUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ReturnMap; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/czks/map") +public class CzksMapController extends BaseController { + + @Resource + private CzksBiMapService biMapService; + + @Autowired + private VideoManagerService videomanagerService; + @Autowired + private CorpInfoService corpInfoService; + + @Autowired + private PlatformvideomanagementService platformvideomanagementService; + @Autowired + private UsersService usersService; + +// @Autowired +// private MeteorologicalinfoService meteorologicalinfoService; + + @Autowired + private RestTemplate restTemplate; + + @Autowired + private CzksFireResourcesService fireResourcesService; + + @Autowired + private DepartmentService departmentService; + + @Autowired + private GateMachineService gateMachineService; + + + @RequestMapping("/getPointInfoADeviceByPid") + @ResponseBody + public Object getPointInfoADeviceByPid() { + PageData pd = this.getPageData(); + PageData map = fireResourcesService.getPointInfoADeviceByPid(pd); + map.put("result", "success"); + return map; + } + + @RequestMapping("/getPointQualifiedPhotos") + @ResponseBody + public Object getPointQualifiedPhotos() { + Map map = new HashMap(); + PageData pd = this.getPageData(); + map.put("result", "success"); + map.put("varList", fireResourcesService.getPointQualifiedPhotos(pd)); + return map; + } + + + /** + * @Description: 消防管控 + * @Author: dearLin + * @Date: 2023/9/20/020 15:30 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getFireControl") + @ResponseBody + public Object getFireControl() throws Exception { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + LinkedList value = biMapService.getFireControl(pageData); + for (PageData data : value) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + map.put("result", "success"); + map.put("varList", value); + return map; + } + + /** + * @Description: 消防资源 + * @Author: dearLin + * @Date: 2023/9/26/026 17:36 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getFireResourceById") + @ResponseBody + public Object getFireResourceById() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pddata = this.getPageData(); + //获取当前人的公司id + PageData pd = fireResourcesService.getDataById(pddata); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * @Description: 消防救援队 + * @Author: dearLin + * @Date: 2023/9/20/020 15:30 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getFireRescueTeam") + @ResponseBody + public Object getFireRescueTeam() throws Exception { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + LinkedList data = biMapService.getFireRescueTeam(pageData); + map.put("result", "success"); + map.put("varList", data); + return map; + } + + + /** + * 气象信息对接接口 + * + * @return + * @throws Exception + */ +// @RequestMapping(value = "/tongMeteorologicalinfoList") +// @ResponseBody +// public ReturnMap tongMeteorologicalinfoList(@RequestBody List list) throws Exception { +// ReturnMap r = new ReturnMap(); +// r = meteorologicalinfoService.tongbuMeteorologicalinfo(list); +// return r; +// } + + + /** + * @Description: 闸机设备在线情况 只有人车闸机 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getOnlineGateEquipment") + @ResponseBody + public ReturnMap getOnlineGateEquipment() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + PageData value = gateMachineService.getOnlineGateMachine(pageData); + returnMap.put("pd", value); + return returnMap; + } + + /** + * @Description: 闸机位置 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ +// @RequestMapping("/getGatePosition") +// @ResponseBody +// public ReturnMap getGatePosition() { +// ReturnMap returnMap = new ReturnMap(); +// PageData pageData = this.getPageData(); +// // +// List value = gateMachineService.getGatePosition(pageData); +// // 添加标点上的统一的title +// for (PageData data : value) { +// if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) { +// data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME")); +// } else { +// data.put("MAP_POINT_NAME", data.getString("NAME")); +// } +// } +// returnMap.put("varList", value); +// return returnMap; +// } + + + /** + * @Description: 口门进出记录列表 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getDoorWayRecords") + @ResponseBody + public ReturnMap getDoorWayRecords(Page page) { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + page.setPd(pageData); + if ("0".equals(pageData.getString("INDEX"))) { + // 人 + List value = biMapService.getDoorWayPeopleRecords(page); + returnMap.put("varList", value); + return returnMap; + } else { + // 车 + List value = biMapService.getDoorWayCarRecords(page); + returnMap.put("varList", value); + return returnMap; + } + } + + + /** + * @Description: 闸机进出车、人的数量 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getGatesInAndOutNumById") + @ResponseBody + public ReturnMap getGatesInAndOutNumById() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + Map data = biMapService.getGatesInAndOutNumById(pageData); + returnMap.put("pd", data); + return returnMap; + } + + /** + * 人员进出记录列表 + * + * @return + */ + @RequestMapping("/getGatesInAndOutListById") + @ResponseBody + public ReturnMap getGatesInAndOutListById(Page page) { + ReturnMap returnMap = new ReturnMap(); + PageData pd = this.getPageData(); + page.setPd(pd); + List recordAllList = gateMachineService.getPersonRecordListAllByEId(page); + returnMap.put("recordAllList", recordAllList); + return returnMap; + } + + + @RequestMapping(value = "/fireResource/list") + @ResponseBody + public Object page(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + //获取当前人的公司id + page.setPd(pd); + + List varList = fireResourcesService.datalistPage(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/fireDevice/listByMap") + @ResponseBody + public Object devicelistByMap(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String corpinfoId = Jurisdiction.getCORPINFO_ID(); + pd.put("CORPINFO_ID", corpinfoId); + + //获取当前人的公司id + page.setPd(pd); + List varList = fireResourcesService.devicelistPage(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 获取人员、车辆进出记录 + * + * @param + * @return + */ + @RequestMapping(value = "/getPerpleCarGateMachineCount") + @ResponseBody + public Object getPerpleCarGateMachineCount() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getMachineTodayInOutCount") + @ResponseBody + public Object getMachineTodayInOutCount() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List value = gateMachineService.getTodayInOutCount(pd); + map.put("varList", value); + map.put("result", errInfo); + return map; + } + + /** + * 沧州矿石人员定位，告警数据 Alarm data + */ + @RequestMapping(value = "/getAlarmData") + @ResponseBody + public Object getAlarmData() { + return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", ""); + } + + /** + * @Description: 定位基础信息 + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getCzksBasicLocationInfoData") + @ResponseBody + public Object getCzksBasicLocationInfoData() { + return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", ""); + } + + @RequestMapping("/getGatePosition") + @ResponseBody + public ReturnMap getCzksGatePosition() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + // + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List value = gateMachineService.getGatePosition(pageData); + // 添加标点上的统一的title + for (PageData data : value) { + if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) { + data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME")); + } else { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + } + returnMap.put("varList", value); + return returnMap; + } + + /** + * @Description: 人员定位信息 + * @Author: dearLin + * @Date: 2024/1/6/006 17:33 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "person/allPerson/listPage") + @ResponseBody + public Object getCzksOnlinePersion() throws Exception { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", 1); + request.put("pageSize", 10); + request.put("online", "true"); + // 人员定位在线 + ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + // 系统人员数 + int userCount = usersService.getUserCount(pageData); + // 系统部门数 + int departCount = departmentService.getDepartmentCount(pageData); + online.put("userCount",userCount); + online.put("departCount",departCount); + return online; + } + /** + * @Description: 电子围栏报警 Electronic fence + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getFenceAlarmList") + @ResponseBody + public Object getFenceAlarmList() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("currentPage")); + request.put("pageSize", pageData.getString("showCount")); + request.put("beginTime", pageData.getString("beginTime")); + request.put("endTime", pageData.getString("endTime")); + request.put("alarmType", pageData.getString("alarmType")); + request.put("alarmStatus", pageData.getString("alarmStatus")); + request.put("realName", pageData.getString("realName")); + // 标签卡 + return HttpRequestUtil.getPeopleApi("/system/alarm/person/listPage", request.toString()); + } + /** + * @Description: 电子围栏报警 Electronic fence + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getElectronicFenceList") + @ResponseBody + public Object getElectronicFenceList() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("currentPage")); + request.put("pageSize", pageData.getString("showCount")); + request.put("railName", pageData.getString("railName")); + // 标签卡 + return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString()); + } + + /** + * @Description: 获取摄像头定位 + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getCameraPositioning") + @ResponseBody + public Object getCameraPositioning() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = new PageData(); + pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + List dataList = platformvideomanagementService.listAllForMap(pageData); + returnMap.put("varList",dataList); + return returnMap; + } + /** + * @Description: 设备在线情况 + * @Author: dearLin + * @Date: 2024/1/6/006 11:15 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getListMapSluiceCount") + @ResponseBody + public Object getListMapSluiceCount() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = new PageData(); + pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + List dataList = platformvideomanagementService.getListMapSluiceCount(pageData); + returnMap.put("varList",dataList); + return returnMap; + } + @RequestMapping(value = "/person/staff/listPage") + @ResponseBody + public Object getCzksPersonStaffListPage() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("pageNum")); + request.put("pageSize", pageData.getString("pageSize")); + // 普通员工 + if ("1".equals(pageData.getString("type"))) { + return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString()); + } else { + // 相关方 员工 + return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + } + } + /** + * 沧州矿石人员定位结束 定位基础信息 + */ + /** + * 获取人员、车辆进出记录 + * + * @param + * @return + */ + @RequestMapping(value = "/getCurrentLocationOnline") + @ResponseBody + public Object getCurrentLocationOnline() { + Map map = new HashMap(); + String errInfo = "success"; + map.put("result", errInfo); + return map; + } + + // 获取人员定位信息 根据定位卡(身份证)编码 + @RequestMapping(value = "/getPersonByCardNo") + @ResponseBody + public Object getPersonByCardNo() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + PageData value = usersService.getPersonByCardNo(pd); + map.put("result", "success"); + map.put("pd", value); + return map; + } + + /** + * 获取摄像头播放路径(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/getHlsPath") + @ResponseBody + public Object getHlsPath() throws Exception { + Map map = new HashMap(); + + return map; + } + + /** + * 查询人员在线及统计数据(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/getCurrentPersonnelData") + @ResponseBody + public Object getCurrentPersonnelData() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + return map; + } + + @RequestMapping("/getUserMapInfo") + @ResponseBody + public ReturnMap getUserMapInfo() throws Exception { + PageData pd = this.getPageData(); + pd = usersService.findByCardNo(pd); //列出HotWorkApplicationDelayed列表 + ReturnMap r = ReturnMap.ok(); + r.put("pd", pd); + return r; + } + +} diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java new file mode 100644 index 00000000..7b42cd69 --- /dev/null +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -0,0 +1,191 @@ +package com.zcloud.controller.czksmap; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.czksbimap.CzksMapEightService; +import com.zcloud.util.Jurisdiction; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/czks/map/Eight") +public class CzksMapEightController extends BaseController { + + @Autowired + private CzksMapEightService mapEightService; + + /** + * @return + * @throws Exception + */ + @RequestMapping(value = "/getEcharts") + @ResponseBody + public Object getEcharts() throws Exception { + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + return mapEightService.getEchartsOrder(pd); + } + + /** + * 可视化首页统计数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/findFormCount") + @ResponseBody + public Object findFormCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); + map.put("pd", data); + map.put("result", errInfo); + return map; + } + + /** + * 作业实时情况展示（最新18条） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listHighRiskWork") + @ResponseBody + public Object listHighRiskWork(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + page.setPd(pd); + List varList = mapEightService.listHighRiskWorkOrder(page); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listAllHighRiskWorkLocation") + @ResponseBody + public Object listAllHighRiskWorkLocation() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + List varList; + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 + varList = mapEightService.listAllHighRiskWorkLocation(pd); + } else { + varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); + } + // 处理一下 name 的问题 + if (varList != null) { + varList.forEach(item -> { + item.put("MAP_POINT_NAME", item.getString("NAME")); + }); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 根据id以及类型获取数据 一公司 + * + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + return mapEightService.getById(pd); + + } + + /** + * 根据id以及类型获取数据 其他公司 + * + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getByIdOrder") + @ResponseBody + public Object getByIdOrder(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + return mapEightService.getByIdOrder(pd); + + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + List varList = mapEightService.listAll(pd); //列出HotWorkApplicationDelayed列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 获取动火防护措施 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + List varList = mapEightService.listAllMeasures(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java new file mode 100644 index 00000000..8088ff7c --- /dev/null +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java @@ -0,0 +1,85 @@ +package com.zcloud.controller.czksmap; + +import com.zcloud.controller.base.BaseController; +//import com.zcloud.service.keyProjects.PlatformelectronicService; +//import com.zcloud.util.hk.HKPostUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/czks/map/mapPlatformelectronic") +public class CzksMapPlatFormElectronicController extends BaseController { +// @Autowired +// private PlatformelectronicService platformelectronicService; + + /**总摄像头数 + * @throws Exception + */ +// @RequestMapping(value="/listAll") +// @ResponseBody +// public Object listAll() throws Exception{ +// Map map = new HashMap(); +// String errInfo = "success"; +// PageData pd = new PageData(); +// pd = this.getPageData(); +// Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表 +// map.put("allForMap", allForMap); +// map.put("result", errInfo); +// return map; +// } + + + /**根据区域统计摄像头总数 + * @throws Exception + */ +// @RequestMapping(value="/listAllByArea") +// @ResponseBody +// public Object listAllByArea() throws Exception{ +// Map map = new HashMap(); +// String errInfo = "success"; +// PageData pd = new PageData(); +// pd = this.getPageData(); +// List countAllByArea = platformelectronicService.countAllByArea(pd); //列出Platformelectronic列表 +// map.put("varList", countAllByArea); +// map.put("result", errInfo); +// return map; +// } + + + /**地图插点 + * @throws Exception + */ +// @RequestMapping(value="/listAllLocation") +// @ResponseBody +// public Object listAllLocation() throws Exception{ +// Map map = new HashMap(); +// String errInfo = "success"; +// PageData pd = new PageData(); +// pd = this.getPageData(); +// pd.put("forMap","1"); +// List varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表 +// for (PageData data : varList) { +// data.put("MAP_POINT_NAME", data.getString("NAME")); +// } +// map.put("varList", varList); +// map.put("result", errInfo); +// return map; +// } + + /**列表 + * @throws Exception + */ +// @RequestMapping(value="/getHlsPathById") +// @ResponseBody +// public Object getHlsPath() throws Exception{ +// Map map = new HashMap(); +// PageData pd =this.getPageData(); +// pd = platformelectronicService.findById(pd); +// map = HKPostUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); +// map.put("pd",pd); +// map.put("result", "success"); +// return map; +// } + + +} diff --git a/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java similarity index 74% rename from src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java index daa30af0..7f9b4cdd 100644 --- a/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java @@ -1,17 +1,18 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; import com.zcloud.service.bus.RiskUnitService; import com.zcloud.service.keyProjects.PlatformvideomanagementService; +import com.zcloud.util.ReturnMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller -@RequestMapping("/ObtainDisplayData") -public class ObtainDisplayDataController extends BaseController { +@RequestMapping("/czks/ObtainDisplayData") +public class CzksObtainDisplayDataController extends BaseController { @Autowired private RiskUnitService riskUnitService; @@ -29,7 +30,9 @@ public class ObtainDisplayDataController extends BaseController { @ResponseBody public Object listAllCameraForMap() throws Exception{ PageData pd = this.getPageData(); - return platformvideomanagementService.listAllForMap(pd); + ReturnMap returnMap = new ReturnMap(); + returnMap.put("data", platformvideomanagementService.listAllForMap(pd)); + return returnMap; } diff --git a/src/main/java/com/zcloud/controller/map/UserPositionController.java b/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java similarity index 92% rename from src/main/java/com/zcloud/controller/map/UserPositionController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java index fb79df87..f686fa8d 100644 --- a/src/main/java/com/zcloud/controller/map/UserPositionController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java @@ -1,4 +1,4 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller -@RequestMapping("/UserPosition") -public class UserPositionController extends BaseController { +@RequestMapping("/czks/UserPosition") +public class CzksUserPositionController extends BaseController { @Autowired private UsersService usersService; diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 3523bcca..636b664d 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -132,12 +132,15 @@ public class MfolderController extends BaseController { @RequestMapping(value = "/batchUpload") @RequiresPermissions("mfolder:add") @ResponseBody + @DockAnnotation public Object batchUpload(@RequestParam(value = "FFILE", required = false) MultipartFile[] files, @RequestParam(value = "NAME", required = false) String NAME, @RequestParam(value = "PARENT_ID", required = false) String PARENT_ID, @RequestParam(value = "REMARKS", required = false) String REMARKS, @RequestParam(value = "SHARE", required = false) String SHARE) throws Exception { - Map map = new HashMap(); + Map map = new HashMap<>(); + ArrayList pictureList = new ArrayList<>(); + List mfolderServiceList = new ArrayList(); String errInfo = "success"; PageData pd = new PageData(); if (files != null && files.length > 0) { @@ -154,8 +157,7 @@ public class MfolderController extends BaseController { MultipartFile file = files[i]; String ffile = DateUtil.getDays(), fileName = ""; if (null != file && !file.isEmpty()) { -// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 -// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 + String MFOLDER_ID = this.get32UUID(); Long size = file.getSize()/1024; fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); @@ -172,18 +174,39 @@ public class MfolderController extends BaseController { pd.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间 pd.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名 pd.put("MASTER", Jurisdiction.getUsername()); // 用户名 -// pd.put("FILESIZE", FileUtil.getFilesize(Const.FILEURL + Const.FILEPATHFILE -// + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName)); // 文件大小 pd.put("REMARKS", REMARKS); // 备注 pd.put("SHARE", SHARE); // 是否共享 - pd.put("MFOLDER_ID", this.get32UUID()); // 主键 + pd.put("MFOLDER_ID", MFOLDER_ID); // 主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ + "@@" + +fileName); + + PageData pageData = new PageData(); + pd.put("FILEPATH", + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); // 文件路径 + pageData.put("FILESIZE", size); + pageData.put("NAME", realName2); // 文件名 + pageData.put("PARENT_ID", PARENT_ID); // 目录ID + pageData.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间 + pageData.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名 + pageData.put("MASTER", Jurisdiction.getUsername()); // 用户名 + pageData.put("REMARKS", REMARKS); // 备注 + pageData.put("SHARE", SHARE); // 是否共享 + pageData.put("MFOLDER_ID", MFOLDER_ID); // 主键 + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + mfolderServiceList.add(pageData); + mfolderService.save(pd); // 存入数据库表 } else { errInfo = "fail"; } } } + pd.put("sendPicturesList", JSON.toJSONString(mfolderServiceList)); + map.put("mfolderServiceList", JSON.toJSONString(pictureList)); + pd.put("mfolderServiceList",pictureList); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); // 返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java index f5768fb9..21156c53 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java @@ -1,12 +1,11 @@ package com.zcloud.controller.firemanager; import com.alibaba.fastjson.JSON; -import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.fireresources.FireResourcesService; +import com.zcloud.service.fireresources.CzksFireResourcesService; import com.zcloud.util.DateUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,7 +24,7 @@ import java.util.Map; public class FireResourcesController extends BaseController { @Resource - private FireResourcesService fireResourcesService; + private CzksFireResourcesService fireResourcesService; @RequestMapping(value = "/list") @ResponseBody public Object page(Page page) { diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java new file mode 100644 index 00000000..3647b9e0 --- /dev/null +++ b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java @@ -0,0 +1,97 @@ +package com.zcloud.controller.gatemachine; + +import com.zcloud.aspect.DockAnnotation; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.gatemachine.GateCarIOService; +import com.zcloud.util.ReturnMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 闸机车辆管理 + * LLX + * 2024-01-23 + */ +@RestController +@RequestMapping("/gateCar") +public class GateCarIOController extends BaseController { + + @Resource + private GateCarIOService gateCarIOService; + + /** + * 出入闸机车辆记录 + * @param page + * @return 记录 + */ + @RequestMapping(value = "/page") + public ReturnMap page(Page page) { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + page.setPd(pageData); + List data = gateCarIOService.getDatalistpage(page); + returnMap.put("varList", data); + returnMap.put("page", page); + return returnMap; + } + + /** + * 编辑出入闸机车辆记录 + * @return + */ + @RequestMapping(value = "/edit") + @DockAnnotation + public ReturnMap edit() { + PageData pd = this.getPageData(); + gateCarIOService.edit(pd); + return ReturnMap.ok(); + } + + /** + * 删除出入闸机车辆记录 + * @return + */ + @RequestMapping(value = "/removeByIds") + @DockAnnotation + public ReturnMap removeByIds() { + PageData pageData = this.getPageData(); + gateCarIOService.removeByIds(pageData); + return ReturnMap.ok(); + } + + /** + * 添加出入闸机车辆记录 + * @return + */ + @RequestMapping(value = "/add") + @DockAnnotation + public ReturnMap add() { + PageData pageData = this.getPageData(); + gateCarIOService.save(pageData); + return ReturnMap.ok(); + } + + /** + * 根据条件获取杂货/矿区闸机出入记录 + * @return + */ + @RequestMapping(value = "/getIORecords") + public ReturnMap getIORecord() { + return ReturnMap.ok().put("data", gateCarIOService.getIORecord(this.getPageData())); + } + + /** + * 获取在场，离场，总量计数 + * @return + */ + @RequestMapping(value = "/getEQCount") + public ReturnMap getTodayEQCount() { + return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(this.getPageData())); + } + +} diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 0910ae20..956b0961 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -33,6 +35,7 @@ public class PlatformvideomanagementController extends BaseController { @RequestMapping(value="/savePosition") @ResponseBody + @DockAnnotation public Object savePosition() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -46,10 +49,12 @@ public class PlatformvideomanagementController extends BaseController { } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @RequestMapping(value="/delLocation") @ResponseBody + @DockAnnotation public Object delLocation() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -57,6 +62,8 @@ public class PlatformvideomanagementController extends BaseController { pd = this.getPageData(); platformvideomanagementService.delLocation(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + return map; } /**新增 @@ -65,15 +72,16 @@ public class PlatformvideomanagementController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + PageData pd = this.getPageData(); pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 platformvideomanagementService.save(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -117,10 +125,580 @@ public class PlatformvideomanagementController extends BaseController { public Object platformList() throws Exception{ Map map = new HashMap(); PageData pd =this.getPageData(); - map = HKUtil.cameraSearch(pd); - if(ObjectUtils.isEmpty(map)){ - map = new HashMap(); - } + +// map = HKUtil.cameraSearch(pd); +// if(ObjectUtils.isEmpty(map)){ +// map = new HashMap(); +// } + String result = " [\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"13097300002160000004\",\n" + + "\t\t\t\t\"regionPath\": \"@root000000@9e4f2218-ac70-4473-bebe-a1c5dbacbf2f@34030000002001000001@13097300002160000000@13097300002160000004@\",\n" + + "\t\t\t\t\"cascadeType\": 1,\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/矿石作业区/矿石平台/矿石港务码头监控/堆取料机\",\n" + + "\t\t\t\t\"cascadeCode\": \"13097300002000052168\",\n" + + "\t\t\t\t\"latitude\": \"0.000000\",\n" + + "\t\t\t\t\"regionName\": \"堆取料机\",\n" + + "\t\t\t\t\"indexCode\": \"13097300001320000328\",\n" + + "\t\t\t\t\"updateTime\": \"2024-01-16T05:00:06.000+08:00\",\n" + + "\t\t\t\t\"sort\": -10005989,\n" + + "\t\t\t\t\"recordLocation\": \"0_1\",\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"disOrder\": -10005989,\n" + + "\t\t\t\t\"createTime\": \"2023-05-17T15:24:22.000+08:00\",\n" + + "\t\t\t\t\"name\": \"高压室二\",\n" + + "\t\t\t\t\"decodeTag\": \"ga_h264\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13097300001320000328\",\n" + + "\t\t\t\t\"longitude\": \"0.000000\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"13097300002160000004\",\n" + + "\t\t\t\t\"regionPath\": \"@root000000@9e4f2218-ac70-4473-bebe-a1c5dbacbf2f@34030000002001000001@13097300002160000000@13097300002160000004@\",\n" + + "\t\t\t\t\"cascadeType\": 1,\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/矿石作业区/矿石平台/矿石港务码头监控/堆取料机\",\n" + + "\t\t\t\t\"cascadeCode\": \"13097300002000052168\",\n" + + "\t\t\t\t\"latitude\": \"0.000000\",\n" + + "\t\t\t\t\"regionName\": \"堆取料机\",\n" + + "\t\t\t\t\"indexCode\": \"13097300001320000329\",\n" + + "\t\t\t\t\"updateTime\": \"2024-01-16T05:00:05.000+08:00\",\n" + + "\t\t\t\t\"sort\": -10006115,\n" + + "\t\t\t\t\"recordLocation\": \"0_1\",\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"disOrder\": -10006115,\n" + + "\t\t\t\t\"createTime\": \"2023-05-17T15:24:23.000+08:00\",\n" + + "\t\t\t\t\"name\": \"高压室一\",\n" + + "\t\t\t\t\"decodeTag\": \"ga_h264\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13097300001320000329\",\n" + + "\t\t\t\t\"longitude\": \"0.000000\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"4b85c88181cd4741b124d4b456bc7d14\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6768,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"5405983799d345d69a6289885d7bd365\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.978+08:00\",\n" + + "\t\t\t\t\"sort\": 6768,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"4c363eaefd36472297c44a239bf96003\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.438+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅洗消间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000838\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"e326096d6d3d4b8aab925ca05d897d46\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6767,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"8c6c6329869742f8a107e059704f3d8e\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.979+08:00\",\n" + + "\t\t\t\t\"sort\": 6767,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"8b8232c02a694704a761c7f3e81dbf0e\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:55.678+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅南侧楼梯\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000826\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"35dced7d3467425ea833eb4320b37490\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6766,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"5679d668c31f495984570370333d9b77\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.980+08:00\",\n" + + "\t\t\t\t\"sort\": 6766,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"9e8c625a9a064bfb831a8140c5aeebe3\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.789+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅南侧入口\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000846\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"0ff25bed693e444ba9540ef08c108902\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6735,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"f25ae4ce23404cc0a4aa9e53fd1731f1\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.981+08:00\",\n" + + "\t\t\t\t\"sort\": 6735,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"b0d6560cd494436cb9e03c36377fea2d\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:47.978+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅北侧楼梯\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000832\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"72560dd84bed4dae81a9ffa6186bc1ca\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6734,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"7bfda70b752b42a7a18760cd6b6a4458\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.982+08:00\",\n" + + "\t\t\t\t\"sort\": 6734,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"8cb5c82f17024819979aa8da9d79d3d0\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:55.259+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅北侧入口\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000833\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"2c12810d5a1144fa83caa36970fcdd0b\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6733,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"3b6a0aa63c11471097c80e892931a4f2\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.983+08:00\",\n" + + "\t\t\t\t\"sort\": 6733,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"a43bad8e99984d8ab07b079975cb7ad9\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:47.235+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东南角\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000835\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"6671cdcc8e494b998b4a080eafd0c721\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6732,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"ac2f62430dc44729862edfdb7bf607a4\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.984+08:00\",\n" + + "\t\t\t\t\"sort\": 6732,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"4556469b457f4f90a2543e1dfe0f921a\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:50.854+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东北角\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000822\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"58dc6742e9c644cca184ec4c5030d791\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6731,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"a1b8b2388ebe4bdc8e0d5f90e29e0646\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.985+08:00\",\n" + + "\t\t\t\t\"sort\": 6731,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"e4da9e19b5134f458b7cafaa4a15e8a0\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.044+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000824\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"277b614fe37c40c79bf6f86222d3bddb\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6730,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"3d38235515af45b48b7cbcc1bc5d0028\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.986+08:00\",\n" + + "\t\t\t\t\"sort\": 6730,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"3c2d71bf2be045b6a8dfe4872f0d5c03\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.713+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂菜类粗加工间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000840\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"7bf6563bdc4a442a972633749cff4047\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6729,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"ef013768f7fb4e67b9b10f22d260695c\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.987+08:00\",\n" + + "\t\t\t\t\"sort\": 6729,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"74dea9993b1e4abf93534f3d9717b666\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:49.676+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂肉类海产品粗加工间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000845\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"43a9b45c9664411e941003219dca1ead\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6728,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"61808f1d2fd6468caeb8326ddc3e2d6a\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.988+08:00\",\n" + + "\t\t\t\t\"sort\": 6728,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"dfbd0eeec8094d919c262d65848f9cd8\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.089+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂管理室\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000828\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"3c275a198d4c4bf5979dbae1bf9cbf0d\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6727,\n" + + "\t\t\t\t\"capability\": \"@event_vss@io@vss@record@ptz@remote_vss@net@maintenance@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"e8215420e6364bf182625fc372d11022\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.989+08:00\",\n" + + "\t\t\t\t\"sort\": 6727,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"2be64a34f89c4f3da3318bc7f5045cc6\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:48.926+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂监控机房\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000830\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"749e994d28c2474ba7d0bdf31535a956\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6726,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"d3c72e6747854832bc254cffd6cbabe4\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.990+08:00\",\n" + + "\t\t\t\t\"sort\": 6726,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"0cb8471dfe534beaaabae444b6c0cd62\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:58.376+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂清真厨房\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000849\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"f40b9801a09e4922bad2c3f916ee232f\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6725,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"d366a48139f84550867ae0cd31fde575\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.991+08:00\",\n" + + "\t\t\t\t\"sort\": 6725,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"d8131b366f0a464da807126f135bde07\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:57.419+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂室外气瓶室\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000827\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"85cde34633634b28bbef88ea323a6d30\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6724,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"f02324c0af874e06a4a09fd2e7b2fdc3\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.992+08:00\",\n" + + "\t\t\t\t\"sort\": 6724,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"c135a232f8a94848b1398f16758a1029\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:54.602+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂备餐区南侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000825\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"b313b0c0feca4fbea76b77f6ff510430\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6723,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"bfa53c5c696a4c4788e8264490c54626\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.993+08:00\",\n" + + "\t\t\t\t\"sort\": 6723,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"65996e9f1245416c9a38ff77a225b12b\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.371+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂备餐区北侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000836\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"7678102b59f543d8872c048e089837e3\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6722,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"b0435c02f51e4d38af98014162fc1998\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.994+08:00\",\n" + + "\t\t\t\t\"sort\": 6722,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"5398df57b1df4bd6917e26ae37404a59\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:58.736+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂售饭区南侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000834\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"60d63ac1107642889d11b568f3d62d80\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6721,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"e4683b93615b4adf9b171b1316dc28b2\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.995+08:00\",\n" + + "\t\t\t\t\"sort\": 6721,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"95355f0b298c4e8a9d32bd2b834e7521\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:57.071+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂售饭区北侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000831\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t}\n" + + "\t\t]"; + HashMap data = new HashMap<>(); + data.put("list", JSON.parseArray(result,PageData.class)); + map.put("data", data); map.put("result", "success"); return map; } diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index e0d41387..9d482538 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -1,35 +1,32 @@ package com.zcloud.controller.map; -import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.bimap.BiMapService; import com.zcloud.service.bus.CorpInfoService; -import com.zcloud.service.fireresources.FireResourcesService; +import com.zcloud.service.fireresources.CzksFireResourcesService; import com.zcloud.service.gatemachine.GateMachineService; -//import com.zcloud.service.keyProjects.MeteorologicalService; -//import com.zcloud.service.keyProjects.MeteorologicalinfoService; -import com.zcloud.service.keyProjects.PlatformvideomanagementService; import com.zcloud.service.keyProjects.VideoManagerService; +import com.zcloud.service.map.*; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.map.util.WeatherUtil; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; -import com.zcloud.util.HttpRequestUtil; import com.zcloud.util.Jurisdiction; -import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestBody; 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.client.RestTemplate; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 说明：实时地图 @@ -39,27 +36,36 @@ import java.util.Map; @RequestMapping("/map") public class MapController extends BaseController { - @Resource - private BiMapService biMapService; @Autowired private VideoManagerService videomanagerService; @Autowired private CorpInfoService corpInfoService; - @Autowired - private PlatformvideomanagementService platformvideomanagementService; @Autowired private UsersService usersService; -// @Autowired -// private MeteorologicalinfoService meteorologicalinfoService; - + @Autowired + private MeteorologicalinfoService meteorologicalinfoService; + @Autowired + private MeteorologicalService meteorologicalService; @Autowired private RestTemplate restTemplate; + @Value("${preventionxgf.api.url}") + private String url; + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + @Autowired - private FireResourcesService fireResourcesService; + private BiMapService biMapService; + @Autowired + private CzksFireResourcesService fireResourcesService; @Autowired private DepartmentService departmentService; @@ -67,11 +73,415 @@ public class MapController extends BaseController { @Autowired private GateMachineService gateMachineService; + @Autowired + private WeatherUtil weatherUtil; + + @ResponseBody + @RequestMapping("/getCorpInfo") + public Object getCorpInfo() throws Exception { + Map map = new HashMap(); + PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + + PageData entity = corpInfoService.findById(condition); + PageData info = new PageData(); + info.put("CORP_INFO_ID",entity.get("CORPINFO_ID")); + info.put("longitude",entity.get("LONGITUDE")); + info.put("latitude",entity.get("LATITUDE")); + map.put("info", info); + map.put("result", "success"); + return map; + } + + /** + * @Description: 单位基础信息 + * @Author: dearLin + * @Date: 2023/9/21/021 16:14 + * @Param: AREA + * @Return: java.lang.Object + */ + @RequestMapping(value = "/basicInformation") + @ResponseBody + public Object basicInformation() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + // 分公司数量 + PageData numberCountData = corpInfoService.listAllByArea(pd); + // 相关方单位数 + // 0 ->分公司企业数 + // 1 ->相关方单位数 + // 2 ->员工数 + Map result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class); + List unitCorp = (List) result.get("unitCorp"); + int size = unitCorp != null ? unitCorp.size() : 0; + // 员工数 + PageData userCountData = usersService.countAllByArea(pd); + PageData resData = new PageData(); + resData.put("UNITCOUNT", size); + resData.putAll(numberCountData); + resData.putAll(userCountData); + map.put("data", resData); + map.put("result", errInfo); + return map; + } + + /** + * @Description: 风险区域统计 + * @Author: dearLin + * @Date: 2023/9/21/021 16:14 + * @Param: AREA + * @Return: 重大风险区域数 + * @Return: 较大风险区域数 + * @Return: 一般风险区域数 + * @Return: 低风险区域数 + */ + @RequestMapping(value = "/getRiskAreaCount") + @ResponseBody + public Object getRiskAreaCount() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List riskIndex = biMapService.getRiskIndex(pd); + PageData pageData = new PageData(); + riskIndex.forEach(item -> { + pageData.put(item.getString("TYPE"), item.getString("COUNT")); + }); + map.put("pd", pageData); + map.put("result", errInfo); + return map; + } + + /** + * listRetrieval + * + * @Description: 单位人员信息统计 + * @Author: dearLin + * @Date: 2023/9/21/021 17:48 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getUnitPersonnel") + @ResponseBody + public Object getUnitPersonnel(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + page.setPd(pd); + if (pd.getString("INDEX").equals("0")) { + List varList = corpInfoService.listRetrieval(page); + map.put("varList", varList); + map.put("page", page); + } else { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("showCount", page.getShowCount()); + paramMap.add("currentPage", pd.get("currentPage")); +// Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + Map result = restTemplate.postForObject(xgfUrl + "/api/corpinfo/list", paramMap, Map.class); + map.put("varList", result.get("varList")); + map.put("page", result.get("page")); + } + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/corpsForMap") + @ResponseBody + public Object corpsForMap() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = corpInfoService.listAllForMap(pd); //根据ID读取 + for (PageData pageData : varList) { + if (StringUtils.isBlank(pageData.getString("CORP_NAME"))) { + pageData.put("MAP_POINT_NAME", ""); + } else { + pageData.put("MAP_POINT_NAME", pageData.getString("CORP_NAME")); + } + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbymeteorological") + @ResponseBody + public Object listbymeteorological() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + pd = meteorologicalinfoService.listbymeteorological(pd); //列出meteorological列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listbyType") + @ResponseBody + public Object listbyType(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + page.setPd(pd); + if (pd.getString("INDEX").equals("0") || "".equals(pd.getString("INDEX"))) { + List varList = meteorologicalService.listbyType(page); + for (PageData data : varList) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + map.put("varList", varList); + map.put("page", page); + } +// List varList = meteorologicalService.listbyType(page); //列出electronic列表 +// map.put("varList", varList); +// map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 设备数量 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbyequipmentcount") + @ResponseBody + public Object listbyequipmentcount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + pd = meteorologicalService.listbyequipmentcount(pd); //列出electronic列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 根据id以及类型获取气象监测信息数据 + * + * @param id 数据id + * @param type 数据类型 气象站 等等 + * @return + */ + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if (StringUtils.equals(typeStr, "293187ddfd984c9ab3fd716aef58da0e")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "561347f0cff641dba8b2b22c0f443348")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "2da29f00852a4653ba3e760b9de57412")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "732fe73933b845c6b1e2aee06a38ed31")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getWeatherInfo") + @ResponseBody + public Object getWeatherInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + map.put("data", WeatherUtil.getWeatherInfo()); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getPointsInfo") + @ResponseBody + public Object getPointsInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + + List pointsList = videomanagerService.getPointsInfo(pd); //根据ID读取 + map.put("pointsList", pointsList); + map.put("result", errInfo); + return map; + } + /*************************************************/ + + /** + * @Description: 风险辨识管控 + * 风险单元数 + * 辨识部位数 + * 风险因素数 + * @Author: dearLin + * @Date: 2023/9/19/019 16:14 + * @Param: CORPINFO_ID + * @Return: java.lang.Object + */ + @RequestMapping("/getRiskIdentificationCount") + @ResponseBody + public Object getRiskIdentificationCount() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + // bus_riskunit + // bus_identificationparts + + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/getRiskList", paramMap, Map.class); + return result; + } + PageData data = biMapService.getRiskIdentificationCount(pageData); + map.put("result", "success"); + map.put("riskIdentificationCount", data); + return map; + } + // 人员定位信息 + + /** + * @Description: 人员定位信息 + * @Author: dearLin + * @Date: 2023/9/20/020 11:06 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getPersonPositioningCount") + @ResponseBody + public Object getPersonPositioningCount() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = new HashMap(); + try { + result = restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/getUsersCount", paramMap, Map.class); + } catch (Exception e) { + result.put("regulatoryUsersInfo", 0); + result.put("preventionUsersInfo", 0); + } + try { + + Map perResult = restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentLocationOnlineCount", paramMap, Map.class); + result.put("perCount", perResult.get("perCount")); + } catch (Exception e) { + result.put("perCount", 0); + } + + return result; + } + // bus_riskunit + // bus_identificationparts + PageData data = biMapService.getPersonPositioningCount(pageData); + map.put("result", "success"); + map.put("personPositioningCount", data); + return map; + } + + /** + * @Description: 口门管理 Gate management + * @Author: dearLin + * @Date: 2023/9/20/020 11:07 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getDoorManagement") + @ResponseBody + public Object getDoorManagement() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pageData.get("id")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPerpleCarGateMachineCount", paramMap, Map.class); + return result; + } + List data = new ArrayList<>(); + PageData riskIndex = new PageData(); + riskIndex.put("title", "风险指数"); + riskIndex.put("list", biMapService.getRiskIndex(pageData)); + data.add(riskIndex); + // 今日情况 + /* + * todo + * 是否也按照公司来进行统计 + * bus_carduser 人员进出 + * bus_foreigncar 车辆进出 + * + * */ + PageData today = new PageData(); + today.put("title", "今日情况"); + today.put("list", biMapService.inAndoutPeoCarToday(pageData)); + data.add(today); + map.put("result", "success"); + map.put("varList", data); + return map; + } @RequestMapping("/getPointInfoADeviceByPid") @ResponseBody public Object getPointInfoADeviceByPid() { PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRE_POINT_ID", pd.getString("FIRE_POINT_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPointInfoADeviceByPid", paramMap, Map.class); + return result; + } PageData map = fireResourcesService.getPointInfoADeviceByPid(pd); map.put("result", "success"); return map; @@ -82,11 +492,31 @@ public class MapController extends BaseController { public Object getPointQualifiedPhotos() { Map map = new HashMap(); PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRE_POINT_ID", pd.getString("FIRE_POINT_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPointQualifiedPhotos", paramMap, Map.class); + return result; + } map.put("result", "success"); map.put("varList", fireResourcesService.getPointQualifiedPhotos(pd)); return map; } + //股份公司部门数量 所有的 + @RequestMapping(value = "/getRegulatoryDepartmentCount") + @ResponseBody + public Object getRegulatoryDepartmentCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = (List) departmentService.listAll(pd); + int size = pageData.size(); + map.put("regulatoryDepartmentCount", size); + map.put("result", errInfo); + return map; + } /** * @Description: 消防管控 @@ -100,6 +530,13 @@ public class MapController extends BaseController { public Object getFireControl() throws Exception { Map map = new HashMap(); PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("TYPE", pageData.getString("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getFireControl", paramMap, Map.class); + return result; + } LinkedList value = biMapService.getFireControl(pageData); for (PageData data : value) { data.put("MAP_POINT_NAME", data.getString("NAME")); @@ -147,21 +584,19 @@ public class MapController extends BaseController { return map; } - /** * 气象信息对接接口 * * @return * @throws Exception */ -// @RequestMapping(value = "/tongMeteorologicalinfoList") -// @ResponseBody -// public ReturnMap tongMeteorologicalinfoList(@RequestBody List list) throws Exception { -// ReturnMap r = new ReturnMap(); -// r = meteorologicalinfoService.tongbuMeteorologicalinfo(list); -// return r; -// } - + @RequestMapping(value = "/tongMeteorologicalinfoList") + @ResponseBody + public ReturnMap tongMeteorologicalinfoList(@RequestBody List list) throws Exception { + ReturnMap r = new ReturnMap(); + r = meteorologicalinfoService.tongbuMeteorologicalinfo(list); + return r; + } /** * @Description: 闸机设备在线情况 只有人车闸机 @@ -175,6 +610,12 @@ public class MapController extends BaseController { public ReturnMap getOnlineGateEquipment() { ReturnMap returnMap = new ReturnMap(); PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/listMapSluiceCount", paramMap, Map.class); + return ReturnMap.ok(result); + } PageData value = gateMachineService.getOnlineGateMachine(pageData); returnMap.put("pd", value); return returnMap; @@ -192,6 +633,21 @@ public class MapController extends BaseController { public ReturnMap getGatePosition() { ReturnMap returnMap = new ReturnMap(); PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + + MultiValueMap paramMap = new LinkedMultiValueMap(); + if ("CAMERA".equals(pageData.getString("TYPE"))) { + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/listAllCameraForMapToBayonet", paramMap, Map.class); + return ReturnMap.ok(result); + } else { + paramMap.add("TYPE", pageData.getString("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getGatePosition", paramMap, Map.class); + return ReturnMap.ok(result); + } + + } // List value = gateMachineService.getGatePosition(pageData); // 添加标点上的统一的title @@ -206,7 +662,6 @@ public class MapController extends BaseController { return returnMap; } - /** * @Description: 口门进出记录列表 * @Author: dearLin @@ -233,6 +688,25 @@ public class MapController extends BaseController { } } + /** + * @Description: 口门进出记录列表 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getCfdDoorWayRecords") + @ResponseBody + public ReturnMap getCfdDoorWayRecords() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("TYPE", pageData.get("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/listPerpleCarGateMachine", paramMap, Map.class); + return ReturnMap.ok(result); + } + /** * @Description: 闸机进出车、人的数量 @@ -246,7 +720,16 @@ public class MapController extends BaseController { public ReturnMap getGatesInAndOutNumById() { ReturnMap returnMap = new ReturnMap(); PageData pageData = this.getPageData(); - Map data = biMapService.getGatesInAndOutNumById(pageData); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pageData.get("id")); + paramMap.add("TYPE", pageData.get("TYPE")); + paramMap.add("status", pageData.get("status")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getGatesInAndOutNumById", paramMap, Map.class); + return ReturnMap.ok(result); + } + PageData data = biMapService.getGatesInAndOutNumById(pageData); returnMap.put("pd", data); return returnMap; } @@ -290,11 +773,19 @@ public class MapController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); - String corpinfoId = Jurisdiction.getCORPINFO_ID(); - pd.put("CORPINFO_ID", corpinfoId); - //获取当前人的公司id page.setPd(pd); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRE_DEVICE_TYPE_ID", pd.getString("FIRE_DEVICE_TYPE_ID")); + paramMap.add("FIRE_POINT_NAME", pd.getString("FIRE_POINT_NAME")); + paramMap.add("showCount", page.getShowCount()); + paramMap.add("currentPage", pd.get("currentPage")); + // /sync/map/fireDevice/listByMap?showCount=¤tPage= + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/fireDevice/listByMap", paramMap, Map.class); + return result; + } List varList = fireResourcesService.devicelistPage(page); map.put("varList", varList); map.put("page", page); @@ -314,6 +805,13 @@ public class MapController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pd.get("id")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPerpleCarGateMachineCount", paramMap, Map.class); + return result; + } map.put("result", errInfo); return map; } @@ -330,167 +828,6 @@ public class MapController extends BaseController { return map; } - /** - * 沧州矿石人员定位，告警数据 Alarm data - */ - @RequestMapping(value = "/getAlarmData") - @ResponseBody - public Object getAlarmData() { - return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", ""); - } - - /** - * @Description: 定位基础信息 - * @Author: dearLin - * @Date: 2024/1/6/006 11:15 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/getCzksBasicLocationInfoData") - @ResponseBody - public Object getCzksBasicLocationInfoData() { - return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", ""); - } - - @RequestMapping("/czks/getGatePosition") - @ResponseBody - public ReturnMap getCzksGatePosition() { - ReturnMap returnMap = new ReturnMap(); - PageData pageData = this.getPageData(); - // - pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - List value = gateMachineService.getGatePosition(pageData); - // 添加标点上的统一的title - for (PageData data : value) { - if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) { - data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME")); - } else { - data.put("MAP_POINT_NAME", data.getString("NAME")); - } - } - returnMap.put("varList", value); - return returnMap; - } - - /** - * @Description: 人员定位信息 - * @Author: dearLin - * @Date: 2024/1/6/006 17:33 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/czks/person/allPerson/listPage") - @ResponseBody - public Object getCzksOnlinePersion() throws Exception { - PageData pageData = this.getPageData(); - JSONObject request = new JSONObject(); - request.put("pageNum", 1); - request.put("pageSize", 10); - request.put("online", "true"); - // 人员定位在线 - ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); - pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - // 系统人员数 - int userCount = usersService.getUserCount(pageData); - // 系统部门数 - int departCount = departmentService.getDepartmentCount(pageData); - online.put("userCount",userCount); - online.put("departCount",departCount); - return online; - } - /** - * @Description: 电子围栏报警 Electronic fence - * @Author: dearLin - * @Date: 2024/1/6/006 11:15 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/czks/getFenceAlarmList") - @ResponseBody - public Object getFenceAlarmList() { - PageData pageData = this.getPageData(); - JSONObject request = new JSONObject(); - request.put("pageNum", pageData.getString("currentPage")); - request.put("pageSize", pageData.getString("showCount")); - request.put("beginTime", pageData.getString("beginTime")); - request.put("endTime", pageData.getString("endTime")); - request.put("alarmType", pageData.getString("alarmType")); - request.put("alarmStatus", pageData.getString("alarmStatus")); - request.put("realName", pageData.getString("realName")); - // 标签卡 - return HttpRequestUtil.getPeopleApi("/system/alarm/person/listPage", request.toString()); - } - /** - * @Description: 电子围栏报警 Electronic fence - * @Author: dearLin - * @Date: 2024/1/6/006 11:15 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/czks/getElectronicFenceList") - @ResponseBody - public Object getElectronicFenceList() { - PageData pageData = this.getPageData(); - JSONObject request = new JSONObject(); - request.put("pageNum", pageData.getString("currentPage")); - request.put("pageSize", pageData.getString("showCount")); - request.put("railName", pageData.getString("railName")); - // 标签卡 - return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString()); - } - - /** - * @Description: 获取摄像头定位 - * @Author: dearLin - * @Date: 2024/1/6/006 11:15 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/czks/getCameraPositioning") - @ResponseBody - public Object getCameraPositioning() { - ReturnMap returnMap = new ReturnMap(); - PageData pageData = new PageData(); - pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); - List dataList = platformvideomanagementService.listAllForMap(pageData); - returnMap.put("varList",dataList); - return returnMap; - } - /** - * @Description: 设备在线情况 - * @Author: dearLin - * @Date: 2024/1/6/006 11:15 - * @Param: [] [] - * @Return: java.lang.Object - */ - @RequestMapping(value = "/czks/getListMapSluiceCount") - @ResponseBody - public Object getListMapSluiceCount() { - ReturnMap returnMap = new ReturnMap(); - PageData pageData = new PageData(); - pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); - List dataList = platformvideomanagementService.getListMapSluiceCount(pageData); - returnMap.put("varList",dataList); - return returnMap; - } - @RequestMapping(value = "/czks/person/staff/listPage") - @ResponseBody - public Object getCzksPersonStaffListPage() { - PageData pageData = this.getPageData(); - JSONObject request = new JSONObject(); - request.put("pageNum", pageData.getString("pageNum")); - request.put("pageSize", pageData.getString("pageSize")); - // 普通员工 - if ("1".equals(pageData.getString("type"))) { - return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString()); - } else { - // 相关方 员工 - return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); - } - } - /** - * 沧州矿石人员定位结束 定位基础信息 - */ /** * 获取人员、车辆进出记录 * @@ -502,11 +839,28 @@ public class MapController extends BaseController { public Object getCurrentLocationOnline() { Map map = new HashMap(); String errInfo = "success"; + PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentLocationOnline", paramMap, Map.class); + return result; + } else if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("carPosition")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCarCurrentLocationOnline", paramMap, Map.class); + return result; + } else if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("CAMERA")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/listAllCameraForMap", paramMap, Map.class); + return result; + } map.put("result", errInfo); return map; } - // 获取人员定位信息 根据定位卡(身份证)编码 + // 获取人员定位信息 根据定位卡编码 @RequestMapping(value = "/getPersonByCardNo") @ResponseBody public Object getPersonByCardNo() throws Exception { @@ -527,8 +881,12 @@ public class MapController extends BaseController { @ResponseBody public Object getHlsPath() throws Exception { Map map = new HashMap(); - - return map; + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("INDEXCODE", pd.get("INDEXCODE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getHlsPath", paramMap, Map.class); + return result; } /** @@ -541,13 +899,87 @@ public class MapController extends BaseController { public Object getCurrentPersonnelData() throws Exception { Map map = new HashMap(); PageData pd = this.getPageData(); - return map; + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("route", pd.get("route")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentPersonnelData", paramMap, Map.class); + return result; + } + + /** + * 查询告警数据甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/getCfdAlarmNum") + @ResponseBody + public Object getCfdAlarmNum() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getAlarmNum", paramMap, Map.class); + return result; + } + + /** + * 车辆在线及统计数据(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/getCurrentCarData") + @ResponseBody + public Object getCurrentCarData() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("route", pd.get("route")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentCarData", paramMap, Map.class); + return result; + } + + /** + * 车辆在线及统计数据(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/carPositioningStatistics") + @ResponseBody + public Object carPositioningStatistics() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("route", pd.get("route")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/carPositioningStatistics", paramMap, Map.class); + return result; + } + + /** + * 获取人员定位统计列表(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/personPositioningStatistics") + @ResponseBody + public Object personPositioningStatistics() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("route", pd.get("route")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/personPositioningStatistics", paramMap, Map.class); + return result; } @RequestMapping("/getUserMapInfo") @ResponseBody public ReturnMap getUserMapInfo() throws Exception { - PageData pd = this.getPageData(); + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); pd = usersService.findByCardNo(pd); //列出HotWorkApplicationDelayed列表 ReturnMap r = ReturnMap.ok(); r.put("pd", pd); diff --git a/src/main/java/com/zcloud/controller/map/MapEightCfdController.java b/src/main/java/com/zcloud/controller/map/MapEightCfdController.java new file mode 100644 index 00000000..65ad33fc --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapEightCfdController.java @@ -0,0 +1,76 @@ +package com.zcloud.controller.map; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.MapEightCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/map/Eight/cfd") +public class MapEightCfdController extends BaseController { + @Autowired + private MapEightCfdService mapEightCfdService; + + /** + * 根据id以及类型获取数据 + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getByIdOrder") + @ResponseBody + public Object getByIdOrder(@RequestParam(value = "id")String id,@RequestParam("TYPE") String type) throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + return mapEightCfdService.getByIdOrder(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = mapEightCfdService.listAll(pd); //列出HotWorkApplicationDelayed列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**获取动火防护措施 + * @param + * @throws Exception + */ + @RequestMapping(value="/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = mapEightCfdService.listAllMeasures(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/map/MapEightController.java b/src/main/java/com/zcloud/controller/map/MapEightController.java index e55d3ba1..9e6e291c 100644 --- a/src/main/java/com/zcloud/controller/map/MapEightController.java +++ b/src/main/java/com/zcloud/controller/map/MapEightController.java @@ -4,15 +4,19 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.map.MapEightService; -import com.zcloud.util.Jurisdiction; +import com.zcloud.service.map.util.ReturnMap; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; 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.client.RestTemplate; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,6 +31,8 @@ public class MapEightController extends BaseController { @Autowired private MapEightService mapEightService; + @Value("${cfd.prevention.api.url}") + private String cfdUrl; @Autowired private RestTemplate restTemplate; @@ -37,10 +43,19 @@ public class MapEightController extends BaseController { @RequestMapping(value = "/getEcharts") @ResponseBody public Object getEcharts() throws Exception { - PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - - return mapEightService.getEchartsOrder(pd); + PageData pd = new PageData(); + pd = this.getPageData(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 + return mapEightService.getEcharts(pd); + }else if (StringUtils.equals("8854edee3aa94be496cee676b6d4845a", pd.getString("CORPINFO_ID"))) { //曹妃甸东 + MultiValueMap paramMap = new LinkedMultiValueMap(); + //paramMap.add("CORPINFO_ID", pd.getString("CORPINFO_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getEcharts", paramMap, Map.class); + return result; + } else { + return mapEightService.getEchartsOrder(pd); + } } /** @@ -54,11 +69,23 @@ public class MapEightController extends BaseController { public Object findFormCount() throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - - PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); - map.put("pd", data); + PageData pd = new PageData(); + pd = this.getPageData(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { // 一公司 + /*风险管控 数据统计*/ + //获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]） + PageData data = mapEightService.statisticsHighRiskWorkByState(pd); + map.put("pd", data); + }else if (StringUtils.equals("8854edee3aa94be496cee676b6d4845a", pd.getString("CORPINFO_ID"))) { //曹妃甸东 + MultiValueMap paramMap = new LinkedMultiValueMap(); + //paramMap.add("CORPINFO_ID", pd.getString("CORPINFO_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findFormCount", paramMap, Map.class); + return result; + } else { + PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); + map.put("pd", data); + } //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); map.put("result", errInfo); return map; @@ -75,10 +102,32 @@ public class MapEightController extends BaseController { public Object listHighRiskWork(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = new ArrayList<>(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } page.setPd(pd); - List varList = mapEightService.listHighRiskWorkOrder(page); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 + //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + varList = mapEightService.listHighRiskWork(page); + } else if (StringUtils.equals("8854edee3aa94be496cee676b6d4845a", pd.getString("CORPINFO_ID"))) { //曹妃甸 + MultiValueMap paramMap = new LinkedMultiValueMap(); + //paramMap.add("CORPINFO_ID", pd.getString("CORPINFO_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/listHighRiskWork", paramMap, Map.class); + return result; + } else { + varList = mapEightService.listHighRiskWorkOrder(page); + } map.put("varList", varList); map.put("result", errInfo); return map; @@ -92,13 +141,53 @@ public class MapEightController extends BaseController { */ @RequestMapping(value = "/listAllHighRiskWorkLocation") @ResponseBody - public Object listAllHighRiskWorkLocation() throws Exception { + public Object listAllHighRiskWorkLocation(@RequestParam(value = "CORPINFO_ID") String CORPINFO_ID, @RequestParam("TYPE") String type, @RequestParam("GANGKOU") String GANGKOU, @RequestParam("AREA") String AREA) throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - List varList; - if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 + PageData pd = new PageData(); + pd = this.getPageData(); + //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + List varList = new ArrayList<>(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + if (StringUtils.equals("8854edee3aa94be496cee676b6d4845a", pd.getString("CORPINFO_ID"))) { //曹妃甸 + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("TYPE", pd.getString("TYPE")); + if (StringUtils.equals("CAMERA", pd.getString("TYPE"))) { + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/listAllCameraForMap", paramMap, Map.class); + List> pageDataList = (List>) result.get("varList"); + if(pageDataList.size()>0){ + for(int i = 0;i stringMap = pageDataList.get(i); + stringMap.put("CORPINFO_ID","635917e77af8461691d5da5507b56347"); + } + } + result.put("varList",pageDataList); + return result; + } else { + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/listAllHighRiskWorkLocation", paramMap, Map.class); + List> pageDataList = (List>) result.get("varList"); + if(pageDataList.size()>0){ + for(int i = 0;i stringMap = pageDataList.get(0); + stringMap.put("CORPINFO_ID","635917e77af8461691d5da5507b56347"); + } + } + result.put("varList",pageDataList); + return result; + } + } + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 varList = mapEightService.listAllHighRiskWorkLocation(pd); } else { varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); @@ -119,8 +208,6 @@ public class MapEightController extends BaseController { @ResponseBody public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { PageData pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - return mapEightService.getById(pd); } @@ -137,8 +224,6 @@ public class MapEightController extends BaseController { public Object getByIdOrder(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - return mapEightService.getByIdOrder(pd); } @@ -156,8 +241,6 @@ public class MapEightController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - List varList = mapEightService.listAll(pd); //列出HotWorkApplicationDelayed列表 map.put("varList", varList); map.put("page", page); @@ -178,12 +261,94 @@ public class MapEightController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 - + // 港口04消防点东港 + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("HOTWORKAPPLICATION_ID", pd.getString("HOTWORKAPPLICATION_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/listAllMeasures", paramMap, Map.class); + return result; + } List varList = mapEightService.listAllMeasures(pd); //根据ID读取 map.put("varList", varList); map.put("result", errInfo); return map; } + + /** + * 根据id以及类型获取数据 //曹妃甸东 + * + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getByIdCfdD") + @ResponseBody + public Object getByIdCfdD(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pd.getString("id")); + paramMap.add("TYPE", pd.getString("TYPE")); + paramMap.add("HOTWORK_ID", pd.getString("HOTWORK_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getByIdOrder", paramMap, Map.class); + return result; + } + + /*曹妃甸专用接口-开始*/ + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getAllWorkUserCards") + @ResponseBody + public ReturnMap getAllWorkUserCards() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllWorkUserCards", paramMap, Map.class); + return ReturnMap.ok(result); + } + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getAllTickets") + @ResponseBody + public ReturnMap getAllTickets() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllTickets", paramMap, Map.class); + return ReturnMap.ok(result); + } + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/findEightsByUserId") + @ResponseBody + public ReturnMap findEightsByUserId() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("empNo", pageData.getString("empNo")); + paramMap.add("TYPE", pageData.getString("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findEightsByUserId", paramMap, Map.class); + return ReturnMap.ok(result); + } + + + /*曹妃甸专用接口-结束*/ + } diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java new file mode 100644 index 00000000..6051ea30 --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java @@ -0,0 +1,123 @@ +package com.zcloud.controller.map; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.MapEightService; +import com.zcloud.service.map.MapKetProjectService; +import com.zcloud.util.Jurisdiction; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/map/keyProject") +public class MapKeyProjectController extends BaseController { + + @Autowired + private MapKetProjectService mapKetProjectService; + + @Autowired + private MapEightService mapEightService; + + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + @Autowired + private RestTemplate restTemplate; + + /** + * 可视化首页统计数据 + * 重点工程开工数量：STATE_COUNT + * 视频总数：VIDEO_COUNT + * 安全环保检查总数：CHECK_COUNT + * 隐患总数：HIDDEN_COUNT + * 处罚总数：PUNISH_COUNT + * 处罚金额：AMOUT_SUM + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/findFormCount") + @ResponseBody + public Object findFormCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + return mapKetProjectService.findFormCount(pd); + } + + /** + * 隐患处理记录（最新18条） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + page.setPd(pd); + return mapKetProjectService.list(page); + } + + /** + * 获取所有数据的位置坐标（有坐标数据） 根据type区分是视频还是工程 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listAllLocation") + @ResponseBody + public Object listAllLocation(@RequestParam(value = "CORPINFO_ID") String CORPINFO_ID, @RequestParam("TYPE") String type, @RequestParam("GANGKOU") String GANGKOU, @RequestParam("AREA") String AREA) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + return mapKetProjectService.listAllLocation(pd); + } + + + /** + * 根据id以及类型获取数据 + * + * @param id 数据id + * @param type 数据类型 重点工程 视频 + * @return + */ + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + PageData pd = this.getPageData(); + return mapKetProjectService.getById(pd); + + } + +} diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java index c5878205..c26eb59c 100644 --- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java +++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java @@ -2,12 +2,12 @@ package com.zcloud.controller.map; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; -//import com.zcloud.service.keyProjects.PlatformelectronicService; -//import com.zcloud.util.hk.HKPostUtil; +import com.zcloud.service.map.util.HKPostUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import com.zcloud.service.map.PlatformelectronicService; import java.util.HashMap; import java.util.List; @@ -16,77 +16,77 @@ import java.util.Map; @Controller @RequestMapping("/map/mapPlatformelectronic") public class MapPlatFormElectronicController extends BaseController { -// @Autowired -// private PlatformelectronicService platformelectronicService; + @Autowired + private PlatformelectronicService platformelectronicService; /**总摄像头数 * @throws Exception */ -// @RequestMapping(value="/listAll") -// @ResponseBody -// public Object listAll() throws Exception{ -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表 -// map.put("allForMap", allForMap); -// map.put("result", errInfo); -// return map; -// } + @RequestMapping(value="/listAll") + @ResponseBody + public Object listAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表 + map.put("allForMap", allForMap); + map.put("result", errInfo); + return map; + } /**根据区域统计摄像头总数 * @throws Exception */ -// @RequestMapping(value="/listAllByArea") -// @ResponseBody -// public Object listAllByArea() throws Exception{ -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// List countAllByArea = platformelectronicService.countAllByArea(pd); //列出Platformelectronic列表 -// map.put("varList", countAllByArea); -// map.put("result", errInfo); -// return map; -// } + @RequestMapping(value="/listAllByArea") + @ResponseBody + public Object listAllByArea() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List countAllByArea = platformelectronicService.countAllByArea(pd); //列出Platformelectronic列表 + map.put("varList", countAllByArea); + map.put("result", errInfo); + return map; + } /**地图插点 * @throws Exception */ -// @RequestMapping(value="/listAllLocation") -// @ResponseBody -// public Object listAllLocation() throws Exception{ -// Map map = new HashMap(); -// String errInfo = "success"; -// PageData pd = new PageData(); -// pd = this.getPageData(); -// pd.put("forMap","1"); -// List varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表 -// for (PageData data : varList) { -// data.put("MAP_POINT_NAME", data.getString("NAME")); -// } -// map.put("varList", varList); -// map.put("result", errInfo); -// return map; -// } + @RequestMapping(value="/listAllLocation") + @ResponseBody + public Object listAllLocation() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("forMap","1"); + List varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表 + for (PageData data : varList) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } /**列表 * @throws Exception */ -// @RequestMapping(value="/getHlsPathById") -// @ResponseBody -// public Object getHlsPath() throws Exception{ -// Map map = new HashMap(); -// PageData pd =this.getPageData(); -// pd = platformelectronicService.findById(pd); -// map = HKPostUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); -// map.put("pd",pd); -// map.put("result", "success"); -// return map; -// } + @RequestMapping(value="/getHlsPathById") + @ResponseBody + public Object getHlsPath() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + pd = platformelectronicService.findById(pd); + map = HKPostUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); + map.put("pd",pd); + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index d1035e11..d74b210b 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -1949,11 +1949,18 @@ public class UsersController extends BaseController { // @RequiresPermissions("fromExcel") @SuppressWarnings("unchecked") @ResponseBody + @DockAnnotation public Object readExcel3(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception { String errInfo = "success"; Map retMap = new HashMap<>(); PageData pd = new PageData(); StringBuffer msgString = new StringBuffer(); + List departmentServiceList = new ArrayList<>(); + List crewServiceList = new ArrayList<>(); + List postServiceList = new ArrayList<>(); + List usersServiceList = new ArrayList<>(); + List userInfoServiceList = new ArrayList<>(); + List dictionariesCorpServiceList = new ArrayList<>(); String type = ""; if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -2150,6 +2157,7 @@ public class UsersController extends BaseController { userPd.put("WORKING_DATE", pageData.getString("var8")); userPd.put("DEPARTMENT_ID", realDept); userPd.put("INCUMBENCY", pageData.getString("var9")); + userPd.put("CARDNO", pageData.getString("var10")); addUser.put(pageData.getString("var4"), userPd); } else { msgString.append("第" + i + "行用户重复;"); @@ -2170,6 +2178,7 @@ public class UsersController extends BaseController { dept.put("PARENT_ID", corpId); dept.put("DEP_ORDER", deptOrder); dept.put("ISSUPERVISE", "0"); + departmentServiceList.add(dept); departmentService.save(dept); deptOrder++; } @@ -2185,6 +2194,7 @@ public class UsersController extends BaseController { dept.put("PARENT_ID", deptIdAndBauziId[0]); dept.put("DEP_ORDER", deptOrder); dept.put("ISSUPERVISE", "0"); + crewServiceList.add(dept); departmentService.save(dept); } for (Map.Entry entry : addPostMap.entrySet()) { //岗位 @@ -2201,6 +2211,7 @@ public class UsersController extends BaseController { post.put("CREATTIME", DateUtil.date2Str(new Date())); post.put("OPERATOR", Jurisdiction.getUSER_ID()); post.put("OPERATTIME", DateUtil.date2Str(new Date())); + postServiceList.add(post); postService.save(post); } for (Map.Entry entry : addUser.entrySet()) { @@ -2219,6 +2230,7 @@ public class UsersController extends BaseController { userPd.put("ISMAIN", "0"); userPd.put("SORT", "0"); userPd.put("ISDELETE", "0"); + userPd.put("CARDNO", pageData.get("CARDNO")); // 判断是否添加在线学习人员字段信息 if ( @@ -2230,6 +2242,7 @@ public class UsersController extends BaseController { ) { userPd.put("IS_ONLINELEARNING", "1"); } + usersServiceList.add(userPd); usersService.saveUser(userPd); PageData userInfo = new PageData(); @@ -2262,6 +2275,7 @@ public class UsersController extends BaseController { userInfo.put("INCUMBENCY", dictionaries.get("DICTIONARIES_ID")); } } + userInfoServiceList.add(userInfo); userInfoService.save(userInfo); } @@ -2279,6 +2293,7 @@ public class UsersController extends BaseController { dicCorp.put("OPERATOR", Jurisdiction.getUSER_ID()); dicCorp.put("OPERATTIME", DateUtil.date2Str(new Date())); dicCorp.put("ISDELETE", "0"); + dictionariesCorpServiceList.add(dicCorp); dictionariesCorpService.save(dicCorp); } for (Map.Entry entry : addzhichengMap.entrySet()) { @@ -2295,6 +2310,7 @@ public class UsersController extends BaseController { dicCorp.put("OPERATOR", Jurisdiction.getUSER_ID()); dicCorp.put("OPERATTIME", DateUtil.date2Str(new Date())); dicCorp.put("ISDELETE", "0"); + dictionariesCorpServiceList.add(dicCorp); dictionariesCorpService.save(dicCorp); } File old = new File(filePath, fileName); @@ -2303,6 +2319,14 @@ public class UsersController extends BaseController { retMap.put("msg", msgString.toString()); //返回结果 retMap.put("type", type); //返回结果 retMap.put("result", errInfo); //返回结果 + PageData pageData = new PageData(); + pageData.put("departmentServiceList", departmentServiceList); + pageData.put("crewServiceList", crewServiceList); + pageData.put("postServiceList", postServiceList); + pageData.put("usersServiceList", usersServiceList); + pageData.put("userInfoServiceList", userInfoServiceList); + pageData.put("dictionariesCorpServiceList", dictionariesCorpServiceList); + retMap.put("dockData", JSON.toJSONString(pageData)); return retMap; } diff --git a/src/main/java/com/zcloud/entity/PageData.java b/src/main/java/com/zcloud/entity/PageData.java index e4b86f2d..da75e29c 100644 --- a/src/main/java/com/zcloud/entity/PageData.java +++ b/src/main/java/com/zcloud/entity/PageData.java @@ -148,4 +148,11 @@ public class PageData extends HashMap implements Map list); + + Integer updateMeteorologicalinfo(PageData pageData); + + /** + * 10秒内相同设备的数据 + * @param pd + * @return + */ + List tensList(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java new file mode 100644 index 00000000..e3b1a705 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java @@ -0,0 +1,69 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformelectronicMapper { + + /**新增 + * @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); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 获取总摄像头数 + * @param pd + * @return + */ + Integer countAllForMap(PageData pd); + + + List countAllByArea(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/bus/CorpInfoService.java b/src/main/java/com/zcloud/service/bus/CorpInfoService.java index fb4881d3..7eaf073a 100644 --- a/src/main/java/com/zcloud/service/bus/CorpInfoService.java +++ b/src/main/java/com/zcloud/service/bus/CorpInfoService.java @@ -89,6 +89,12 @@ public interface CorpInfoService{ */ void editCorpUserNew(PageData pd)throws Exception; + PageData listAllByArea(PageData pd) throws Exception; + + List listRetrieval(Page page) throws Exception; + + List listAllForMap(PageData pd) throws Exception; + List getSelectByCorpInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/bus/HiddenService.java b/src/main/java/com/zcloud/service/bus/HiddenService.java index 88cad8ae..edbefe61 100644 --- a/src/main/java/com/zcloud/service/bus/HiddenService.java +++ b/src/main/java/com/zcloud/service/bus/HiddenService.java @@ -1,6 +1,8 @@ package com.zcloud.service.bus; import java.util.List; +import java.util.Map; + import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -442,5 +444,8 @@ public interface HiddenService{ * @throws Exception */ public void updateGoConfirm(PageData hiddens)throws Exception; + + //根据Source查询Hidden + public List findBySource(Integer sourceNumber); } diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index 966410d9..29db6bb4 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -122,6 +122,21 @@ public class CorpInfoServiceImpl implements CorpInfoService{ corpinfoMapper.editCorpUserNew(pd); } + @Override + public PageData listAllByArea(PageData pd) throws Exception { + return corpinfoMapper.listAllByArea(pd); + } + + @Override + public List listRetrieval(Page page) throws Exception { + return corpinfoMapper.datalistPageRetrieval(page); + } + + @Override + public List listAllForMap(PageData pd) throws Exception { + return corpinfoMapper.listAllForMap(pd); + } + @Override public List getSelectByCorpInfo(PageData pd) { return corpinfoMapper.getSelectByCorpInfo(pd); diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java index 9eb2acd9..d241489a 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java @@ -703,5 +703,10 @@ public class HiddenServiceImpl implements HiddenService{ public void updateGoConfirm(PageData hiddens)throws Exception{ hiddenMapper.updateGoConfirm(hiddens); } + + @Override + public List findBySource(Integer sourceNumber) { + return hiddenMapper.findBySource(sourceNumber); + } } diff --git a/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java index 4dbf8ae1..c2c14e9a 100644 --- a/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Map; import com.zcloud.mapper.datasource.bus.IdentificationPartsMapper; import com.zcloud.mapper.datasource.bus.RiskPointMapper; +import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -118,6 +119,7 @@ public class RiskUnitServiceImpl implements RiskUnitService{ Map map = new HashMap(); String errInfo = "success"; //获取风险单元数、辨识部位数和风险因素数 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List riskUnit = riskunitMapper.listAll(pd); List identificationParts = identificationPartsMapper.listAll(pd); List riskPoint = riskPointMapper.listAll(pd); diff --git a/src/main/java/com/zcloud/service/bimap/BiMapService.java b/src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java similarity index 94% rename from src/main/java/com/zcloud/service/bimap/BiMapService.java rename to src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java index cd641bf6..3c370ec4 100644 --- a/src/main/java/com/zcloud/service/bimap/BiMapService.java +++ b/src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.bimap; +package com.zcloud.service.czksbimap; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -12,7 +12,7 @@ import java.util.Map; * 作者：wangxuan * 官网：www.zcloudchina.com */ -public interface BiMapService { +public interface CzksBiMapService { List getDoorWayPeopleRecords(Page page); diff --git a/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java new file mode 100644 index 00000000..59982661 --- /dev/null +++ b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java @@ -0,0 +1,101 @@ +package com.zcloud.service.czksbimap; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; +import java.util.Map; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface CzksMapEightService { + + List getCorpinfoIds(PageData pd); + + Object getEcharts(PageData pd); + + PageData statisticsHighRiskWorkByState(PageData pd)throws Exception; + + /** + * 作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List listHighRiskWork(Page page)throws Exception; + + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * @param pd + * @return + * @throws Exception + */ + List listAllHighRiskWorkLocation(PageData pd)throws Exception; + + + /**动火 + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**动火 + * @param pd + * @throws Exception + */ + List listAllMeasures(PageData pd); + + /** + * 根据id获取数据 + * @param pd + * @return + */ + Map getById (PageData pd); + + /** + * 获取其他公司柱状图 + * @param pd + * @return + */ + Object getEchartsOrder(PageData pd); + + /** + * 其他公司获取统计数据 + * @param pd + * @return + * @throws Exception + */ + PageData statisticsHighRiskWorkByStateOrder(PageData pd)throws Exception; + + /** + * 其他作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List listHighRiskWorkOrder(Page page)throws Exception; + + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * @param pd + * @return + * @throws Exception + */ + List listAllHighRiskWorkLocationOrder(PageData pd)throws Exception; + + /** + * 获取其他公司详细数据 + * @param pd + * @return + */ + Map getByIdOrder(PageData pd); + + Object getAllWorkUserCards(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java similarity index 90% rename from src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java rename to src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java index 8920398d..4f705f76 100644 --- a/src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java @@ -1,15 +1,15 @@ -package com.zcloud.service.bimap.impl; +package com.zcloud.service.czksbimap.impl; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.bimap.BiMapMapper; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; -import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper; +import com.zcloud.mapper.datasource.czksbimap.CzksBiMapMapper; +import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper; -import com.zcloud.service.bimap.BiMapService; -import com.zcloud.util.biMapFactory.AbsFireSourcesHandel; -import com.zcloud.util.biMapFactory.AssemblyBeanFactory; +import com.zcloud.service.czksbimap.CzksBiMapService; +import com.zcloud.util.czksBiMapFactory.AbsCzksFireSourcesHandel; +import com.zcloud.util.czksBiMapFactory.CzksAssemblyBeanFactory; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -26,13 +26,13 @@ import java.util.*; * 官网：www.zcloudchina.com */ @Service -public class BiMapServiceImpl implements BiMapService { +public class CzksBiMapServiceImpl implements CzksBiMapService { @Resource - private BiMapMapper biMapMapper; + private CzksBiMapMapper czksBiMapper; @Resource - private FireResourcesMapper fireResourcesMapper; + private CzksFireResourcesMapper czksfireResourcesMapper; @Autowired private RestTemplate restTemplate; @Value("${perLoc.url}") @@ -53,7 +53,7 @@ public class BiMapServiceImpl implements BiMapService { */ @Override public List getDoorWayPeopleRecords(Page page) { - return biMapMapper.getPeopleRecordslistPage(page); + return czksBiMapper.getPeopleRecordslistPage(page); } /** @@ -65,18 +65,19 @@ public class BiMapServiceImpl implements BiMapService { */ @Override public List getDoorWayCarRecords(Page page) { - return biMapMapper.getCarRecordslistPage(page); + return czksBiMapper.getCarRecordslistPage(page); } @Override public PageData getRiskIdentificationCount(PageData pageData) { - return biMapMapper.getRiskIdentificationCount(pageData); + return czksBiMapper.getRiskIdentificationCount(pageData); // bus_riskunit // bus_identificationparts } + @Override public PageData listbymeteorological(PageData pd) throws Exception { - return biMapMapper.listbymeteorological(pd); + return czksBiMapper.listbymeteorological(pd); } @Override @@ -84,29 +85,29 @@ public class BiMapServiceImpl implements BiMapService { String area = pd.getString("AREA"); if (StringUtils.isNotBlank(area)) { String[] ArrayDATA_IDS = area.split(","); - return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + return czksBiMapper.getCorpinfoIds(ArrayDATA_IDS); } String gangkou = pd.getString("GANGKOU"); if (StringUtils.equals("00003", gangkou)) { String[] ArrayDATA_IDS = new String[]{"1", "2"}; - return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + return czksBiMapper.getCorpinfoIds(ArrayDATA_IDS); } return new ArrayList<>(); } @Override public PageData getPersonPositioningCount(PageData pageData) { - return biMapMapper.getPersonPositioningCount(pageData); + return czksBiMapper.getPersonPositioningCount(pageData); } @Override public List getRiskIndex(PageData pageData) { - return biMapMapper.getRiskIndex(pageData); + return czksBiMapper.getRiskIndex(pageData); } @Override public List inAndoutPeoCarToday(PageData pageData) { - return biMapMapper.inAndoutPeoCarToday(pageData); + return czksBiMapper.inAndoutPeoCarToday(pageData); } /** @@ -141,7 +142,7 @@ public class BiMapServiceImpl implements BiMapService { // } String fireresourcesType = pageData.getString("TYPE"); // 目前没有消防点位 - AbsFireSourcesHandel invokeStrategy = AssemblyBeanFactory.getInvokeStrategy(fireresourcesType); + AbsCzksFireSourcesHandel invokeStrategy = CzksAssemblyBeanFactory.getInvokeStrategy(fireresourcesType); if (invokeStrategy != null) { return invokeStrategy.assemblyDataHandel(pageData); } @@ -152,7 +153,7 @@ public class BiMapServiceImpl implements BiMapService { @Override public LinkedList getFireRescueTeam(PageData pageData) { - return fireResourcesMapper.getRescueTeamDataList(pageData); + return czksfireResourcesMapper.getRescueTeamDataList(pageData); } /*@Override diff --git a/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java new file mode 100644 index 00000000..3910705e --- /dev/null +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java @@ -0,0 +1,607 @@ +package com.zcloud.service.czksbimap.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.czksbimap.CzksMapEightMapper; +import com.zcloud.mapper.datasource.system.UsersMapper; + +import com.zcloud.service.czksbimap.CzksMapEightService; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 说明：实时地图八项工作 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CzksMapEightServiceImpl implements CzksMapEightService { + + @Autowired + private CzksMapEightMapper mapEightMapper; + @Autowired + private UsersMapper usersMapper; + + @Override + public List getCorpinfoIds(PageData pd) { + String area = pd.getString("AREA"); + if(StringUtils.isNotBlank(area)){ + String[] ArrayDATA_IDS = area.split(","); + return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); + } + String gangkou = pd.getString("GANGKOU"); + if(StringUtils.equals("00003",gangkou)){ + String[] ArrayDATA_IDS = new String[]{"1","2"}; + return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); + } + return new ArrayList<>(); + } + + @Override + public Object getEcharts(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + calendar.add(Calendar.DAY_OF_MONTH, -4); + String dateStr = sdf.format(calendar.getTime()); + List> list = mapEightMapper.getEcharts(pd); + List clickDate = new ArrayList<>(); + List dhzyCount = new ArrayList<>(); + List dbzyCount = new ArrayList<>(); + List yxgjzyCount = new ArrayList<>(); + List gczyCount = new ArrayList<>(); + List dzzyCount = new ArrayList<>(); + List lsydCount = new ArrayList<>(); + //用于排序，并整理数据 + for(int i = 0;i<5;i++){ + for(Map map :list){ + if(StringUtils.equals(dateStr,map.get("clickDate").toString())){ + clickDate.add(map.get("clickDate").toString()); + dhzyCount.add(map.get("dhzyCount").toString()); + dbzyCount.add(map.get("dbzyCount").toString()); + yxgjzyCount.add(map.get("yxgjzyCount").toString()); + gczyCount.add(map.get("gczyCount").toString()); + dzzyCount.add(map.get("dzzyCount").toString()); + lsydCount.add(map.get("lsydCount").toString()); + } + } + calendar.add(Calendar.DAY_OF_MONTH, +1); + dateStr = sdf.format(calendar.getTime()); + } + List name = new ArrayList<>(); + List> date = new ArrayList<>(); + name.add("动火作业"); + date.add(dhzyCount); + name.add("盲板作业"); + date.add(dbzyCount); + name.add("有限空间作业"); + date.add(yxgjzyCount); + name.add("高处作业"); + date.add(gczyCount); + name.add("吊装作业"); + date.add(dzzyCount); + name.add("临时用电"); + date.add(lsydCount); + returnMap.put("clickDate",clickDate); + returnMap.put("name",name); + returnMap.put("date",date); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public PageData statisticsHighRiskWorkByState(PageData pd) throws Exception { + return mapEightMapper.statisticsHighRiskWorkByState(pd); + } + + @Override + public List listHighRiskWork(Page page) throws Exception { + return mapEightMapper.realTimeHighRiskWorklistPage(page); + } + + @Override + public List listAllHighRiskWorkLocation(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ + r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd); + } + return r; + } + + + + @Override + public List listAll(PageData pd) { + return mapEightMapper.listAll(pd); + } + + @Override + public List listAllMeasures(PageData pd) { + return mapEightMapper.listAllMeasures(pd); + } + + + + @Override + public Map getById(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = mapEightMapper.findByIdHOTWORK(pd); + pd = dianhuo(pd); + List list = mapEightMapper.getList(pd); + //这里封装前台要的参数 + pd = shenpi(pd,list); + map.put("measuresList", mapEightMapper.listAllMeasuresHOTWORK(pd)); + map.put("gasList", mapEightMapper.listAllHOTWORK(pd)); + List safetymethodrecordList = mapEightMapper.listAllcuoshiHOTWORK(pd);//其它安全措施明细集合 + map.put("safetymethodrecordList", safetymethodrecordList); + List delayedList = mapEightMapper.listAlldelayed(pd); + map.put("delayedList", delayedList); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + pd.put("ELECTRICITY_ID",idStr); + pd = mapEightMapper.findByIdELECTRICITY(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITY(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + pd.put("BLINDBOARD_ID",idStr); + pd = mapEightMapper.findByIdBLINDBOARD(pd); + PageData Info = mapEightMapper.findByIdJWD(pd); + pd.put("TYPE",105);//盲板位置图 + pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); + List ImgList = mapEightMapper.listAllBLINDBOARD(pd); + map.put("Info",Info);//获取经纬度 + map.put("ImgList",ImgList); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + pd.put("HIGHWORK_ID",idStr); + pd = mapEightMapper.findByIdHIGHWORK(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORK(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACE(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACE(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACE(pd)); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + pd.put("HOISTING_ID",idStr); + pd = mapEightMapper.findByIdHOISTING(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHOISTING(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @Override + public Object getEchartsOrder(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + calendar.add(Calendar.DAY_OF_MONTH, -4); + String dateStr = sdf.format(calendar.getTime()); + List> list = mapEightMapper.getEchartsOrder(pd); + List clickDate = new ArrayList<>(); + List dhzyCount = new ArrayList<>(); + List dbzyCount = new ArrayList<>(); + List yxgjzyCount = new ArrayList<>(); + List gczyCount = new ArrayList<>(); + List dzzyCount = new ArrayList<>(); + List lsydCount = new ArrayList<>(); + List dtzyCount = new ArrayList<>(); + List dlzyCount = new ArrayList<>(); + //用于排序，并整理数据 + for(int i = 0;i<5;i++){ + for(Map map :list){ + if(StringUtils.equals(dateStr,map.get("clickDate").toString())){ + clickDate.add(map.get("clickDate").toString()); + dhzyCount.add(map.get("dhzyCount").toString()); + dbzyCount.add(map.get("dbzyCount").toString()); + yxgjzyCount.add(map.get("yxgjzyCount").toString()); + gczyCount.add(map.get("gczyCount").toString()); + dzzyCount.add(map.get("dzzyCount").toString()); + lsydCount.add(map.get("lsydCount").toString()); + dtzyCount.add(map.get("dtzyCount").toString()); + dlzyCount.add(map.get("dlzyCount").toString()); + } + } + calendar.add(Calendar.DAY_OF_MONTH, +1); + dateStr = sdf.format(calendar.getTime()); + } + List name = new ArrayList<>(); + List> date = new ArrayList<>(); + name.add("动火作业"); + date.add(dhzyCount); + name.add("盲板作业"); + date.add(dbzyCount); + name.add("有限空间作业"); + date.add(yxgjzyCount); + name.add("高处作业"); + date.add(gczyCount); + name.add("吊装作业"); + date.add(dzzyCount); + name.add("临时用电"); + date.add(lsydCount); + name.add("动土作业"); + date.add(dtzyCount); + name.add("断路作业"); + date.add(dlzyCount); + returnMap.put("clickDate",clickDate); + returnMap.put("name",name); + returnMap.put("date",date); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public PageData statisticsHighRiskWorkByStateOrder(PageData pd) throws Exception { + //根据条件增加参数或减少参数 都没有 直接返回空 + return mapEightMapper.statisticsHighRiskWorkByStateOrder(pd); + } + + @Override + public List listHighRiskWorkOrder(Page page) throws Exception { + return mapEightMapper.realTimeHighRiskWorklistPageOrder(page); + } + + @Override + public List listAllHighRiskWorkLocationOrder(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ + r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd); + //动土 + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + r = mapEightMapper.getBREAKGROUNDHighRiskWorkLocationOrder(pd); + //断路 + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + r = mapEightMapper.getCUTROADHighRiskWorkLocationOrder(pd); + } + return r; + } + + @Override + public Map getByIdOrder(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = mapEightMapper.findByIdHOTWORK(pd); + pd = dianhuo(pd); + List list = mapEightMapper.getList(pd); + //这里封装前台要的参数 + pd = shenpi(pd,list); + map.put("measuresList", mapEightMapper.listAllMeasuresHOTWORK(pd)); + map.put("gasList", mapEightMapper.listAllHOTWORK(pd)); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + pd.put("ELECTRICITY_ID",idStr); + pd = mapEightMapper.findByIdELECTRICITYOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITYOrder(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + pd.put("BLINDBOARD_ID",idStr); + pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + PageData Info = mapEightMapper.findByIdJWDOrder(pd); + pd.put("TYPE",105);//盲板位置图 + pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); + List ImgList = mapEightMapper.listAllBLINDBOARD(pd); + map.put("Info",Info);//获取经纬度 + map.put("ImgList",ImgList); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + pd.put("HIGHWORK_ID",idStr); + pd = mapEightMapper.findByIdHIGHWORKOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + //没有有限空间作业 + //pd.put("CONFINEDSPACE_ID",idStr); + //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); + pd = new PageData(); + map.put("measuresList", null); + map.put("gasList", null); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + pd.put("HOISTING_ID",idStr); + pd = mapEightMapper.findByIdHOISTINGOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHOISTINGOrder(pd)); + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + pd.put("BREAKGROUND_ID",idStr); + pd = mapEightMapper.findByIdBREAKGROUNDOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresBREAKGROUNDOrder(pd)); + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + pd.put("CUTROAD_ID",idStr); + pd = mapEightMapper.findByIdCUTROADOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresCUTROADOrder(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /** + * @Description: 曹妃甸项目 暂时未用 + * @Author: dearLin + * @Date: 2023/12/13/013 16:45 + * @Param: [com.zcloud.entity.PageData] [pd] + * @Return: java.lang.Object + */ + @Override + public Object getAllWorkUserCards(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + PageData allWorkUserIds = mapEightMapper.getAllWorkUserIds(pd); + /*String userCards = "";*/ + if (allWorkUserIds!=null){ + //临时用电 + String electricity_work_user_ids = allWorkUserIds.getString("ELECTRICITY_WORK_USER_IDS"); + //受限空间作业 + String confinedspace_work_user_ids = allWorkUserIds.getString("CONFINEDSPACE_WORK_USER_IDS"); + //高处作业 + String hiwork_work_user_ids = allWorkUserIds.getString("HIGHWORK_WORK_USER_IDS"); + //吊装作业 + String hoisting_work_user_ids = allWorkUserIds.getString("HOISTING_WORK_USER_IDS"); + //盲板作业 + String blindboard_work_user_ids = allWorkUserIds.getString("BLINDBOARD_WORK_USER_IDS"); + //拼接ids + String ids = ""; + if (Tools.notEmpty(electricity_work_user_ids)){ + ids += electricity_work_user_ids + ","; + } + if (Tools.notEmpty(confinedspace_work_user_ids)){ + ids += confinedspace_work_user_ids + ","; + } + if (Tools.notEmpty(hiwork_work_user_ids)){ + ids += hiwork_work_user_ids + ","; + } + if (Tools.notEmpty(hoisting_work_user_ids)){ + ids += hoisting_work_user_ids + ","; + } + if (Tools.notEmpty(blindboard_work_user_ids)){ + ids += blindboard_work_user_ids + ","; + } + String[] split = ids.split(","); + //查询作业人员卡号 +// List userCardsByIds = usersMapper.getUserCardsByIds(split); + /* for (String usercard : userCardsByIds){ + if (Tools.notEmpty(usercard) && !userCards.contains(usercard)){ + userCards += usercard + ","; + } + }*/ +// map.put("userCardsList", userCardsByIds); + } + map.put("result", errInfo); + return map; + } + private PageData shenpi(PageData pd,List list){ + List specialUserList = new ArrayList<>(); + for (PageData userPageData : list){ + String type = userPageData.get("STATE").toString(); + if("0".equals(type)){ // 申请办理人 + pd.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("APPLY_USER_NAME",userPageData.getString("userName")); + pd.put("APPLY_USER_ID",userPageData.getString("USER_ID")); + }else if("1".equals(type)){ // 动火单位确认人 + pd.put("HOT_WORK_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_USER_ID",userPageData.getString("USER_ID")); + pd.put("HOT_WORK_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_USER_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_USER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_USER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("2".equals(type)){ // 项目发包单位 + pd.put("PROJECT_UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("PROJECT_UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); + pd.put("PROJECT_UNIT_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("PROJECT_UNIT_LEADER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("PROJECT_UNIT_LEADER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("3".equals(type)){ // 现场管辖单位负责人 + pd.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("UNIT_LEADER_NAME",userPageData.getString("userName")); + pd.put("UNIT_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("UNIT_LEADER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("UNIT_LEADER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("4".equals(type)){ //动火许可签发单位负责人 + pd.put("ISSUING_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("ISSUING_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("ISSUING_USER_ID",userPageData.getString("USER_ID")); + pd.put("ISSUING_USER_NAME",userPageData.getString("userName")); + pd.put("ISSUING_USER_PHONE",userPageData.getString("userPhone")); + pd.put("ISSUING_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("ISSUING_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("5".equals(type)){ // 安全总监审批 + pd.put("SAFETY_DIRECTOR_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("SAFETY_DIRECTOR_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("SAFETY_DIRECTOR_USER_ID",userPageData.getString("USER_ID")); + pd.put("SAFETY_DIRECTOR_USER_NAME",userPageData.getString("userName")); + pd.put("SAFETY_DIRECTOR_PHONE",userPageData.getString("userPhone")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("6".equals(type)){ // 现场负责人接收 + pd.put("SITE_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("SITE_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("SITE_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("SITE_LEADER_NAME",userPageData.getString("userName")); + pd.put("SITE_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("SITE_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SITE_DIRECTOR_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("7".equals(type)){ // 动火前 + pd.put("HOT_WORK_PERSON_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_PERSON_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_PERSON_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_PERSON_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_PERSON_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_PERSON_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("8".equals(type)){ // 现在负责人 + pd.put("PERSON_CONFIRM_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("PERSON_CONFIRM_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("PERSON_CONFIRM_USER_NAME",userPageData.getString("userName")); + pd.put("PERSON_CONFIRM_PHONE",userPageData.getString("userPhone")); + pd.put("PERSON_CONFIRM_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("PERSON_CONFIRM_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("9".equals(type)){ // 动火后 + pd.put("HOT_WORK_AFTER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_AFTER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_AFTER_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_AFTER_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_AFTER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_AFTER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("10".equals(type)){ // 延时监火 + pd.put("TIME_LAPSE_FIREMAN_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("TIME_LAPSE_FIREMAN_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("TIME_LAPSE_FIREMAN_NAME",userPageData.getString("userName")); + pd.put("TIME_LAPSE_FIREMAN_PHONE",userPageData.getString("userPhone")); + pd.put("TIME_LAPSE_FIREMAN_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("TIME_LAPSE_FIREMAN_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + } + else if("21".equals(type)){ // 动火操作人 + String userName = userPageData.getString("userName2") +","; + String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); + pd.put("HOT_WORK_OPERATOR_NAME",oldName + userName); + }else if("22".equals(type)){ // 动火操作人 + pd.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID")); + String userName = userPageData.getString("userName2") +","; + String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); + pd.put("SUPERVISOR_OF_HOT_WORK_UNIT_NAME",oldName + userName); + }else if("24".equals(type)){ // 需要气体检测 + pd.put("GAS_TESTING_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("GAS_TESTING_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("GAS_TESTING_USER_ID",userPageData.getString("USER_ID")); + pd.put("GAS_TESTING_USER_NAME",userPageData.getString("userName")); + pd.put("GAS_TESTING_USER_PHONE",userPageData.getString("userPhone")); + pd.put("GAS_TESTING_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("GAS_TESTING_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("30".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectCompetent_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectCompetent_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectCompetent_USER_NAME",userPageData.getString("userName")); + pd.put("projectCompetent_USER_ID",userPageData.getString("USER_ID")); + pd.put("projectCompetent_PHONE",userPageData.getString("userPhone")); + pd.put("projectCompetent_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectCompetent_TYPE",userPageData.getString("TYPE")); + // APP回显使用 + + pd.put("CHARGECONFIRM_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("CHARGECONFIRM_DEPT_NAME",userPageData.getString("deptName")); + pd.put("CHARGECONFIRM_USER_ID",userPageData.getString("USER_ID")); + pd.put("CHARGECONFIRM_USER_NAME",userPageData.getString("userName")); + pd.put("CHARGECONFIRM_USER_PHONE",userPageData.getString("userPhone")); + }else if("31".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectSupervisor_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectSupervisor_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectSupervisor_USER_NAME",userPageData.getString("userName")); + pd.put("projectSupervisor_PHONE",userPageData.getString("userPhone")); + pd.put("projectCompetent_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectSupervisor_TYPE",userPageData.getString("TYPE")); + }else if("32".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectPreliminarily_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectPreliminarily_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectPreliminarily_USER_NAME",userPageData.getString("userName")); + pd.put("projectPreliminarily_PHONE",userPageData.getString("userPhone")); + pd.put("projectPreliminarily_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("projectPreliminarily_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectPreliminarily_TYPE",userPageData.getString("TYPE")); + }else if("33".equals(type)){ // 特级动火 动火负责人确认 + pd.put("inspectorGeneral_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("inspectorGeneral_DEPT_NAME",userPageData.getString("deptName")); + pd.put("inspectorGeneral_USER_NAME",userPageData.getString("userName")); + pd.put("inspectorGeneral_PHONE",userPageData.getString("userPhone")); + pd.put("inspectorGeneral_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("inspectorGeneral_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("inspectorGeneral_TYPE",userPageData.getString("TYPE")); + }else if("34".equals(type)){ //分公司主要负责人 + pd.put("OFFICE_RESPOMSIBLE_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("OFFICE_RESPOMSIBLE_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("OFFICE_RESPOMSIBLE_PHONE",userPageData.getString("userPhone")); + pd.put("OFFICE_RESPOMSIBLE_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("OFFICE_RESPOMSIBLE_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("OFFICE_RESPOMSIBLE_TYPE",userPageData.getString("TYPE")); + }else if("35".equals(type)){ // 特级动火 安全监督部初审 + pd.put("SUPERVISION_DEPARTMENT_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SUPERVISION_DEPARTMENT_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SUPERVISION_DEPARTMENT_PHONE",userPageData.getString("userPhone")); + pd.put("SUPERVISION_DEPARTMENT_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SUPERVISION_DEPARTMENT_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SUPERVISION_DEPARTMENT_TYPE",userPageData.getString("TYPE")); + }else if("36".equals(type)){ // 特级动火 安委会办公室审批 + pd.put("SECURITY_COMMITTEE_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SECURITY_COMMITTEE_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SECURITY_COMMITTEE_PHONE",userPageData.getString("userPhone")); + pd.put("SECURITY_COMMITTEE_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SECURITY_COMMITTEE_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SECURITY_COMMITTEE_TYPE",userPageData.getString("TYPE")); + }else if("37".equals(type)){ // 特级动火 安全总监签批 + pd.put("SAFETY_DIRECTOR_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SAFETY_DIRECTOR_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SAFETY_DIRECTOR_PHONE",userPageData.getString("userPhone")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SAFETY_DIRECTOR_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SAFETY_DIRECTOR_TYPE",userPageData.getString("TYPE")); + } + } + pd.put("specialUserList", specialUserList); + return pd; + } + + private PageData dianhuo(PageData pd){ + if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ + String zidian = pd.getString("HOT_WORK_METHOD_ID"); + List shuzu = Arrays.asList(zidian.split(",")); + List wenzi = mapEightMapper.getListDongHuo(shuzu); + String pinjie = String.join(",",wenzi); + pd.put("HOT_WORK_METHOD_NAME",pinjie); + } + return pd; + } +} + diff --git a/src/main/java/com/zcloud/service/fireresources/FireResourcesService.java b/src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java similarity index 96% rename from src/main/java/com/zcloud/service/fireresources/FireResourcesService.java rename to src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java index bec302c2..cf6501a1 100644 --- a/src/main/java/com/zcloud/service/fireresources/FireResourcesService.java +++ b/src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java @@ -14,7 +14,7 @@ import java.util.List; * @Param: * @Return: */ -public interface FireResourcesService { +public interface CzksFireResourcesService { /**新增 * @param pd */ diff --git a/src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java b/src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java similarity index 74% rename from src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java rename to src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java index 6f6101cc..a2aac37d 100644 --- a/src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java +++ b/src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java @@ -2,9 +2,9 @@ package com.zcloud.service.fireresources.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper; +import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; import com.zcloud.service.bus.ImgFilesService; -import com.zcloud.service.fireresources.FireResourcesService; +import com.zcloud.service.fireresources.CzksFireResourcesService; import com.zcloud.util.Tools; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,9 +15,9 @@ import java.util.LinkedList; import java.util.List; @Service -public class FireResourcesServiceImpl implements FireResourcesService { +public class CzksFireResourcesServiceImpl implements CzksFireResourcesService { @Resource - public FireResourcesMapper fireResourcesMapper; + public CzksFireResourcesMapper czksfireResourcesMapper; @Resource private ImgFilesService imgFilesService; @@ -32,13 +32,13 @@ public class FireResourcesServiceImpl implements FireResourcesService { String[] split = deleteIds.split(","); imgFilesService.deleteAll(split); } - fireResourcesMapper.save(pd); + czksfireResourcesMapper.save(pd); } @Override @Transactional(rollbackFor = Exception.class) public void delete(PageData pd) { - fireResourcesMapper.delete(pd); + czksfireResourcesMapper.delete(pd); } @Override @@ -52,52 +52,52 @@ public class FireResourcesServiceImpl implements FireResourcesService { String[] split = deleteIds.split(","); imgFilesService.deleteAll(split); } - fireResourcesMapper.edit(pd); + czksfireResourcesMapper.edit(pd); } @Override public List datalistPage(Page page) { - return fireResourcesMapper.datalistPage(page); + return czksfireResourcesMapper.datalistPage(page); } @Override public List listAll(PageData pd) { - return fireResourcesMapper.listAll(pd); + return czksfireResourcesMapper.listAll(pd); } @Override public PageData findById(PageData pd) { - return fireResourcesMapper.findById(pd); + return czksfireResourcesMapper.findById(pd); } @Override public LinkedList getControlRoomDataList(PageData pageData) { - return fireResourcesMapper.getControlRoomDataList(pageData); + return czksfireResourcesMapper.getControlRoomDataList(pageData); } @Override public PageData getDataById(PageData pddata) { - return fireResourcesMapper.getDataById(pddata); + return czksfireResourcesMapper.getDataById(pddata); } @Override public List getCheckRecordByPid(PageData pageData) { - return fireResourcesMapper.getCheckRecordByPid(pageData); + return czksfireResourcesMapper.getCheckRecordByPid(pageData); } @Override public PageData getPointInfoADeviceByPid(PageData pageData) { PageData resData = new PageData(); - PageData pointInfo = fireResourcesMapper.findPointById(pageData); + PageData pointInfo = czksfireResourcesMapper.findPointById(pageData); // 只取最新的信息 - List checkImages = fireResourcesMapper.getPointCheckPhotoById(pageData); + List checkImages = czksfireResourcesMapper.getPointCheckPhotoById(pageData); if (checkImages != null && checkImages.size() > 0) { checkImages.forEach(item -> { String[] checkImagesItems = item.getString("FILEPATHLIST").split("@@"); item.put("FILEPATH_LIST", checkImagesItems); }); } - List deviceListByPointId = fireResourcesMapper.listAll4H5(pageData); + List deviceListByPointId = czksfireResourcesMapper.listAll4H5(pageData); if (deviceListByPointId.size() > 0) { deviceListByPointId.forEach(item -> { String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@"); @@ -114,14 +114,14 @@ public class FireResourcesServiceImpl implements FireResourcesService { public List getPointQualifiedPhotos(PageData pageData) { if (pageData.getString("ISLOG").equals("1")) { // 记录 EQUIPMENT_POINT_ID - return fireResourcesMapper.getPointQualifiedPhotosByEpid(pageData); + return czksfireResourcesMapper.getPointQualifiedPhotosByEpid(pageData); } - return fireResourcesMapper.getPointQualifiedPhotos(pageData); + return czksfireResourcesMapper.getPointQualifiedPhotos(pageData); } @Override public List goRecordDeviceByPid(PageData pd) { - List list = fireResourcesMapper.goRecordDeviceByPid(pd); + List list = czksfireResourcesMapper.goRecordDeviceByPid(pd); list.forEach(item -> { String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@"); item.put("fireDeviceTypeList", fireCheckStandardItems); @@ -131,6 +131,6 @@ public class FireResourcesServiceImpl implements FireResourcesService { @Override public List devicelistPage(Page page) { - return fireResourcesMapper.devicelistPage(page); + return czksfireResourcesMapper.devicelistPage(page); } } diff --git a/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java new file mode 100644 index 00000000..0b011b20 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java @@ -0,0 +1,22 @@ +package com.zcloud.service.gatemachine; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface GateCarIOService { + + + List getDatalistpage(Page page); + + List getIORecord(PageData page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void save(PageData pageData); + + PageData getTodayEQCount(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java index 74a2f2cb..006d9e1d 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.gatemachine.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateAreaMapper; import com.zcloud.service.gatemachine.GateAreaService; import com.zcloud.util.InitPageDataUtil; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ public class GateAreaServiceImpl implements GateAreaService { @Resource - private GateAreaMapper gateAreaMapper; + private CzksGateAreaMapper gateAreaMapper; @Resource private InitPageDataUtil initPageDataUtil; diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java new file mode 100644 index 00000000..c78688a6 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java @@ -0,0 +1,89 @@ +package com.zcloud.service.gatemachine.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper; +import com.zcloud.service.gatemachine.GateCarIOService; +import com.zcloud.util.InitPageDataUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * GateCarIOService IMPL + */ +@Service +public class GateCarIOServiceImpl implements GateCarIOService { + + @Resource + private CzksGateCarIOMapper czksGateCarIOMapper; + + @Resource + private InitPageDataUtil initPageDataUtil; + + /** + * 出入闸机车辆记录 + * @param page + * @return 记录 + */ + @Override + public List getDatalistpage(Page page) { + return czksGateCarIOMapper.getDatalistPage(page); + } + + /** + * 根据条件获取杂货/矿区闸机出入记录 + * @return + */ + @Override + public List getIORecord(PageData page) { + return czksGateCarIOMapper.getMineralIORecords(page); + } + + /** + * 编辑出入闸机车辆记录 + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void edit(PageData pd) { + initPageDataUtil.initEdit(pd); + czksGateCarIOMapper.edit(pd); + } + + /** + * 删除出入闸机车辆记录 + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void removeByIds(PageData pageData) { + initPageDataUtil.initEdit(pageData); + czksGateCarIOMapper.removeByIds(pageData); + } + + /** + * 添加出入闸机车辆记录 + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PageData pageData) { + initPageDataUtil.initSave(pageData, "RECORD_ID"); + czksGateCarIOMapper.saveMineral(pageData); + } + + /** + * 获取在场，离场，总量计数 + * @return + */ + @Override + public PageData getTodayEQCount(PageData page) { + PageData pageData = new PageData(); + pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(page)); + pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(page)); + return pageData; + } +} diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java index 0d0071b2..a7e02032 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java @@ -2,9 +2,9 @@ package com.zcloud.service.gatemachine.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper; -import com.zcloud.mapper.datasource.gatemachine.GateMachineMapper; -import com.zcloud.mapper.datasource.gatemachine.GateVideoMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateAreaMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateMachineMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateVideoMapper; import com.zcloud.service.gatemachine.GateMachineService; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.util.InitPageDataUtil; @@ -25,12 +25,12 @@ public class GateMachineServiceImpl implements GateMachineService { @Resource - private GateMachineMapper gateMachineMapper; + private CzksGateMachineMapper gateMachineMapper; @Resource - private GateAreaMapper gateAreaMapper; + private CzksGateAreaMapper gateAreaMapper; @Resource - private GateVideoMapper gateVideoMapper; + private CzksGateVideoMapper gateVideoMapper; @Resource private InitPageDataUtil initPageDataUtil; diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java index 27b0ee85..b6014802 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.gatemachine.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.gatemachine.GateVideoMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateVideoMapper; import com.zcloud.service.gatemachine.GateVideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.List; public class GateVideoServiceImpl implements GateVideoService { @Autowired - private GateVideoMapper gateVideoMapper; + private CzksGateVideoMapper gateVideoMapper; /**新增 * @param pd diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java index b7c41272..80a0511f 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java @@ -98,6 +98,7 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme @Override public List listAllForMap(PageData pd) { + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); return platformvideomanagementMapper.listAllForMap(pd); } diff --git a/src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java similarity index 78% rename from src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java rename to src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java index 92a9a2eb..34836172 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java +++ b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java @@ -1,8 +1,8 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.service.map; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper; -import com.zcloud.service.fireresources.FireResourcesService; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +import com.zcloud.service.fireresources.CzksFireResourcesService; import org.springframework.beans.factory.InitializingBean; import javax.annotation.Resource; @@ -18,7 +18,7 @@ public abstract class AbsFireSourcesHandel implements InitializingBean { @Resource public FireResourcesMapper fireResourcesMapper; @Resource - public FireResourcesService fireResourcesService; + public CzksFireResourcesService fireResourcesService; // 组装数据 diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssemblyBeanFactory.java b/src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java similarity index 96% rename from src/main/java/com/zcloud/util/biMapFactory/AssemblyBeanFactory.java rename to src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java index f00b9b45..918270ad 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssemblyBeanFactory.java +++ b/src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.service.map; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/zcloud/service/map/BaseResultInterface.java b/src/main/java/com/zcloud/service/map/BaseResultInterface.java new file mode 100644 index 00000000..158c595f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BaseResultInterface.java @@ -0,0 +1,18 @@ +package com.zcloud.service.map; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +/** + * @desc 对象返回到前端以及异常抛出的接口类 + */ +public interface BaseResultInterface { + + + String getCode(); + + + String getMessage(); +} diff --git a/src/main/java/com/zcloud/service/map/BiMapService.java b/src/main/java/com/zcloud/service/map/BiMapService.java new file mode 100644 index 00000000..c1566624 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BiMapService.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.LinkedList; +import java.util.List; + +/** + * 说明：监管端Bi页map数据 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface BiMapService { + + List getDoorWayPeopleRecords(Page page); + + List getDoorWayCarRecords(Page page); + + PageData getRiskIdentificationCount(PageData pageData); + + public PageData listbymeteorological(PageData pd)throws Exception; + + List getCorpinfoIds(PageData pd); + + + PageData getPersonPositioningCount(PageData pageData); + + List getRiskIndex(PageData pageData); + + Object inAndoutPeoCarToday(PageData pageData); + + LinkedList getFireControl(PageData pageData) throws Exception; + + LinkedList getFireRescueTeam(PageData pageData); + + PageData getGatesInAndOutNumById(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/map/BiTongjiService.java b/src/main/java/com/zcloud/service/map/BiTongjiService.java new file mode 100644 index 00000000..195cd26e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BiTongjiService.java @@ -0,0 +1,117 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface BiTongjiService { + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + */ + List getCountInsByCorpSource(PageData pd); + + /** + * 获取首页需要显示的企业信息 + * @param pd + * @return + */ + List getCorpinfoAllByOrder(PageData pd); + + /** + * 获取用户数量 + * @param pd + * @return + */ + Integer getCorpUser(PageData pd); + + Integer getSupeUser(PageData pd); + + List getCorpUserCountTop10(PageData pd); + List getCorpDeptCount(PageData pd); + + /** + * 分公司使用情况的前十部门数的分公司 + * @param pd + * @return + */ + List getCorpinfoAllByDeptCountOrder(PageData pd); + + /** + * 获取港股安全环保检查次数 + * @param pd + * @return + */ + public Integer getInsCountBySuper(PageData pd); + + public Integer getHiddenCountBySuper(PageData pd); + + /** + * 安全环保检查分类 数量 + * @param pd + * @return + */ + List getSuperInsCountBySubjec(PageData pd); + + /** + * 获取前十的安全环保的数据 + * @param pd + * @return + */ + List getSuperInsTop(PageData pd); + + /** + * 获取所有的隐患 -根据隐患类型分类 + * + */ + List getHiddenCountBySubjec(PageData pd); + + + /** + * 获取所有的隐患 -根据隐患等级分类 + * + */ + List getHiddenCountByHiddenLevel(PageData pd); + + /** + * 获取已经处理的特殊隐患 + * @param pd + * @return + */ + Integer getHiddenCountBySpecial(PageData pd); + + /** + * + */ + List getHighriskworkCount(PageData pd); + /** + * + */ + List getHiddenCountByCorpInfoHandle(PageData pd); + + + /** + * 首页统计 + */ + List mainStatisticsByCorpinfo (PageData pd); + + + + List mainInsByCorpinfo (PageData pd); + List getHiddenBySource (PageData pd); + + List getInsCountPageBySuper(PageData pd); + + List getHiddenCountPageBySuper(PageData pd); + + List getCorpUser2(PageData pd); + + List getSupeUser2(PageData pd); + + List listAllCorp(PageData pd); + + List getHiddenCountByHiddenType(PageData pageData); + + PageData getHiddenCountByHeinrich(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/map/CorpDepartmentService.java b/src/main/java/com/zcloud/service/map/CorpDepartmentService.java new file mode 100644 index 00000000..a775ca28 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/CorpDepartmentService.java @@ -0,0 +1,164 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; + +import java.util.List; + +/** + * 说明： 组织机构接接口 + * 创建人：FH Q313596790 + * 官网： + */ +public interface CorpDepartmentService { + + /**新增 + * @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; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + /**通过名称获取数据 + * @param pd + * @throws Exception + */ + public PageData findByName(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId,String url) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId, List zdepartmentPdList) throws Exception; + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception; + + /**通过条件获取全部 + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过企业主部门 + * @param pd + * @throws Exception + */ + public PageData findByCorpId(PageData pd)throws Exception; + /**列表 关联 部门级别名称 + * @param page + * @throws Exception + */ + public List listForLevelName(Page page)throws Exception; + + /** + * 向下递归查询企业部门 + * @param pd + * @return + */ + List listTreeCorpDept(PageData pd)throws Exception; + + /** + * 向下递归查询企业部门（集团部门+子公司部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp(PageData pd)throws Exception; + + /** + * pc新增需求，重点工程中添加处罚人功能所用的 根据企业ID查询部门的service + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorpForPcPunishThePerson(PageData pd)throws Exception; + /** + * 向下递归查询企业部门（只查监管端部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp1(PageData pd)throws Exception; + /** + * 向下递归查询企业部门（只查企业端部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp2(PageData pd)throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd)throws Exception; + List listDept(PageData pd)throws Exception; + + public List listTreeCorp(String s)throws Exception; + + /** + * 使用数据库中的函数 + * 获取pid下的所有子集id + * @param pd + * @return + * @throws Exception + */ + public List getSonIdsByParid(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/map/DataDockingLogService.java b/src/main/java/com/zcloud/service/map/DataDockingLogService.java new file mode 100644 index 00000000..e25a1d99 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/DataDockingLogService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：曹妃甸数据对接日志 + * 作者：luoxiaobao + * 时间：2023-09-11 + * 官网：www.zcloudchina.com + */ +public interface DataDockingLogService { + + /**新增 + * @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; + +} + diff --git a/src/main/java/com/zcloud/service/map/MapEightCfdService.java b/src/main/java/com/zcloud/service/map/MapEightCfdService.java new file mode 100644 index 00000000..02f55995 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapEightCfdService.java @@ -0,0 +1,36 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; + +import java.util.List; +import java.util.Map; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapEightCfdService { + + /**动火 + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**动火 + * @param pd + * @throws Exception + */ + List listAllMeasures(PageData pd); + + /** + * 获取其他公司详细数据 + * @param pd + * @return + */ + Map getByIdOrder(PageData pd) throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/map/MapEightService.java b/src/main/java/com/zcloud/service/map/MapEightService.java index 692eabb0..079e284a 100644 --- a/src/main/java/com/zcloud/service/map/MapEightService.java +++ b/src/main/java/com/zcloud/service/map/MapEightService.java @@ -95,7 +95,5 @@ public interface MapEightService { * @return */ Map getByIdOrder(PageData pd); - - Object getAllWorkUserCards(PageData pd); } diff --git a/src/main/java/com/zcloud/service/map/MapKetProjectService.java b/src/main/java/com/zcloud/service/map/MapKetProjectService.java new file mode 100644 index 00000000..c9ed7187 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapKetProjectService.java @@ -0,0 +1,23 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapKetProjectService { + + Object findFormCount(PageData pd); + + Object listAllLocation(PageData pd); + + Object getById(PageData pd) throws Exception ; + + Object list(Page page); + +} + diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalService.java b/src/main/java/com/zcloud/service/map/MeteorologicalService.java new file mode 100644 index 00000000..25fb0073 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MeteorologicalService.java @@ -0,0 +1,85 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalService { + + /**新增 + * @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; + public void savePosition(PageData pd)throws Exception; + public void editIsShowBycorpinfoid(PageData pd)throws Exception; + public void editIsShow(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listByEquipment(Page page)throws Exception; + + List listbyTypeLocation(PageData pd)throws Exception; + + public List listbyType(Page page)throws Exception; + + public PageData listbyequipmentcount(PageData pd)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; + + public PageData findByCode(PageData video)throws Exception; + + public List listAllForMap(PageData pd)throws Exception; + + public List getPointsInfo(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java new file mode 100644 index 00000000..8b80b9d2 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java @@ -0,0 +1,103 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalinfoService { + + /**新增 + * @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; + public void savePosition(PageData pd)throws Exception; + public void editIsShowBycorpinfoid(PageData pd)throws Exception; + public void editIsShow(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表 + * @throws Exception + */ + public PageData listbymeteorological(PageData pd)throws Exception; + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listbyinfo(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; + + public PageData findByCode(PageData video)throws Exception; + + public List listAllForMap(PageData pd)throws Exception; + + public List getPointsInfo(PageData pd)throws Exception; + + /**同步气象数据 + * @param list + * @throws Exception + */ + ReturnMap tongbuMeteorologicalinfo(List list) throws Exception; + + /**批量新增 + * @param list + * @throws Exception + */ + Integer saveMeteorologicalinfo(List list); + + /**修改气象数据 + * @param pageData + * @throws Exception + */ + Integer updateMeteorologicalinfo(PageData pageData); + +} + diff --git a/src/main/java/com/zcloud/service/map/PlatformelectronicService.java b/src/main/java/com/zcloud/service/map/PlatformelectronicService.java new file mode 100644 index 00000000..52281c56 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/PlatformelectronicService.java @@ -0,0 +1,65 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformelectronicService { + + /**新增 + * @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; + + + Integer countAllForMap(PageData pd)throws Exception; + + + List countAllByArea(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java new file mode 100644 index 00000000..1700e47e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java @@ -0,0 +1,195 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; +import com.zcloud.mapper.datasource.gatemachine.CzksGateVideoMapper; +import com.zcloud.mapper.datasource.map.BiMapMapper; +import com.zcloud.mapper.dsno2.keyProjects.VideoManagerMapper; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +import com.zcloud.service.gatemachine.GateMachineService; +import com.zcloud.service.map.AbsFireSourcesHandel; +import com.zcloud.service.map.AssemblyBeanFactory; +import com.zcloud.service.map.BiMapService; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Service +public class BiMapServiceImpl implements BiMapService { + + @Resource + private BiMapMapper biMapMapper; + + @Resource + private FireResourcesMapper fireResourcesMapper; + @Resource + private GateMachineService gateMachineService; + + @Resource + private CzksGateVideoMapper gateVideoMapper; + @Resource + private VideoManagerMapper videoManagerMapper; + + + @Resource + private CorpInfoMapper corpInfoMapper; + + + /** + * @Description: 人记录 + * @Author: dearLin + * @Date: 2023/9/18/018 10:18 + * @Param: [com.zcloud.entity.Page] [page] + * @Return: java.util.List + */ + @Override + public List getDoorWayPeopleRecords(Page page) { + return biMapMapper.getPeopleRecordslistPage(page); + } + + /** + * @Description: 车记录 + * @Author: dearLin + * @Date: 2023/9/18/018 10:18 + * @Param: [com.zcloud.entity.Page] [page] + * @Return: java.util.List + */ + @Override + public List getDoorWayCarRecords(Page page) { + return biMapMapper.getCarRecordslistPage(page); + } + + @Override + public PageData getRiskIdentificationCount(PageData pageData) { + return biMapMapper.getRiskIdentificationCount(pageData); + // bus_riskunit + // bus_identificationparts + } + + + public PageData listbymeteorological(PageData pd) throws Exception { + return biMapMapper.listbymeteorological(pd); + } + + @Override + public List getCorpinfoIds(PageData pd) { + String area = pd.getString("AREA"); + if (StringUtils.isNotBlank(area)) { + String[] ArrayDATA_IDS = area.split(","); + return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + } + String gangkou = pd.getString("GANGKOU"); + if (StringUtils.equals("00003", gangkou)) { + String[] ArrayDATA_IDS = new String[]{"1", "2"}; + return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + } + return new ArrayList<>(); + } + + @Override + public PageData getPersonPositioningCount(PageData pageData) { + return biMapMapper.getPersonPositioningCount(pageData); + } + + @Override + public List getRiskIndex(PageData pageData) { + return biMapMapper.getRiskIndex(pageData); + } + + @Override + public List inAndoutPeoCarToday(PageData pageData) { + return biMapMapper.inAndoutPeoCarToday(pageData); + } + + /** + * @Description: 不一定用 + * @Author: dearLin + * @Date: 2023/9/20/020 16:42 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList getFireControl(PageData pageData) throws Exception { +// GANGKOU 00003 秦皇岛岗 +// AREA 区域 +// CORPINFO_ID 区域 + + String area = pageData.getString("AREA"); + List corpinfoIds = null; + if (StringUtils.isNotBlank(area)) { + String[] ArrayDATA_IDS = area.split(","); + corpinfoIds = corpInfoMapper.getCorpinfoIds(ArrayDATA_IDS); + } else { + String gangkou = pageData.getString("GANGKOU"); + if (StringUtils.equals("00003", gangkou)) { + String[] ArrayDATA_IDS = new String[]{"1", "2"}; + corpinfoIds = corpInfoMapper.getCorpinfoIds(ArrayDATA_IDS); + } + } + if (corpinfoIds != null && corpinfoIds.size() > 0) { + if (Tools.isEmpty(pageData.getString("CORPINFO_ID"))) { + pageData.put("list", corpinfoIds); + } + } + String fireresourcesType = pageData.getString("TYPE"); + // 目前没有消防点位 + AbsFireSourcesHandel invokeStrategy = AssemblyBeanFactory.getInvokeStrategy(fireresourcesType); + if (invokeStrategy != null) { + return invokeStrategy.assemblyDataHandel(pageData); + } + + return new LinkedList<>(); + } + + + @Override + public LinkedList getFireRescueTeam(PageData pageData) { + return fireResourcesMapper.getRescueTeamDataList(pageData); + } + + @Override + public PageData getGatesInAndOutNumById(PageData pageData) { + PageData value = new PageData(); + // 基础信息 + if ("CAMERA".equals(pageData.getString("TYPE"))) { + pageData.put("GATEVIDEO_ID",pageData.getString("GATE_AREA_ID")); + pageData.put("GATE_AREA_ID",null); + PageData gateMachineInfo = gateMachineService.getGateMachineInfoById(pageData); + value.put("info", gateMachineInfo); + value.putAll(gateVideoMapper.findById(pageData)); + return value; + } + PageData gateMachineInfo = gateMachineService.getGateMachineInfoById(pageData); + if(Tools.isEmpty(gateMachineInfo)){ + return value; + } + value.put("info", gateMachineInfo); + gateMachineInfo.put("array",gateMachineInfo.getString("EQUIPMENTID").split(",")); + // 进出信息 + if ("CAR".equals(pageData.getString("TYPE"))) { + // 车进出 + // todo 车辆进出。现在需要配置闸机的id。 +// List recordList = gateMachineService.getCarRecordCountByEId(gateMachineInfo); + // 不配闸机的替代方案 用于展示 按照公司id去查，真是需要配置闸机的id + List recordList = gateMachineService.getCarRecordCountByCorpId(gateMachineInfo); + value.put("varList", recordList); + + } else { + // 人进出 + List recordList = gateMachineService.getPersonRecordCountByEId(gateMachineInfo); + value.put("varList", recordList); + } + return value; + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java new file mode 100644 index 00000000..8fa61b1a --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java @@ -0,0 +1,156 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.BiTongjiMapper; +import com.zcloud.service.map.BiTongjiService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Transactional //开启事物 +public class BiTongjiServiceImpl implements BiTongjiService { + @Resource + private BiTongjiMapper biTongjiMapper; + + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + */ + @Override + public List getCountInsByCorpSource(PageData pd) { + return biTongjiMapper.getCountInsByCorpSource(pd); + } + + @Override + public List getCorpinfoAllByOrder(PageData pd) { + return biTongjiMapper.getCorpinfoAllByOrder(pd); + } + + @Override + public Integer getCorpUser(PageData pd) { + return biTongjiMapper.getCorpUser(pd); + } + + @Override + public Integer getSupeUser(PageData pd) { + return biTongjiMapper.getSupeUser(pd); + } + @Override + public List getCorpUserCountTop10(PageData pd) { + return biTongjiMapper.getCorpUserCountTop10(pd); + } + @Override + public List getCorpDeptCount(PageData pd) { + return biTongjiMapper.getCorpDeptCount(pd); + } + + /** + * 分公司使用情况的前十部门数的分公司 + * + * @param pd + * @return + */ + @Override + public List getCorpinfoAllByDeptCountOrder(PageData pd) { + return biTongjiMapper.getCorpinfoAllByDeptCountOrder(pd); + } + + @Override + public Integer getInsCountBySuper(PageData pd) { + return biTongjiMapper.getInsCountBySuper(pd); + } + + @Override + public Integer getHiddenCountBySuper(PageData pd) { + return biTongjiMapper.getHiddenCountBySuper(pd); + } + + @Override + public List getSuperInsCountBySubjec(PageData pd) { + return biTongjiMapper.getSuperInsCountBySubjec(pd); + } + + @Override + public List getSuperInsTop(PageData pd) { + return biTongjiMapper.getSuperInsTop(pd); + } + + @Override + public List getHiddenCountBySubjec(PageData pd) { + return biTongjiMapper.getHiddenCountBySubjec(pd); + } + + @Override + public List getHiddenCountByHiddenLevel(PageData pd) { + return biTongjiMapper.getHiddenCountByHiddenLevel(pd); + } + + @Override + public List getHighriskworkCount(PageData pd) { + return biTongjiMapper.getHighriskworkCount(pd); + } + + @Override + public Integer getHiddenCountBySpecial(PageData pd) { + return biTongjiMapper.getHiddenCountBySpecial(pd); + } + + @Override + public List getHiddenCountByCorpInfoHandle(PageData pd) { + return biTongjiMapper.getHiddenCountByCorpInfoHandle(pd); + } + + @Override + public List mainStatisticsByCorpinfo(PageData pd) { + return biTongjiMapper.mainStatisticsByCorpinfo(pd); + } + + @Override + public List mainInsByCorpinfo(PageData pd) { + return biTongjiMapper.mainInsByCorpinfo(pd); + } + + @Override + public List getHiddenBySource(PageData pd) { + return biTongjiMapper.getHiddenBySource(pd); + } + + @Override + public List getInsCountPageBySuper(PageData pd) { + return biTongjiMapper.getInsCountPageBySuper(pd); + } + + @Override + public List getHiddenCountPageBySuper(PageData pd) { + return biTongjiMapper.getHiddenCountPageBySuper(pd); + } + + @Override + public List getCorpUser2(PageData pd) { + return biTongjiMapper.getCorpUser2(pd); + } + + @Override + public List getSupeUser2(PageData pd) { + return biTongjiMapper.getSupeUser2(pd); + } + @Override + public List listAllCorp(PageData pd) { + return biTongjiMapper.listAllCorp(pd); + } + + @Override + public List getHiddenCountByHiddenType(PageData pageData) { + return biTongjiMapper.getHiddenCountByHiddenType(pageData); + } + + @Override + public PageData getHiddenCountByHeinrich(PageData pd) { + return biTongjiMapper.getHiddenCountByHeinrich(pd); + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java new file mode 100644 index 00000000..41b9b2f5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java @@ -0,0 +1,267 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; +import com.zcloud.mapper.datasource.system.DepartmentMapper; +import com.zcloud.service.map.CorpDepartmentService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明： 组织机构 + * 创建人：FH Q313596790 + * 官网： + */ +@Service(value="corpDepartmentService") +@Transactional //开启事物 +public class CorpDepartmentServiceImpl implements CorpDepartmentService { + + @Autowired + private DepartmentMapper departmentMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + departmentMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + departmentMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + departmentMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return (List)departmentMapper.datalistPage(page); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return (PageData)departmentMapper.findById(pd); + } + /**通过名称获取数据 + * @param pd + * @throws Exception + */ + public PageData findByName(PageData pd)throws Exception{ + List dept = departmentMapper.findByName(pd); + if(dept != null && dept.size() > 0) { + return dept.get(0); + } else { + return null; + } + + } + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception{ + return (PageData)departmentMapper.findByBianma(pd); + } + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception { + return (List)departmentMapper.listSubDepartmentByParentId(parentId); + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID())); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId,String url) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl(url+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID(),url)); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId,List zdepartmentPdList) throws Exception { + List[] arrayDep = this.listAllbyPd(parentId,zdepartmentPdList); + List departmentPdList = arrayDep[1]; + for(PageData pd : departmentPdList){ + this.listAllDepartmentToSelect(pd.getString("id"),arrayDep[0]); + } + return arrayDep[0]; + } + + /**下拉ztree用 + * @param parentId + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List[] listAllbyPd(String parentId,List zdepartmentPdList) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + List departmentPdList = new ArrayList(); + for(Department depar : departmentList){ + PageData pd = new PageData(); + pd.put("id", depar.getDEPARTMENT_ID()); + pd.put("parentId", depar.getPARENT_ID()); + pd.put("name", depar.getNAME()); + pd.put("icon", "../../../assets/images/user.gif"); + departmentPdList.add(pd); + zdepartmentPdList.add(pd); + } + List[] arrayDep = new List[2]; + arrayDep[0] = zdepartmentPdList; + arrayDep[1] = departmentPdList; + return arrayDep; + } + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式， ('a','b','c')) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception { + DEPARTMENT_ID = Tools.notEmpty(DEPARTMENT_ID)?DEPARTMENT_ID:"0"; + List zdepartmentPdList = new ArrayList(); + zdepartmentPdList = this.listAllDepartmentToSelect(DEPARTMENT_ID,zdepartmentPdList); + StringBuffer sb = new StringBuffer(); + sb.append(""); + for(PageData dpd : zdepartmentPdList){ + sb.append(dpd.getString("id")); + sb.append(","); + } + sb.append("'fh'"); + return sb.toString(); + } + + /**通过条件获取全部 + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return (List)departmentMapper.listAll(pd); + } + + /**通过企业主部门 + * @param pd + * @throws Exception + */ + public PageData findByCorpId(PageData pd)throws Exception{ + return departmentMapper.findByCorpId(pd); + } + /**列表 关联 部门级别名称 + * @param page + * @throws Exception + */ + @Override + public List listForLevelName(Page page) throws Exception { + // TODO Auto-generated method stub + return departmentMapper.forLevelNamedatalistPage(page); + } + + @Override + public List listTreeCorpDept(PageData pd) throws Exception { + return departmentMapper.listTreeCorpDept(pd); + } + + @Override + public List listTreeManageAndCorp(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp(pd); + } + @Override + public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); + } + @Override + public List listTreeManageAndCorp1(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp1(pd); + } + @Override + public List listTreeManageAndCorp2(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp2(pd); + } + @Override + public List listTreeManageAndCorpHasOrder(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorpHasOrder(pd); + } + + + @Override + public List listDept(PageData pd) throws Exception { + return departmentMapper.listDept(pd); + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listTreeCorp(String parentId) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listTreeCorp(depar.getDEPARTMENT_ID())); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + public List getSonIdsByParid(PageData pd) throws Exception { + return departmentMapper.getSonIdsByParid(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java new file mode 100644 index 00000000..34b1d2c4 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.DataDockingLogMapper; +import com.zcloud.service.map.DataDockingLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：曹妃甸数据对接日志 + * 作者：luoxiaobao + * 时间：2023-09-11 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class DataDockingLogServiceImpl implements DataDockingLogService { + + @Autowired + private DataDockingLogMapper datadockinglogMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + datadockinglogMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + datadockinglogMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + datadockinglogMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return datadockinglogMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return datadockinglogMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return datadockinglogMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + datadockinglogMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java new file mode 100644 index 00000000..f3008652 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java @@ -0,0 +1,129 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService; +import com.zcloud.service.highriskwork.HotworkCfdService; +import com.zcloud.service.highriskwork.HotworkGasCfdService; +import com.zcloud.service.map.MapEightCfdService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MapEightCfdServiceImpl implements MapEightCfdService { + @Autowired + private MapEightMapper mapEightMapper; + @Autowired + private HotworkCfdService hotworkCfdService; + @Autowired + private HotworkGasCfdService hotworkGasCfdService; + @Autowired + private HotworkAcceptUserCfdService hotworkacceptuserCfdService; + + @Override + public List listAll(PageData pd) { + return mapEightMapper.listAll(pd); + } + + @Override + public List listAllMeasures(PageData pd) { + return mapEightMapper.listAllMeasures(pd); + } + + @Override + public Map getByIdOrder(PageData pd) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + //动火作业√ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = hotworkCfdService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("measuresList", hotworkCfdService.listAllMeasures(pd)); + map.put("gasList", hotworkGasCfdService.listAll(pd)); + map.put("imgList", hotworkacceptuserCfdService.findByIds(pd)); + map.put("imgList1", hotworkacceptuserCfdService.findById(pd)); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + //用电作业√ +// pd.put("ELECTRICITY_ID",idStr); +// pd = electricityService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", electricityService.listAllMeasures(pd)); +// map.put("imgList",electricityacceptuserService.findByIds(pd)); +// map.put("imgList1",electricityacceptuserService.findById(pd)); +// map.put("gasList", electricityGasService.listAll(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + //盲板作业√ +// pd.put("BLINDBOARD_ID",idStr); +// pd = blindboardService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", blindboardService.listAllMeasures(pd)); +// map.put("imgList",blindboardacceptuserService.findByIds(pd)); +// map.put("imgList1",blindboardacceptuserService.findById(pd)); +// map.put("boardList", blindBoardInfoService.listAll(pd)); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + //高空作业√ +// pd.put("HIGHWORK_ID",idStr); +// pd = highworkService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", highworkService.listAllMeasures(pd)); +// map.put("imgList",highworkacceptuserService.findByIds(pd)); +// map.put("imgList1",highworkacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + //有限空间√ +// pd.put("CONFINEDSPACE_ID",idStr); +// pd = confinedspaceService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", confinedspaceService.listAllMeasures(pd)); +// map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); +// map.put("imgList1",confinedspaceacceptuserService.findById(pd)); +// map.put("gasList", confinedspaceGasService.listAll(pd)); +// map.put("gas", confinedspacegaswhService.findById(pd)); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + //吊装作业√ +// pd.put("HOISTING_ID",idStr); +// pd = hoistingService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", hoistingService.listAllMeasures(pd)); +// map.put("imgList",hoistingacceptuserService.findByIds(pd)); +// map.put("imgList1",hoistingacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + //破土作业√ +// pd.put("BREAKGROUND_ID",idStr); +// pd = breakgroundService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", breakgroundService.listAllMeasures(pd)); +// map.put("imgList",breakgroundacceptuserService.findByIds(pd)); +// map.put("imgList1",breakgroundacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + //断路作业√ +// pd.put("CUTROAD_ID",idStr); +// pd = cutroadService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", cutroadService.listAllMeasures(pd)); +// map.put("imgList",cutroadacceptuserService.findByIds(pd)); +// map.put("imgList1",cutroadacceptuserService.findById(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java index e56718fb..0ae2e2a0 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -3,7 +3,6 @@ package com.zcloud.service.map.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.map.MapEightMapper; -import com.zcloud.mapper.datasource.system.UsersMapper; import com.zcloud.service.map.MapEightService; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; @@ -26,8 +25,6 @@ public class MapEightServiceImpl implements MapEightService { @Autowired private MapEightMapper mapEightMapper; - @Autowired - private UsersMapper usersMapper; @Override public List getCorpinfoIds(PageData pd) { @@ -115,7 +112,8 @@ public class MapEightServiceImpl implements MapEightService { String typeStr = pd.getString("TYPE"); //动火 if(StringUtils.equals(typeStr,"HOTWORK")){ - r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); +// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); //临时用电 }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); @@ -205,6 +203,19 @@ public class MapEightServiceImpl implements MapEightService { public Object getEchartsOrder(PageData pd) { Map returnMap = new HashMap<>(); String errInfo = "success"; + + //根据条件增加参数或减少参数 都没有 直接返回空 + if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){ + List ArrayDATA_IDS = getCorpinfoIds(pd); + if(ArrayDATA_IDS.size()==0){ + returnMap.put("result", errInfo); + return returnMap; + }else { + pd.put("ids",ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + } + Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); @@ -266,6 +277,15 @@ public class MapEightServiceImpl implements MapEightService { @Override public PageData statisticsHighRiskWorkByStateOrder(PageData pd) throws Exception { //根据条件增加参数或减少参数 都没有 直接返回空 + if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){ + List ArrayDATA_IDS = getCorpinfoIds(pd); + if(ArrayDATA_IDS.size()==0){ + return new PageData(); + }else { + pd.put("ids",ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + } return mapEightMapper.statisticsHighRiskWorkByStateOrder(pd); } @@ -326,98 +346,59 @@ public class MapEightServiceImpl implements MapEightService { pd.put("ELECTRICITY_ID",idStr); pd = mapEightMapper.findByIdELECTRICITYOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITYOrder(pd)); + map.put("gasList", mapEightMapper.listAllGasELECTRICTITYOrder(pd)); + map.put("imgList1",mapEightMapper.findByELECTRICTITYAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByELECTRICTITYAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ pd.put("BLINDBOARD_ID",idStr); pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); - map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); PageData Info = mapEightMapper.findByIdJWDOrder(pd); pd.put("TYPE",105);//盲板位置图 pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); List ImgList = mapEightMapper.listAllBLINDBOARD(pd); map.put("Info",Info);//获取经纬度 map.put("ImgList",ImgList); + map.put("imgList1",mapEightMapper.findByBLINDBOARDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBLINDBOARDAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"HIGHWORK")){ pd.put("HIGHWORK_ID",idStr); pd = mapEightMapper.findByIdHIGHWORKOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(pd)); + map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - //没有有限空间作业 - //pd.put("CONFINEDSPACE_ID",idStr); - //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); - pd = new PageData(); - map.put("measuresList", null); - map.put("gasList", null); + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取 + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd)); + map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd)); + map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd)); }else if(StringUtils.equals(typeStr,"HOISTING")){ pd.put("HOISTING_ID",idStr); pd = mapEightMapper.findByIdHOISTINGOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresHOISTINGOrder(pd)); + map.put("imgList1",mapEightMapper.findByHOISTINGAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHOISTINGAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ pd.put("BREAKGROUND_ID",idStr); pd = mapEightMapper.findByIdBREAKGROUNDOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresBREAKGROUNDOrder(pd)); + map.put("imgList1",mapEightMapper.findByBREAKGROUNDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBREAKGROUNDAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CUTROAD")){ pd.put("CUTROAD_ID",idStr); pd = mapEightMapper.findByIdCUTROADOrder(pd); map.put("measuresList", mapEightMapper.listAllMeasuresCUTROADOrder(pd)); + map.put("imgList1",mapEightMapper.findByCUTROADAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByCUTROADAcceptuserIds(pd)); } map.put("pd", pd); map.put("result", errInfo); return map; } - /** - * @Description: 曹妃甸项目 暂时未用 - * @Author: dearLin - * @Date: 2023/12/13/013 16:45 - * @Param: [com.zcloud.entity.PageData] [pd] - * @Return: java.lang.Object - */ - @Override - public Object getAllWorkUserCards(PageData pd) { - Map map = new HashMap(); - String errInfo = "success"; - PageData allWorkUserIds = mapEightMapper.getAllWorkUserIds(pd); - /*String userCards = "";*/ - if (allWorkUserIds!=null){ - //临时用电 - String electricity_work_user_ids = allWorkUserIds.getString("ELECTRICITY_WORK_USER_IDS"); - //受限空间作业 - String confinedspace_work_user_ids = allWorkUserIds.getString("CONFINEDSPACE_WORK_USER_IDS"); - //高处作业 - String hiwork_work_user_ids = allWorkUserIds.getString("HIGHWORK_WORK_USER_IDS"); - //吊装作业 - String hoisting_work_user_ids = allWorkUserIds.getString("HOISTING_WORK_USER_IDS"); - //盲板作业 - String blindboard_work_user_ids = allWorkUserIds.getString("BLINDBOARD_WORK_USER_IDS"); - //拼接ids - String ids = ""; - if (Tools.notEmpty(electricity_work_user_ids)){ - ids += electricity_work_user_ids + ","; - } - if (Tools.notEmpty(confinedspace_work_user_ids)){ - ids += confinedspace_work_user_ids + ","; - } - if (Tools.notEmpty(hiwork_work_user_ids)){ - ids += hiwork_work_user_ids + ","; - } - if (Tools.notEmpty(hoisting_work_user_ids)){ - ids += hoisting_work_user_ids + ","; - } - if (Tools.notEmpty(blindboard_work_user_ids)){ - ids += blindboard_work_user_ids + ","; - } - String[] split = ids.split(","); - //查询作业人员卡号 -// List userCardsByIds = usersMapper.getUserCardsByIds(split); - /* for (String usercard : userCardsByIds){ - if (Tools.notEmpty(usercard) && !userCards.contains(usercard)){ - userCards += usercard + ","; - } - }*/ -// map.put("userCardsList", userCardsByIds); - } - map.put("result", errInfo); - return map; - } + + private PageData shenpi(PageData pd,List list){ List specialUserList = new ArrayList<>(); for (PageData userPageData : list){ diff --git a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java new file mode 100644 index 00000000..2dd375c6 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java @@ -0,0 +1,127 @@ +package com.zcloud.service.map.impl; + + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.MapKeyProjectMapper; +import com.zcloud.service.bus.ImgFilesService; +import com.zcloud.service.map.CorpDepartmentService; +import com.zcloud.service.map.MapEightService; +import com.zcloud.service.map.MapKetProjectService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MapKeyProjectServiceImpl implements MapKetProjectService { + + @Autowired + private MapKeyProjectMapper keyProjectMapper; + + @Autowired + private CorpDepartmentService corpDepartmentService; + + @Autowired + private UsersService usersService; + + @Autowired + private ImgFilesService imgfilesService; + + @Autowired + private MapEightService mapEightService; + + + @Override + public Object findFormCount(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + //根据条件增加参数或减少参数 都没有 直接返回空 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData pageData = keyProjectMapper.findFormCount(pd); + returnMap.put("pd", pageData); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public Object listAllLocation(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + //根据条件增加参数或减少参数 都没有 直接返回空 + pd.getString("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + String typeStr = pd.getString("TYPE"); + List r = new ArrayList<>(); + //重点工程 + if(StringUtils.equals(typeStr,"PROJECT")){ + r = keyProjectMapper.getProjectLocation(pd); + //视频 + }else if(StringUtils.equals(typeStr,"camera")){ + r = keyProjectMapper.getVideoLocation(pd); + } + returnMap.put("varList", r); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public Object getById(PageData pd) throws Exception { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + //重点工程 + if(StringUtils.equals(typeStr,"PROJECT")){ + pd = keyProjectMapper.getProjectById(pd); + PageData selectPageData = new PageData(); + + selectPageData.put("CORPINFO_ID",pd.get("PUNISH_THE_PERSON")); + List deptList = corpDepartmentService.listTreeManageAndCorpForPcPunishThePerson(selectPageData); //根据ID读取 + + + String userStr = pd.getString("PUNISH_THE_PERSON"); + if (!Tools.isEmpty(userStr)) { + String[] split = userStr.split(","); + selectPageData.put("ids",split); + List pageData = usersService.selectUserListByUserIds(selectPageData); + returnMap.put("punishThePerson", pageData); + } + PageData pd3 = new PageData(); + pd3.put("TYPE", 300); + pd3.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); + List file9 = imgfilesService.listAll(pd3); + returnMap.put("file9", file9); + //视频 + }else if(StringUtils.equals(typeStr,"VIDEO")){ + pd = keyProjectMapper.getVideoById(pd); + } + returnMap.put("pd", pd); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public Object list(Page page) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + List varList = keyProjectMapper.datalistPage(page); + returnMap.put("varList", varList); + returnMap.put("result", errInfo); + return returnMap; + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java new file mode 100644 index 00000000..69447cf5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java @@ -0,0 +1,154 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalMapper; +import com.zcloud.service.map.MeteorologicalService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MeteorologicalServiceImpl implements MeteorologicalService { + + @Autowired + private MeteorologicalMapper meteorologicalMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + meteorologicalMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + meteorologicalMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + meteorologicalMapper.edit(pd); + } + public void savePosition(PageData pd)throws Exception{ + meteorologicalMapper.savePosition(pd); + } + public void editIsShowBycorpinfoid(PageData pd)throws Exception{ + meteorologicalMapper.editIsShowBycorpinfoid(pd); + } + public void editIsShow(PageData pd)throws Exception{ + meteorologicalMapper.editIsShow(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return meteorologicalMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception{ + return meteorologicalMapper.listBo(pd); + } + /**列表 + * @param page + * @throws Exception + */ + public List listByEquipment(Page page)throws Exception{ + return meteorologicalMapper.listByEquipmentdatalistPage(page); + } + + public List listbyType(Page page)throws Exception{ + return meteorologicalMapper.listbyType(page); + } + + @Override + public List listbyTypeLocation(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"293187ddfd984c9ab3fd716aef58da0e")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + //风向站 + }else if(StringUtils.equals(typeStr,"561347f0cff641dba8b2b22c0f443348")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + //温度站 + }else if(StringUtils.equals(typeStr,"2da29f00852a4653ba3e760b9de57412")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + // 风速站 + }else if(StringUtils.equals(typeStr,"732fe73933b845c6b1e2aee06a38ed31")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + // 湿度站 + } + return r; + } + + + public PageData listbyequipmentcount(PageData pd)throws Exception{ + return meteorologicalMapper.listbyequipmentcount(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return meteorologicalMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return meteorologicalMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + meteorologicalMapper.deleteAll(ArrayDATA_IDS); + } + + /**通过CODE获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCode(PageData pd)throws Exception{ + return meteorologicalMapper.findByCode(pd); + } + + public List listAllForMap(PageData pd)throws Exception{ + return meteorologicalMapper.listAllForMap(pd); + } + + public List getPointsInfo(PageData pd)throws Exception{ + return meteorologicalMapper.getPointsInfo(pd); + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java new file mode 100644 index 00000000..42c149a5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java @@ -0,0 +1,222 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalinfoMapper; +import com.zcloud.service.map.DataDockingLogService; +import com.zcloud.service.map.MeteorologicalinfoService; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.util.DateUtil; +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.Date; +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService { + + @Autowired + private MeteorologicalinfoMapper meteorologicalinfoMapper; + + @Autowired + private DataDockingLogService dataDockingLogService; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + meteorologicalinfoMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + meteorologicalinfoMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + meteorologicalinfoMapper.edit(pd); + } + public void savePosition(PageData pd)throws Exception{ + meteorologicalinfoMapper.savePosition(pd); + } + public void editIsShowBycorpinfoid(PageData pd)throws Exception{ + meteorologicalinfoMapper.editIsShowBycorpinfoid(pd); + } + public void editIsShow(PageData pd)throws Exception{ + meteorologicalinfoMapper.editIsShow(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return meteorologicalinfoMapper.datalistPage(page); + } + + /**列表 + * @throws Exception + */ + public PageData listbymeteorological(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listbymeteorological(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listBo(pd); + } + /**列表 + * @param page + * @throws Exception + */ + public List listbyinfo(Page page)throws Exception{ + return meteorologicalinfoMapper.listbyinfodatalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return meteorologicalinfoMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + meteorologicalinfoMapper.deleteAll(ArrayDATA_IDS); + } + + /**通过CODE获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCode(PageData pd)throws Exception{ + return meteorologicalinfoMapper.findByCode(pd); + } + + public List listAllForMap(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listAllForMap(pd); + } + + public List getPointsInfo(PageData pd)throws Exception{ + return meteorologicalinfoMapper.getPointsInfo(pd); + } + + @Override + public ReturnMap tongbuMeteorologicalinfo(List list) throws Exception { + PageData info = new PageData(); + list.forEach(weather ->{ + if(weather.get("variableName").equals("风速")){ + info.put("WINDSPEED", weather.get("value").toString()); + }else if(weather.get("variableName").equals("风向")){ + info.put("WINDDIRECTION", weather.get("value").toString()); + }else if(weather.get("variableName").equals("迎风角度")){ + info.put("WINDDIRECTION", weather.get("value").toString()); + }else if(weather.get("variableName").equals("雨量")){ + info.put("RAINFALL", weather.get("value").toString()); + } + info.put("CODE",weather.get("cusdeviceNo").toString()); + info.put("OPERATTIME",DateUtil.date2Str(new Date(Long.parseLong(weather.get("time").toString() + "000")))); + }); + if(info.get("WINDSPEED") == null && info.get("WINDDIRECTION") == null && info.get("RAINFALL") == null){ //都没有值 不保存 + return ReturnMap.error(200,"操作成功"); + } + List tenSList = meteorologicalinfoMapper.tensList(info); //10秒内相同设备的数据 + if(tenSList.size()>0){ + PageData old = tenSList.get(0); + old.putAll(info); + edit(old); + }else{ + info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID()); + save(info); + } + System.out.println("---------------------保存对接数据------------------"); + System.out.println(info); + return ReturnMap.error(200,"操作成功"); + } + + /** + * 保存新增数据对接日志 + * @param saveMeteorologicalinfoCount + * @throws Exception + */ + public void saveMeteorologicalinfoDataDocking(Integer saveMeteorologicalinfoCount) throws Exception { + PageData savePd = new PageData(); + savePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID()); + savePd.put("DOCKING_TYPE",0); + savePd.put("DOCKING_MODULE","气象信息"); + savePd.put("NUMBER",saveMeteorologicalinfoCount); + savePd.put("DOCKING_TIME", DateUtil.date2Str(new Date())); + dataDockingLogService.save(savePd); + } + + /** + * 保存修改数据对接日志 + * @param updateMeteorologicalinfoCount + * @throws Exception + */ + public void updateMeteorologicalinfoDataDocking(Integer updateMeteorologicalinfoCount) throws Exception { + PageData updatePd = new PageData(); + updatePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID()); + updatePd.put("DOCKING_TYPE",1); + updatePd.put("DOCKING_MODULE","气象信息"); + updatePd.put("NUMBER",updateMeteorologicalinfoCount); + updatePd.put("DOCKING_TIME", DateUtil.date2Str(new Date())); + dataDockingLogService.save(updatePd); + } + + /** + * 根据用户IDS 获取气象信息 + * @param MeteorologicalinfoIds 气象ids + * @return + */ + public List getMeteorologicalinfoListByIds (List MeteorologicalinfoIds) { + PageData pd = new PageData(); + pd.put("MeteorologicalinfoIds",MeteorologicalinfoIds); + return meteorologicalinfoMapper.getMeteorologicalinfoListByIds(pd); + } + + @Override + public Integer saveMeteorologicalinfo(List list) { + if (list.size() < 1) return 0; + return meteorologicalinfoMapper.insertAll(list); + } + + @Override + public Integer updateMeteorologicalinfo(PageData pageData) { + return meteorologicalinfoMapper.updateMeteorologicalinfo(pageData); + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java new file mode 100644 index 00000000..1843ad16 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java @@ -0,0 +1,93 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.PlatformelectronicMapper; +import com.zcloud.service.map.PlatformelectronicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class PlatformelectronicServiceImpl implements PlatformelectronicService { + + @Autowired + private PlatformelectronicMapper platformelectronicMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + platformelectronicMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + platformelectronicMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + platformelectronicMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return platformelectronicMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return platformelectronicMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return platformelectronicMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + platformelectronicMapper.deleteAll(ArrayDATA_IDS); + } + + @Override + public Integer countAllForMap(PageData pd) throws Exception { + return platformelectronicMapper.countAllForMap(pd); + } + + @Override + public List countAllByArea(PageData pd) { + return platformelectronicMapper.countAllByArea(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java b/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java new file mode 100644 index 00000000..2e4555e4 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java @@ -0,0 +1,199 @@ +package com.zcloud.service.map.util; + +import com.zcloud.service.map.BaseResultInterface; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public enum CodeMessageEnum implements BaseResultInterface { + + /** ********* 0000成功 *************** */ + SUCCESS("0000", "成功!"), + SUCCESS_LOGIN("0001", "用户登录成功"), + SUCCESS_LOGOUT("0002", "用户退出成功"), + + /* 默认失败 */ + COMMON_FAIL("999", "失败"), + + /** ********* 1xxx系统错误 *************** */ + SERVER_BUSY("1001", "服务器正忙，请稍后再试!"), + INTERNAL_SERVER_ERROR("1002", "服务器内部错误"), + NOT_FOUND("1003", "未找到该资源!"), + REQUEST_METHOD_ERROR("1004", "接口请求方法异常"), + SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"), + NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"), + INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"), + PARSE_TOKEN_EXCEPTION("1008", "解析token异常"), + TOKEN_NOT_EXIST("1009", "token不存在"), + TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"), + TOKEN_EXPIRE("1011", "token过期，请重新登录"), + IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"), + NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"), + UPLOAD_FILE_ERROR("1014", "文件上传失败"), + FILE_NOT_EXIST("1015", "文件不存在"), + FILE_HAS_DELETED("1016", "文件已被删除"), + DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."), + TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"), + CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"), + DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"), + CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"), + DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."), + CREATE_DATABASE_ERROR("1023", "创建数据库失败"), + CREATE_TABLE_ERROR("1024", "创建表失败"), + UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"), + DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"), + QUERY_ROLE_ERROR("1027", "查询角色失败"), + UPDATE_GROUP_ERROR("1028", "更新接口组失败"), + DELETE_GROUP_ERROR("1029", "删除接口组失败"), + SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"), + + /** + * ******2xxx参数错误 ********************* + */ + BODY_NOT_MATCH("2001", "请求的数据格式不符"), + SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"), + REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"), + NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"), + NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"), + NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"), + NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"), + NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"), + SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"), + TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"), + FILE_PICTURE_IS_NULL("2011", "附件不存在"), + FILE_PICTURE_DELETE("2012", "删除附件失败"), + DIC_BIANMA_REPEAT("2013", "字典编码重复"), + + + + + + /** *********** 3xxx用户错误 ******************* */ + USER_NOT_LOGIN("3001", "用户未登录"), + USER_ACCOUNT_EXPIRED("3002", "账号已过期"), + USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"), + USER_CREDENTIALS_EXPIRED("3004", "密码过期"), + USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"), + USER_ACCOUNT_LOCKED("3006", "账号被锁定"), + USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"), + USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"), + USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"), + USER_NO_PERMISSION("3010", "当前账号没有此权限"), + USERNAME_NOT_BLANK("3011", "用户不能为空"), + USER_LOGIN_ERROR("3012", "用户登录失败"), + USER_LOGOUT_ERROR("3013", "用户退出失败"), + USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"), + USER_ACCESS_DENIED("3015", "权限认证失败"), + USERNAME_EXIST_ERROR("3016", "用户名重名"), + + ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"), + + /** ********** 4xxx业务错误 *********************** */ + ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"), + APP_KEY_EXIST("4002", "应用key已存在"), + APP_NOT_EXIST("4003", "应用不存在"), + APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"), + APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"), + APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"), + APP_PAGE_TYPE_ERROR("4007", "页面类型有误"), + APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"), + CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"), + DELETE_PAGE_ERROR("4010", "删除页面失败"), + CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"), + APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"), + DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"), + DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"), + DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"), + MODEL_NOT_EXIST("4016", "当前模型不存在"), + MODEL_HAS_DELETED("4017", "当前模型已删除"), + MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"), + DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"), + DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"), + DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"), + DEPT_USER_EXIST("4022", "部门下存在用户"), + NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"), + MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"), + MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"), + MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"), + FORM_NOT_EXIST("4027", "模型表单不存在"), + READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"), + MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"), + NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"), + APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"), + DELETE_COLUMN_ERROR("4032", "删除当前失败"), + INSERT_DATA_ERROR("4033", "新建数据失败"), + EDIT_DATA_ERROR("4034", "编辑数据失败"), + DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"), + NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"), + PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"), + AMIS_PAGE_ERROR("4038", "分页参数异常"), + QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"), + REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"), + STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"), + APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"), + APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"), + APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"), + NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"), + NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"), + CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"), + CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"), + APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"), + UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"), + DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"), + INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"), + DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"), + CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"), + CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"), + NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"), + JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"), + NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"), + NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"), + FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."), + APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"), + APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"), + TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"), + TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"), + TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"), + TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"), + CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"), + NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"), + APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"), + DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在") + ; + + CodeMessageEnum(String code, String message) { + this.code = code; + this.message = message; + } + + /** 返回到前端的code值 */ + private String code; + + /** 返回到前端的code对应的message值 */ + private String message; + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } + +// public static CodeVo getJsonObjectByCode(String code) { +// CodeVo codeVo = new CodeVo(); +// if (Tools.isEmpty(code)) { +// return codeVo; +// } +// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) { +// if (enumObj.getCode().equals(code)) { +// return new CodeVo(code, enumObj.message); +// } +// } +// return codeVo; +// } +} diff --git a/src/main/java/com/zcloud/service/map/util/HKPostUtil.java b/src/main/java/com/zcloud/service/map/util/HKPostUtil.java new file mode 100644 index 00000000..413fe903 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/HKPostUtil.java @@ -0,0 +1,190 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hikvision.artemis.sdk.Client; +import com.hikvision.artemis.sdk.Request; +import com.hikvision.artemis.sdk.Response; +import com.hikvision.artemis.sdk.constant.Constants; +import com.hikvision.artemis.sdk.enums.Method; +import com.zcloud.entity.PageData; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/09/12 10:16 + */ +public class HKPostUtil { + // 代理API网关nginx服务器ip端口 +// private static final String host = "192.168.211.185:443"; +// // 秘钥appkey +// private static final String appKey = "21830372"; +// // 秘钥appSecret +// private static final String appSecret = "vBZ89ltwQjHhFHLfg61V"; + private static final String host = "192.168.150.80:5443"; + // 秘钥appkey + private static final String appKey = "25448524"; + // 秘钥appSecret + private static final String appSecret = "DoHeB3gR2dxgaEvANqNr"; + /** + * 能力开放平台的网站路径 + * TODO 路径不用修改，就是/artemis + */ + private static final String ARTEMIS_PATH = "/artemis"; + + /** + * 通用海康接口 + * 调用POST请求类型(application/json)接口* + * @return + */ + public static Map publicHkInterface(JSONObject jsonBody, String url){ + final String getCamsApi = ARTEMIS_PATH +url; + Map path = new HashMap(2); + path.put("https://", getCamsApi); + // post请求application/json类型参数 + String result = doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null); + JSONObject parseObject = JSONArray.parseObject(result); + return parseObject; + } + + /** + * 获取监控点预览取流URL + * @param id 设备编号 + * @return + */ + public static Map camerasPreviewURLs(String id,String type){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("cameraIndexCode", id); + jsonBody.put("netZoneCode", "1"); + jsonBody.put("transmode", 1); + jsonBody.put("streamType", 0); + jsonBody.put("protocol",type); + jsonBody.put("expireTime", -1); + jsonBody.put("expand","transcode=1&streamform=rtp"); + Map returnMap=publicHkInterface(jsonBody,"/api/video/v1/cameras/previewURLs"); + return returnMap; + } + + /** + * 获取所有区域数 + * @return + */ + public static Map getAllArea(){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("parentIndexCode", "root000000"); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + jsonBody.put("cascadeFlag",0); + Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/regions/subRegions"); + return returnMap; + } + + /** + * 获取区域内摄像头数 + * @return + */ + public static Map getAreaCamera(String indexCode){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("regionIndexCode", indexCode); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + Map returnMap=publicHkInterface(jsonBody,"/api/irds/v2/resource/subResources"); + return returnMap; + } + + /** + * API名称： + * 查询监控点列表v2 + * 分组： + * 视频资源接口 + * 提供方名称： + * 资源目录服务 + * qps： + * 描述：根据条件查询目录下有权限的监控点列表 + * @return + */ + public static Map cameraSearch(PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if(pd.get("name")!=null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + jsonBody.put("resourceType", "camera"); + Map returnMap=publicHkInterface(jsonBody,"/api/irds/v2/deviceResource/resources"); + return returnMap; + } + + /** + * 订阅事件 + * @param ids 事件编号 131588 + * @return + */ + public static Map subscribeEvent(String[] ids){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("eventTypes", ids); + jsonBody.put("eventDest", "1"); + Map returnMap=publicHkInterface(jsonBody,"/api/eventService/v1/eventSubscriptionByEventTypes"); + return returnMap; + } + + public static String doPostStringArtemis(Map path, String body, Map querys, String accept, String contentType, Map header) { + String httpSchema = (String)path.keySet().toArray()[0]; + if (httpSchema != null && !StringUtils.isEmpty(httpSchema)) { + String responseStr = null; + + try { + Map headers = new HashMap(); + if (StringUtils.isNotBlank(accept)) { + headers.put("Accept", accept); + } else { + headers.put("Accept", "*/*"); + } + + if (StringUtils.isNotBlank(contentType)) { + headers.put("Content-Type", contentType); + } else { + headers.put("Content-Type", "application/text;charset=UTF-8"); + } + + if (header != null) { + headers.putAll(header); + } + + Request request = new Request(Method.POST_STRING, httpSchema + host, (String)path.get(httpSchema), appKey, appSecret, Constants.DEFAULT_TIMEOUT); + request.setHeaders(headers); + request.setQuerys(querys); + request.setStringBody(body); + Response response = Client.execute(request); + responseStr = getResponseResult(response); + } catch (Exception var11) { + var11.printStackTrace(); + } + return responseStr; + } else { + throw new RuntimeException("http和https参数错误httpSchema: " + httpSchema); + } + } + + private static String getResponseResult(Response response) { + String responseStr = null; + int statusCode = response.getStatusCode(); + if (!String.valueOf(statusCode).startsWith("2") && !String.valueOf(statusCode).startsWith("3")) { + String msg = response.getErrorMessage(); + responseStr = response.getBody(); + System.out.println("the Artemis Request is Failed,statusCode:" + statusCode + " errorMsg:" + msg); + } else { + responseStr = response.getBody(); + System.out.println("the Artemis Request is Success,statusCode:" + statusCode + " SuccessMsg:" + response.getBody()); + } + + return responseStr; + } + +} diff --git a/src/main/java/com/zcloud/service/map/util/HKUtil.java b/src/main/java/com/zcloud/service/map/util/HKUtil.java new file mode 100644 index 00000000..be0d9c9f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/HKUtil.java @@ -0,0 +1,86 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hikvision.artemis.sdk.ArtemisHttpUtil; +import com.hikvision.artemis.sdk.config.ArtemisConfig; +import com.zcloud.entity.PageData; + +import java.util.HashMap; +import java.util.Map; + +/** + * 海康工具类 + */ +public class HKUtil { + static { + // 代理API网关nginx服务器ip端口 + ArtemisConfig.host = "192.168.150.80:5443"; + // 秘钥appkey + ArtemisConfig.appKey = "25448524"; + // 秘钥appSecret + ArtemisConfig.appSecret = "DoHeB3gR2dxgaEvANqNr"; + } + /** + * 能力开放平台的网站路径 + * TODO 路径不用修改，就是/artemis + */ + private static final String ARTEMIS_PATH = "/artemis"; + /** + * 通用海康接口 + * 调用POST请求类型(application/json)接口* + * @return + */ + public static Map publicHkInterface(JSONObject jsonBody,String url){ + final String getCamsApi = ARTEMIS_PATH +url; + Map path = new HashMap(2); + path.put("https://", getCamsApi); + // post请求application/json类型参数 + String result =ArtemisHttpUtil.doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null); + JSONObject parseObject = JSONArray.parseObject(result); + return parseObject; + } + + + /** + * 获取监控点预览取流URL + * @param id 设备编号 + * @return + */ + public static Map camerasPreviewURLs(String id,String type){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("indexCode", id); + jsonBody.put("netZoneCode", "1"); + jsonBody.put("transmode", 1); + jsonBody.put("streamType", 0); + jsonBody.put("protocol",type); + jsonBody.put("expireTime", -1); + jsonBody.put("expand","transcode=1&streamform=rtp"); + Map returnMap=publicHkInterface(jsonBody,"/api/vnsc/mls/v1/preview/openApi/getPreviewParam"); + /*/api/video/v1/cameras/previewURLs*/ + return returnMap; + } + + /** + * API名称： + * 查询监控点列表v2 + * 分组： + * 视频资源接口 + * 提供方名称： + * 资源目录服务 + * qps： + * 描述：根据条件查询目录下有权限的监控点列表 + * @return + */ + public static Map cameraSearch(PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if(pd.get("name")!=null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/camera/search"); + return returnMap; + } +} diff --git a/src/main/java/com/zcloud/service/map/util/ReturnMap.java b/src/main/java/com/zcloud/service/map/util/ReturnMap.java new file mode 100644 index 00000000..a4cd6b4e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/ReturnMap.java @@ -0,0 +1,145 @@ +package com.zcloud.service.map.util; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + +import org.apache.http.HttpStatus; + +import java.util.HashMap; +import java.util.Map; + +/** + * @description: R类 + **/ +public class ReturnMap extends HashMap { + /** + * 序列ID + */ + private static final long serialVersionUID = 1L; + + /** + * R的无参构造, 初始化信息 + */ + public ReturnMap() { + put("code", 0); + put("msg", "success"); + put("result", "success"); + } + + /** + * error1: 返回默认error + * + * @return 返回默认error + */ + public static ReturnMap error() { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常, 请联系管理员"); + } + + /** + * error2 + * + * @param msg 错误信息 + * @return 返回自定义信息的error + */ + public static ReturnMap error(String msg) { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); + } + + public static ReturnMap error(CodeMessageEnum codeMessageEnum, String uri) { + return error(codeMessageEnum.getCode(), codeMessageEnum.getMessage(), uri); + } + + /** + * 原先R的code和msg被覆盖 + * + * @param code 错误码 + * @param msg 错误信息 + * @return 自定义的错误码和错误信息 + */ + public static ReturnMap error(int code, String msg) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + return r; + } + + public static ReturnMap error(String code, String msg) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + return r; + } + + public static ReturnMap error(String code, String msg, String uri) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + r.put("uri", uri); + return r; + } + + /** + * ok1 + * 加入了msg + * + * @param msg + * @return + */ + public static ReturnMap ok(String msg) { + ReturnMap r = new ReturnMap(); + r.put("msg", msg); + return r; + } + + /** + * ok2: 加入了map + * + * @param map + * @return + */ + public static ReturnMap ok(Map map) { + ReturnMap r = new ReturnMap(); + r.putAll(map); + return r; + } + + /** + * ok3: 直接返回"0", "success" + * + * @return + */ + public static ReturnMap ok() { + return new ReturnMap(); + } + + /** + * 放入自定义的key和value, 然后返回 + * + * @param key + * @param value + * @return + */ + @Override + public ReturnMap put(String key, Object value) { + super.put(key, value); + return this; + } + + /** + * 得到这个对象的code + * + * @return + */ + public Integer getCode() { + return (Integer) this.get("code"); + } +} + + + diff --git a/src/main/java/com/zcloud/service/map/util/WeatherUtil.java b/src/main/java/com/zcloud/service/map/util/WeatherUtil.java new file mode 100644 index 00000000..a623d28f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/WeatherUtil.java @@ -0,0 +1,78 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSON; +import com.zcloud.entity.PageData; +import com.zcloud.util.UuidUtil; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/09/08 11:32 + */ +@Component +public class WeatherUtil { + private static final String WEATHER_PATH = "http://yunlink.027010.cn/OpenAPI/GetAllReal"; + private static final String sn="01803353066"; + private static final String pwd="353066"; + + public static Map getWeatherInfo() throws IOException { + CloseableHttpClient client = null; + CloseableHttpResponse response = null; + HttpPost httpPost = new HttpPost(buildUrl(WEATHER_PATH,sn,pwd)); + + client = HttpClients.createDefault(); + response = client.execute(httpPost); + HttpEntity entity = response.getEntity(); + String result = EntityUtils.toString(entity); + return JSON.parseObject(result, HashMap.class);//返回结果转换为map + } + + private static String buildUrl(String uri,String sn,String pwd) { + StringBuilder urlBuilder = new StringBuilder(uri+"?"); + try { + urlBuilder.append("sn=").append(URLEncoder.encode(sn, "UTF-8")); + urlBuilder.append("&pwd=").append(URLEncoder.encode(pwd, "UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return urlBuilder.toString(); + } + + public static void main(String[] args) throws IOException { + Map map = getWeatherInfo(); + List> datas = (List>)map.get("Datas"); + datas.forEach(item -> { + List> weathers = (List>)item.get("Weathers"); + if(weathers.size()>0){ + PageData info = new PageData(); + info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID()); + info.put("OPERATTIME", item.get("DateTime")); + info.put("CODE", item.get("ID")); + weathers.forEach(weather ->{ + if(weather.get("Index").equals(3)){ + info.put("TEMPERATURE", weather.get("Value").toString()); + } + if(weather.get("Index").equals(6)){ + info.put("WINDSPEED", weather.get("Value").toString()); + } + if(weather.get("Index").equals(7)){ + info.put("WINDDIRECTION", weather.get("Value").toString()); + } + }); + } + }); + } +} diff --git a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java index c9b38efe..71183c38 100644 --- a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java @@ -49,14 +49,15 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void sendMessage(TenCorpDto tenCorpDto) { - PageData productionPD = tenCorpDto.getPd(); + + PageData productionPD = new PageData(); productionPD.put("PRODUCTION_ID", Warden.get32UUID()); - productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); productionPD.put("PRODUCTION_TYPE", "DockSendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)"); productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); - productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); - productionPD.put("MARK", tenCorpDto.getMark()); - productionPD.putAll(tenCorpDto.getPd()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); mqMessageLogMapper.save(log); @@ -84,15 +85,15 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void sendMessagePicture(TenCorpDto tenCorpDto) { - PageData productionPD = tenCorpDto.getPd(); + + PageData productionPD = new PageData(); productionPD.put("PRODUCTION_ID", Warden.get32UUID()); - productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); productionPD.put("PRODUCTION_TYPE", "DockSendMessageServiceImpl.sendMessagePicture(TenCorpDto tenCorpDto)"); productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); - productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); - productionPD.put("MARK", tenCorpDto.getMark()); - productionPD.putAll(tenCorpDto.getPd()); - + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); @@ -122,16 +123,15 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void sendMessagePictureDelete(TenCorpDto tenCorpDto) { - PageData productionPD = tenCorpDto.getPd(); + + PageData productionPD = new PageData(); productionPD.put("PRODUCTION_ID", Warden.get32UUID()); - productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); productionPD.put("PRODUCTION_TYPE", "DockSendMessageServiceImpl.sendMessagePictureDelete(TenCorpDto tenCorpDto)"); productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); - productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); - productionPD.put("MARK", tenCorpDto.getMark()); - productionPD.put("DATA", tenCorpDto.getData()); - productionPD.putAll(tenCorpDto.getPd()); - + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); @@ -161,15 +161,15 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void SendDelayQueue(TenCorpDto tenCorpDto) { - PageData productionPD = tenCorpDto.getPd(); + + PageData productionPD = new PageData(); productionPD.put("PRODUCTION_ID", Warden.get32UUID()); - productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); productionPD.put("PRODUCTION_TYPE", "DockSendMessageServiceImpl.SendDelayQueue(TenCorpDto tenCorpDto)"); productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); - productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); - productionPD.put("MARK", tenCorpDto.getMark()); - productionPD.put("DATA", tenCorpDto.getData()); - productionPD.putAll(tenCorpDto.getPd()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); try { @@ -209,16 +209,14 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { public void SendDelayQueue(String message) { TenCorpDto tenCorpDto = JSONObject.parseObject(message,TenCorpDto.class); - PageData productionPD = tenCorpDto.getPd(); + PageData productionPD = new PageData(); productionPD.put("PRODUCTION_ID", Warden.get32UUID()); - productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); productionPD.put("PRODUCTION_TYPE", "DockSendMessageServiceImpl.SendDelayQueue(TenCorpDto tenCorpDto)"); productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); - productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); - productionPD.put("MARK", tenCorpDto.getMark()); - productionPD.put("DATA", tenCorpDto.getData()); - productionPD.putAll(tenCorpDto.getPd()); - + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("CREATE_TIME", DateUtil.getTime()); diff --git a/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java index c850bf44..49f195b6 100644 --- a/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java @@ -5,9 +5,12 @@ import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqProductionErrorLogMapper; +import com.zcloud.mapper.datasource.mq.MqProductionLogMapper; import com.zcloud.service.mq.LogService; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.DateUtil; +import com.zcloud.util.StackTraceUtils; import com.zcloud.util.Warden; import com.zcloud.util.mq.MqUtil; import org.apache.rocketmq.client.producer.SendResult; @@ -37,7 +40,22 @@ public class SendMessageServiceImpl implements SendMessageService { @Resource private MqMessageLogMapper mqMessageLogMapper; - public void sendMessage(TenCorpDto tenCorpDto) throws Exception { + @Resource + MqProductionErrorLogMapper mqProductionErrorLogMapper; + + @Resource + MqProductionLogMapper mqProductionLogMapper; + + public void sendMessage(TenCorpDto tenCorpDto) { + + PageData productionPD = new PageData(); + productionPD.put("PRODUCTION_ID", Warden.get32UUID()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); + productionPD.put("PRODUCTION_TYPE", "SendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)"); + productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); @@ -48,6 +66,9 @@ public class SendMessageServiceImpl implements SendMessageService { if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); } + productionPD.put("SUCCESS",'1'); + productionPD.put("ERROR_MESSAGE","SUCCESS"); + mqProductionLogMapper.save(productionPD); } catch (Exception e) { e.printStackTrace(); PageData log = tenCorpDto.getPd(); @@ -56,11 +77,23 @@ public class SendMessageServiceImpl implements SendMessageService { log.put("TYPE", "0"); log.put("TIME", DateUtil.getTime()); mqErrorMessageLogMapper.save(log); + productionPD.put("SUCCESS",'0'); + productionPD.put("ERROR_MESSAGE", StackTraceUtils.printStackTraceToString(e)); + mqProductionErrorLogMapper.save(productionPD); } } @Override public void SendDelayQueue(TenCorpDto tenCorpDto) { + + PageData productionPD = new PageData(); + productionPD.put("PRODUCTION_ID", Warden.get32UUID()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); + productionPD.put("PRODUCTION_TYPE", "SendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)"); + productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); try { @@ -80,6 +113,9 @@ public class SendMessageServiceImpl implements SendMessageService { if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); } + productionPD.put("SUCCESS",'1'); + productionPD.put("ERROR_MESSAGE","SUCCESS"); + mqProductionLogMapper.save(productionPD); } catch (Exception e) { e.printStackTrace(); log.put("ERROR_MESSAGE", e.getMessage()); @@ -87,12 +123,24 @@ public class SendMessageServiceImpl implements SendMessageService { log.put("TYPE", "0"); log.put("TIME", DateUtil.getTime()); mqErrorMessageLogMapper.save(log); + productionPD.put("SUCCESS",'0'); + productionPD.put("ERROR_MESSAGE", StackTraceUtils.printStackTraceToString(e)); + mqProductionErrorLogMapper.save(productionPD); } } @Override public void SendDelayQueue(String message) { TenCorpDto tenCorpDto = JSONObject.parseObject(message,TenCorpDto.class); + + PageData productionPD = new PageData(); + productionPD.put("PRODUCTION_ID", Warden.get32UUID()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId()); + productionPD.put("PRODUCTION_TYPE", "SendMessageServiceImpl.SendDelayQueue(TenCorpDto tenCorpDto)"); + productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("CREATE_TIME", DateUtil.getTime()); @@ -110,20 +158,17 @@ public class SendMessageServiceImpl implements SendMessageService { if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); } + productionPD.put("SUCCESS",'1'); + productionPD.put("ERROR_MESSAGE","SUCCESS"); + mqProductionLogMapper.save(productionPD); } catch (Exception e) { + productionPD.put("SUCCESS",'0'); + productionPD.put("ERROR_MESSAGE", StackTraceUtils.printStackTraceToString(e)); + mqProductionErrorLogMapper.save(productionPD); PageData log = tenCorpDto.getPd(); logService.saveErrorMessage(log,e.getMessage()); e.printStackTrace(); } } - public static void main(String[] args) { - try { - System.out.println(MqUtil.analysisTime("2023-06-30 14:30:00:000")); - }catch (Exception e){ - e.printStackTrace(); - } - } - - } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 68111e4d..4d2855a7 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -353,9 +353,6 @@ public interface UsersService { PageData getUserInfo(PageData pd); - PageData getPersonByCardNo(PageData pd); - - PageData findByCardNo(PageData pd); Object getCurrentLocation(PageData pd); @@ -366,4 +363,10 @@ public interface UsersService { Object getCurrentLocationCount(PageData pd); List getRegUserInfo(PageData pd); + + PageData countAllByArea(PageData pd) throws Exception; + + PageData getPersonByCardNo(PageData pd) throws Exception; + + PageData findByCardNo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index bd905f76..60438fea 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -9,7 +9,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.system.Role; import com.zcloud.util.HttpRequestUtil; -import com.zcloud.util.PerLocUtil; +import com.zcloud.util.CzksPerLocUtil; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,7 @@ import com.zcloud.service.system.UsersService; @Transactional //开启事物 public class UsersServiceImpl implements UsersService { @Autowired - private PerLocUtil perLocUtil; + private CzksPerLocUtil perLocUtil; @Autowired private UsersMapper usersMapper; @Value("${perLoc.url}") @@ -489,11 +489,16 @@ public class UsersServiceImpl implements UsersService { return usersMapper.getUsersInfo(pd); } + public PageData countAllByArea(PageData pd) throws Exception{ + return usersMapper.countAllByArea(pd); + } + @Override - public PageData getPersonByCardNo(PageData pd) { + public PageData getPersonByCardNo(PageData pd) throws Exception{ return usersMapper.getPersonByCardNo(pd); } + @Override public PageData findByCardNo(PageData pd) { return usersMapper.findByCardNo(pd); diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index c27e1eb4..2121cf7b 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -47,8 +47,8 @@ public class Const { public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码 public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址 - public static final String HTTPFILEURL = "https://skqhdg.porthebei.com:9004/file/"; //文件服务器地址 -// public static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/"; + // TODO 体系文件下载地址 + public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址 public final static String APPID = "wx9199de454d31b016"; public final static String SECRET = "183cdcac380e1f98f00c793491e27d88"; public static final String XCX_MCH_ID = "1607757714"; @@ -61,4 +61,6 @@ public class Const { public static final String topic_eightWork="eightWork"; public static final String topic_info="info"; + public static final String USER_CITY_CODE = "SESSION_USER_CITY_CODE"; + public static final String USER_CITY_NAME = "SESSION_USER_CITY_NAME"; } diff --git a/src/main/java/com/zcloud/util/PerLocUtil.java b/src/main/java/com/zcloud/util/CzksPerLocUtil.java similarity index 86% rename from src/main/java/com/zcloud/util/PerLocUtil.java rename to src/main/java/com/zcloud/util/CzksPerLocUtil.java index a3cf17e8..0414b2a1 100644 --- a/src/main/java/com/zcloud/util/PerLocUtil.java +++ b/src/main/java/com/zcloud/util/CzksPerLocUtil.java @@ -1,22 +1,21 @@ package com.zcloud.util; import com.alibaba.fastjson.JSONObject; -import com.zcloud.mapper.datasource.map.PersonLocationTokenMapper; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.Resource; - /** * 人员定位系统工具类 * @author zhangyue * @date 2023/9/20/020 17:33 */ @Component -public class PerLocUtil { +public class CzksPerLocUtil { // @Value("${perLoc.url}") - public static String perLocUrl = "http://172.16.130.86/gateway-service"; + // 线上地址 +// public static String perLocUrl = "http://172.16.130.86/gateway-service"; + // 线上外网映射 + public static String perLocUrl = "http://221.195.199.13:7811/gateway-service"; // @Value("${perLoc.userName}") // private String userName; // @Value("${perLoc.pwd}") @@ -27,12 +26,9 @@ public class PerLocUtil { private static String code = "1"; // token private static String perLocToken = ""; + public static String CameraHlsUrl = "http://221.195.199.13:7811"; - - @Resource - private PersonLocationTokenMapper personLocationTokenMapper; - public static String getToken(){ // token 不为空。验证token是否失效 if (Tools.notEmpty(perLocToken)) { @@ -67,7 +63,6 @@ public class PerLocUtil { if(Tools.notEmpty(loginResStr) && loginResponse != null && loginResponse.get("code") != null && loginResponse.getInteger("code") == 200 && loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){ -// personLocationTokenMapper.edit(loginResponse.getJSONObject("data").getString("access_token")); return loginResponse.getJSONObject("data").getString("token"); } else { // 登录失败 throw new RuntimeException("人员定位第三方登录失败"); diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index 571711cf..bef4572a 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -6,10 +6,7 @@ import org.springframework.lang.Nullable; import javax.servlet.http.HttpServletRequest; import java.io.*; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; +import java.net.*; import java.util.HashMap; /** @@ -206,6 +203,7 @@ public class HttpRequestUtil { InputStream is = null; BufferedReader br = null; try { + CookieHandler.setDefault(new CookieManager(null, CookiePolicy.ACCEPT_ALL)); //创建连接对象 URL url = new URL(httpUrl); //创建连接 @@ -379,7 +377,7 @@ public class HttpRequestUtil { BufferedReader br = null; try { //创建连接对象 - URL url = new URL(PerLocUtil.perLocUrl + httpUrl); + URL url = new URL(CzksPerLocUtil.perLocUrl + httpUrl); //创建连接 connection = (HttpURLConnection) url.openConnection(); //设置请求方法 @@ -398,7 +396,97 @@ public class HttpRequestUtil { // connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); // 必须添加token - connection.setRequestProperty("Authorization", PerLocUtil.getToken()); + connection.setRequestProperty("Authorization", CzksPerLocUtil.getToken()); + //拼装参数 + if (null != param && !param.equals("")) { + //设置参数 + os = connection.getOutputStream(); + //拼装参数 + os.write(param.getBytes()); + } + //设置权限 + //设置请求头等 + //开启连接 + //connection.connect(); + //读取响应 + if (connection.getResponseCode() == 200) { + is = connection.getInputStream(); + if (null != is) { + br = new BufferedReader(new InputStreamReader(is, "UTF-8")); + String temp = null; + while (null != (temp = br.readLine())) { + result.append(temp); + result.append("\r\n"); + } + } + } + + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + //关闭连接 + if (br != null) { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (os != null) { + try { + os.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + //关闭连接 + connection.disconnect(); + } + ReturnMap returnMap = new ReturnMap(); + if (Tools.notEmpty(result.toString())) { + HashMap o = JSON.parseObject(result.toString(), HashMap.class); + returnMap.putAll(o); + } + return returnMap; + } + public static ReturnMap getCameraHlsPathApi(String httpUrl, String param) { + StringBuffer result = new StringBuffer(); + //连接 + HttpURLConnection connection = null; + OutputStream os = null; + InputStream is = null; + BufferedReader br = null; + try { + //创建连接对象 + URL url = new URL(CzksPerLocUtil.CameraHlsUrl + httpUrl); + //创建连接 + connection = (HttpURLConnection) url.openConnection(); + //设置请求方法 + connection.setRequestMethod("POST"); + //设置连接超时时间 + connection.setConnectTimeout(15000); + //设置读取超时时间 + connection.setReadTimeout(15000); + //DoOutput设置是否向httpUrlConnection输出，DoInput设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个 + //设置是否可读取 + connection.setDoOutput(true); + connection.setDoInput(true); + //设置通用的请求属性 +// connection.setRequestProperty("accept", "*/*"); +// connection.setRequestProperty("connection", "Keep-Alive"); +// connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); + connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); + // 必须添加token + connection.setRequestProperty("Authorization", CzksPerLocUtil.getToken()); //拼装参数 if (null != param && !param.equals("")) { //设置参数 diff --git a/src/main/java/com/zcloud/util/Jurisdiction.java b/src/main/java/com/zcloud/util/Jurisdiction.java index 038022c9..85064bbd 100644 --- a/src/main/java/com/zcloud/util/Jurisdiction.java +++ b/src/main/java/com/zcloud/util/Jurisdiction.java @@ -105,4 +105,11 @@ public class Jurisdiction { } return pd; } + + /** USER_CITY_CODE + * @return + */ + public static String getUserCityCode(){ + return getSession().getAttribute(Const.USER_CITY_CODE).toString(); + } } diff --git a/src/main/java/com/zcloud/util/ReturnMap.java b/src/main/java/com/zcloud/util/ReturnMap.java index 78268d59..5079a642 100644 --- a/src/main/java/com/zcloud/util/ReturnMap.java +++ b/src/main/java/com/zcloud/util/ReturnMap.java @@ -1,6 +1,7 @@ package com.zcloud.util; +import com.zcloud.util.examUntil.CodeMessageEnum; import org.apache.http.HttpStatus; import java.util.HashMap; import java.util.Map; @@ -42,7 +43,9 @@ public class ReturnMap extends HashMap { return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); } - + public static ReturnMap error(CodeMessageEnum codeMessageEnum, String url) { + return error(codeMessageEnum.getCode(),codeMessageEnum.getMessage(), url); + } /** * 原先R的code和msg被覆盖 * diff --git a/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java new file mode 100644 index 00000000..c9b8a278 --- /dev/null +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java @@ -0,0 +1,35 @@ +package com.zcloud.util.czksBiMapFactory; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; +import com.zcloud.service.fireresources.CzksFireResourcesService; +import org.springframework.beans.factory.InitializingBean; + +import javax.annotation.Resource; +import java.util.LinkedList; + +/** + * 说明：消防资源添加数据抽象类 + * @author dearLin + */ +public abstract class AbsCzksFireSourcesHandel implements InitializingBean { + + + @Resource + public CzksFireResourcesMapper czksfireResourcesMapper; + @Resource + public CzksFireResourcesService fireResourcesService; + + + // 组装数据 + /** + * @Description: 组装数据 方法 + * @Author: dearLin + * @Date: 2023/9/20/020 14:42 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + public LinkedList assemblyDataHandel(PageData pageData) throws Exception{ + throw new UnsupportedOperationException(); + } +} diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssembleControlRoomHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleControlRoomHandel.java similarity index 75% rename from src/main/java/com/zcloud/util/biMapFactory/AssembleControlRoomHandel.java rename to src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleControlRoomHandel.java index 17ba4202..46c24b10 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssembleControlRoomHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleControlRoomHandel.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.LinkedList; * 官网：www.zcloudchina.com */ @Component -public class AssembleControlRoomHandel extends AbsFireSourcesHandel { +public class CzksAssembleControlRoomHandel extends AbsCzksFireSourcesHandel { /** @@ -27,11 +27,11 @@ public class AssembleControlRoomHandel extends AbsFireSourcesHandel { */ @Override public LinkedList assemblyDataHandel(PageData pageData) throws Exception { - return fireResourcesMapper.getControlRoomDataList(pageData); + return czksfireResourcesMapper.getControlRoomDataList(pageData); } @Override public void afterPropertiesSet() throws Exception { - AssemblyBeanFactory.register("xfkzs01", this); + CzksAssemblyBeanFactory.register("xfkzs01", this); } } diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssemblePointSourceHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePointSourceHandel.java similarity index 76% rename from src/main/java/com/zcloud/util/biMapFactory/AssemblePointSourceHandel.java rename to src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePointSourceHandel.java index f4486e6b..8d877bde 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssemblePointSourceHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePointSourceHandel.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.LinkedList; * 官网：www.zcloudchina.com */ @Component -public class AssemblePointSourceHandel extends AbsFireSourcesHandel { +public class CzksAssemblePointSourceHandel extends AbsCzksFireSourcesHandel { /** @@ -30,11 +30,11 @@ public class AssemblePointSourceHandel extends AbsFireSourcesHandel { public LinkedList assemblyDataHandel(PageData pageData) throws Exception { // 自己的业务 - return fireResourcesMapper.getPointDataList(pageData); + return czksfireResourcesMapper.getPointDataList(pageData); } @Override public void afterPropertiesSet() throws Exception { - AssemblyBeanFactory.register("point", this); + CzksAssemblyBeanFactory.register("point", this); } } diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssemblePumpRoomHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePumpRoomHandel.java similarity index 76% rename from src/main/java/com/zcloud/util/biMapFactory/AssemblePumpRoomHandel.java rename to src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePumpRoomHandel.java index 05f782a6..abea417e 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssemblePumpRoomHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblePumpRoomHandel.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.LinkedList; * 官网：www.zcloudchina.com */ @Component -public class AssemblePumpRoomHandel extends AbsFireSourcesHandel { +public class CzksAssemblePumpRoomHandel extends AbsCzksFireSourcesHandel { /** @@ -28,11 +28,11 @@ public class AssemblePumpRoomHandel extends AbsFireSourcesHandel { @Override public LinkedList assemblyDataHandel(PageData pageData) throws Exception { // 自己的业务 - return fireResourcesMapper.getPumpRoomDataList(pageData); + return czksfireResourcesMapper.getPumpRoomDataList(pageData); } @Override public void afterPropertiesSet() throws Exception { - AssemblyBeanFactory.register("xfbf01", this); + CzksAssemblyBeanFactory.register("xfbf01", this); } } diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssembleRescueTeamHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleRescueTeamHandel.java similarity index 76% rename from src/main/java/com/zcloud/util/biMapFactory/AssembleRescueTeamHandel.java rename to src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleRescueTeamHandel.java index 0e335964..cdbf9db4 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssembleRescueTeamHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleRescueTeamHandel.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.LinkedList; * 官网：www.zcloudchina.com */ @Component -public class AssembleRescueTeamHandel extends AbsFireSourcesHandel { +public class CzksAssembleRescueTeamHandel extends AbsCzksFireSourcesHandel { /** * @Description: 消防救援队 @@ -28,11 +28,11 @@ public class AssembleRescueTeamHandel extends AbsFireSourcesHandel { public LinkedList assemblyDataHandel(PageData pageData) throws Exception { pageData.put("CORPINFO_ID",null); // 自己的业务 - return fireResourcesMapper.getRescueTeamDataList(pageData); + return czksfireResourcesMapper.getRescueTeamDataList(pageData); } @Override public void afterPropertiesSet() throws Exception { - AssemblyBeanFactory.register("xfjyd01", this); + CzksAssemblyBeanFactory.register("xfjyd01", this); } } diff --git a/src/main/java/com/zcloud/util/biMapFactory/AssembleWaterSourceHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleWaterSourceHandel.java similarity index 75% rename from src/main/java/com/zcloud/util/biMapFactory/AssembleWaterSourceHandel.java rename to src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleWaterSourceHandel.java index 99596797..2db76210 100644 --- a/src/main/java/com/zcloud/util/biMapFactory/AssembleWaterSourceHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssembleWaterSourceHandel.java @@ -1,4 +1,4 @@ -package com.zcloud.util.biMapFactory; +package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.LinkedList; * 官网：www.zcloudchina.com */ @Component -public class AssembleWaterSourceHandel extends AbsFireSourcesHandel { +public class CzksAssembleWaterSourceHandel extends AbsCzksFireSourcesHandel { /** @@ -28,11 +28,11 @@ public class AssembleWaterSourceHandel extends AbsFireSourcesHandel { @Override public LinkedList assemblyDataHandel(PageData pageData) throws Exception { // 自己的业务 - return fireResourcesMapper.getWaterSourceDataList(pageData); + return czksfireResourcesMapper.getWaterSourceDataList(pageData); } @Override public void afterPropertiesSet() throws Exception { - AssemblyBeanFactory.register("xfsy01", this); + CzksAssemblyBeanFactory.register("xfsy01", this); } } diff --git a/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblyBeanFactory.java b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblyBeanFactory.java new file mode 100644 index 00000000..0dcaa992 --- /dev/null +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/CzksAssemblyBeanFactory.java @@ -0,0 +1,42 @@ +package com.zcloud.util.czksBiMapFactory; + +import org.apache.commons.lang.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public class CzksAssemblyBeanFactory { + + private static Map strategyMap = new HashMap<>(); + + /** + * @Description: 获取组装数据工厂类 + * xfsy01 消防水源 + * xfbf01 消防泵房 + * xfjyd01 防救援队 + * xfkzs01 消防控制室 + */ + public static AbsCzksFireSourcesHandel getInvokeStrategy(String type) { + return strategyMap.get(type); + } + + /** + * @Description: 注册组装数据工厂类 + * xfsy01 消防水源 + * xfbf01 消防泵房 + * xfjyd01 防救援队 + * xfkzs01 消防控制室 + */ + public static void register(String type, AbsCzksFireSourcesHandel handler) { + if (StringUtils.isEmpty(type) && handler == null) { + return; + } + strategyMap.put(type, handler); + } + +} diff --git a/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java b/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java new file mode 100644 index 00000000..5b28ac67 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java @@ -0,0 +1,18 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +/** + * @desc 对象返回到前端以及异常抛出的接口类 + */ +public interface BaseResultInterface { + + + String getCode(); + + + String getMessage(); +} diff --git a/src/main/java/com/zcloud/util/examUntil/BizException.java b/src/main/java/com/zcloud/util/examUntil/BizException.java new file mode 100644 index 00000000..795390b9 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/BizException.java @@ -0,0 +1,84 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + +public class BizException extends RuntimeException implements BaseResultInterface { + + private static final long serialVersionUID = 1L; + + + /** + * 错误码 + */ + private String code; + + /** + * 错误信息 + */ + private String message; + + public BizException() { + super(); + } + + public BizException(CodeMessageEnum codeMessageEnum) { + super(codeMessageEnum.getCode(),new Throwable()); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage(); + } + + public BizException(CodeMessageEnum codeMessageEnum, Throwable cause) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage(); + } + public BizException (CodeMessageEnum codeMessageEnum, Throwable cause,String details) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage() + details; + } + public BizException(CodeMessageEnum codeMessageEnum, String message, Throwable cause) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = message; + } + + public BizException(String message) { + super(message); + this.message = message; + } + + public BizException(String code, String message) { + super(code); + this.code = code; + this.message = message; + } + + public BizException(String code, String message, Throwable cause) { + super(code, cause); + this.code = code; + this.message = message; + } + + @Override + public Throwable fillInStackTrace() { + return this; + } + + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } +} + + diff --git a/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java b/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java new file mode 100644 index 00000000..2ac51a53 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java @@ -0,0 +1,197 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public enum CodeMessageEnum implements BaseResultInterface { + + /** ********* 0000成功 *************** */ + SUCCESS("0000", "成功!"), + SUCCESS_LOGIN("0001", "用户登录成功"), + SUCCESS_LOGOUT("0002", "用户退出成功"), + + /* 默认失败 */ + COMMON_FAIL("999", "失败"), + + /** ********* 1xxx系统错误 *************** */ + SERVER_BUSY("1001", "服务器正忙，请稍后再试!"), + INTERNAL_SERVER_ERROR("1002", "服务器内部错误"), + NOT_FOUND("1003", "未找到该资源!"), + REQUEST_METHOD_ERROR("1004", "接口请求方法异常"), + SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"), + NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"), + INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"), + PARSE_TOKEN_EXCEPTION("1008", "解析token异常"), + TOKEN_NOT_EXIST("1009", "token不存在"), + TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"), + TOKEN_EXPIRE("1011", "token过期，请重新登录"), + IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"), + NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"), + UPLOAD_FILE_ERROR("1014", "文件上传失败"), + FILE_NOT_EXIST("1015", "文件不存在"), + FILE_HAS_DELETED("1016", "文件已被删除"), + DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."), + TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"), + CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"), + DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"), + CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"), + DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."), + CREATE_DATABASE_ERROR("1023", "创建数据库失败"), + CREATE_TABLE_ERROR("1024", "创建表失败"), + UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"), + DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"), + QUERY_ROLE_ERROR("1027", "查询角色失败"), + UPDATE_GROUP_ERROR("1028", "更新接口组失败"), + DELETE_GROUP_ERROR("1029", "删除接口组失败"), + SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"), + + /** + * ******2xxx参数错误 ********************* + */ + BODY_NOT_MATCH("2001", "请求的数据格式不符"), + SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"), + REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"), + NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"), + NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"), + NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"), + NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"), + NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"), + SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"), + TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"), + FILE_PICTURE_IS_NULL("2011", "附件不存在"), + FILE_PICTURE_DELETE("2012", "删除附件失败"), + DIC_BIANMA_REPEAT("2013", "字典编码重复"), + + + + + + /** *********** 3xxx用户错误 ******************* */ + USER_NOT_LOGIN("3001", "用户未登录"), + USER_ACCOUNT_EXPIRED("3002", "账号已过期"), + USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"), + USER_CREDENTIALS_EXPIRED("3004", "密码过期"), + USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"), + USER_ACCOUNT_LOCKED("3006", "账号被锁定"), + USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"), + USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"), + USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"), + USER_NO_PERMISSION("3010", "当前账号没有此权限"), + USERNAME_NOT_BLANK("3011", "用户不能为空"), + USER_LOGIN_ERROR("3012", "用户登录失败"), + USER_LOGOUT_ERROR("3013", "用户退出失败"), + USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"), + USER_ACCESS_DENIED("3015", "权限认证失败"), + USERNAME_EXIST_ERROR("3016", "用户名重名"), + + ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"), + + /** ********** 4xxx业务错误 *********************** */ + ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"), + APP_KEY_EXIST("4002", "应用key已存在"), + APP_NOT_EXIST("4003", "应用不存在"), + APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"), + APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"), + APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"), + APP_PAGE_TYPE_ERROR("4007", "页面类型有误"), + APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"), + CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"), + DELETE_PAGE_ERROR("4010", "删除页面失败"), + CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"), + APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"), + DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"), + DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"), + DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"), + MODEL_NOT_EXIST("4016", "当前模型不存在"), + MODEL_HAS_DELETED("4017", "当前模型已删除"), + MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"), + DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"), + DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"), + DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"), + DEPT_USER_EXIST("4022", "部门下存在用户"), + NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"), + MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"), + MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"), + MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"), + FORM_NOT_EXIST("4027", "模型表单不存在"), + READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"), + MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"), + NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"), + APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"), + DELETE_COLUMN_ERROR("4032", "删除当前失败"), + INSERT_DATA_ERROR("4033", "新建数据失败"), + EDIT_DATA_ERROR("4034", "编辑数据失败"), + DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"), + NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"), + PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"), + AMIS_PAGE_ERROR("4038", "分页参数异常"), + QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"), + REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"), + STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"), + APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"), + APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"), + APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"), + NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"), + NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"), + CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"), + CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"), + APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"), + UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"), + DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"), + INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"), + DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"), + CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"), + CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"), + NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"), + JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"), + NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"), + NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"), + FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."), + APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"), + APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"), + TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"), + TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"), + TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"), + TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"), + CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"), + NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"), + APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"), + DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在") + ; + + CodeMessageEnum(String code, String message) { + this.code = code; + this.message = message; + } + + /** 返回到前端的code值 */ + private String code; + + /** 返回到前端的code对应的message值 */ + private String message; + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } + +// public static CodeVo getJsonObjectByCode(String code) { +// CodeVo codeVo = new CodeVo(); +// if (Tools.isEmpty(code)) { +// return codeVo; +// } +// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) { +// if (enumObj.getCode().equals(code)) { +// return new CodeVo(code, enumObj.message); +// } +// } +// return codeVo; +// } +} diff --git a/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java b/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java new file mode 100644 index 00000000..6489d786 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java @@ -0,0 +1,14 @@ +package com.zcloud.util.examUntil; + +import java.lang.annotation.*; + +/** + * @Description: 异常拦截接口 + * @Author: dearLin + * @Date: 2023/3/8 + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ErrorOperation { +} diff --git a/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java b/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java new file mode 100644 index 00000000..138f443f --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java @@ -0,0 +1,94 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + + +import com.zcloud.util.ReturnMap; +import org.mybatis.spring.MyBatisSystemException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; + +import static com.zcloud.util.examUntil.CodeMessageEnum.SERVER_BUSY; + + +/** + * 全局异常 + */ +@RestControllerAdvice(annotations = {ErrorOperation.class}) +//@Slf4j +public class GlobalExceptionHandler { + + /** + * 业务异常类 + * + */ + @ExceptionHandler(value = BizException.class) + @ResponseBody + public ReturnMap bizExceptionHandler(HttpServletRequest req, BizException e) { + e.printStackTrace(); +// log.error("发生业务异常: {}, 请求接口: {}", e.getMessage(), req.getRequestURI()); + return ReturnMap.error("2001" ,e.getMessage(), req.getRequestURI()); + } + + + /** + * 空指针异常 + * + * @param e 异常信息 + * @param req 请求 + */ + @ExceptionHandler(value = NullPointerException.class) + @ResponseBody + public ReturnMap exceptionHandler(HttpServletRequest req, NullPointerException e) { + e.printStackTrace(); +// log.error("空指针异常信息: {}, 请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + /** + * 接口请求方法异常 + * + */ + @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class) + @ResponseBody + public ReturnMap methodNotSupportedExceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("请求方法异常信息: {}，请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + /** + * SQL 语法错误异常 + */ + @ExceptionHandler(value = MyBatisSystemException.class) + @ResponseBody + public ReturnMap sqlSyntaxErrorExceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("MyBatis系统异常信息: {}，请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + + + /** + * 其他异常信息 + * + * @param req + * @param e + */ + @ExceptionHandler(value = Exception.class) + @ResponseBody + public ReturnMap exceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("未知异常: {}, 请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } +} diff --git a/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java b/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java new file mode 100644 index 00000000..fcae61ef --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java @@ -0,0 +1,54 @@ +package com.zcloud.util.examUntil; + +import org.apache.commons.lang.StringUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +/** + * 说明：获取请求参数工具类 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public class HttpContextUtils { + public static HttpServletRequest getHttpServletRequest() { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if(requestAttributes == null){ + return null; + } + + return ((ServletRequestAttributes) requestAttributes).getRequest(); + } + + public static Map getParameterMap(HttpServletRequest request) { + Enumeration parameters = request.getParameterNames(); + + Map params = new HashMap<>(); + while (parameters.hasMoreElements()) { + String parameter = parameters.nextElement(); + String value = request.getParameter(parameter); + if (StringUtils.isNotBlank(value)) { + params.put(parameter, value); + } + } + + return params; + } + + public static String getDomain(){ + HttpServletRequest request = getHttpServletRequest(); + StringBuffer url = request.getRequestURL(); + return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString(); + } + + public static String getOrigin(){ + HttpServletRequest request = getHttpServletRequest(); + return request.getHeader(HttpHeaders.ORIGIN); + } +} diff --git a/src/main/java/com/zcloud/util/hk/HKUtil.java b/src/main/java/com/zcloud/util/hk/HKUtil.java index 2a3c53a7..68c76148 100644 --- a/src/main/java/com/zcloud/util/hk/HKUtil.java +++ b/src/main/java/com/zcloud/util/hk/HKUtil.java @@ -14,8 +14,9 @@ import java.util.Map; */ public class HKUtil { static { - // 代理API网关nginx服务器ip端口 - ArtemisConfig.host = "172.17.100.1:443"; + // 代理API网关nginx服务器ip端口 线上 + ArtemisConfig.host = "172.17.100.1:443"; +// ArtemisConfig.host = "221.195.199.13:7811"; // 秘钥appkey ArtemisConfig.appKey = "29806794"; // 秘钥appSecret diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index b25d48d6..b22d959d 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -69,9 +69,9 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.110.184:9876 +rocketmq.name-server=39.101.130.96:9876 rocketmq.producer.group=libmiddle -rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.send-message-timeout=300000 rocketmq.producer.compress-message-body-threshold=4096 rocketmq.producer.max-message-size=4194304 rocketmq.producer.retry-times-when-send-failed=3 @@ -92,9 +92,10 @@ mq.group.docking=scheduled_tasks_docking perLoc.url=http://172.16.130.86/gateway-service perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ -corp.default.pic-path=https://qgqy.qhdsafety.com/ -corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://wwag.qhdsafety.com/file/ +corp.default.back-end-path=https://wwag.qhdsafety.com/file/ -http.file.url=https://qgqy.qhdsafety.com/file/ +http.file.url=https://wwag.qhdsafety.com/file/ #???????????? baseimgpath =https://wwag.qhdsafety.com/file/ +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 2f3625a9..704587f0 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -1,11 +1,13 @@ + + datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.247:3306/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=Mysql@zcloud88888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.247:3306/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=Mysql@zcloud88888 #druid??? @@ -73,13 +75,6 @@ smb.user=root smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/qgfile/file/ # 沧州矿石用户标识 -czks-useridentity=CZKS -czks-baseimgpath=https://qgqy.qhdsafety.com/file/ -czks-backendaddr=http://192.168.0.79:8091/ -# 港务局用户标识 -gwj-useridentity=GWJ -gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ -gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit @@ -111,6 +106,4 @@ perLoc.pwd=Cfd2023@ mq.topic.docking=docking mq.group.docking=scheduled_tasks_docking -base.info.USER_IDENTITY=GWJ -base.info.baseImgPath=https://qgqy.qhdsafety.com/file/ -base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/ +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index 6d3e7a79..3aaeed88 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -1,13 +1,11 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 - - +datasource.no1.password=Zcloud@888888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.password=Zcloud@888888 #druid??? spring.datasource.type: com.alibaba.druid.pool.DruidDataSource @@ -52,24 +50,18 @@ spring.http.encoding.enabled=true # ??springboot????banner spring.main.banner-mode=off +#???????????? preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ -#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ -#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ -#????? smb.host=39.101.130.96 smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/wwag/file/ -#Mq\u914D\u7F6E -rocketmq.consumer.group2=edu-admin-edit -rocketmq.consumer.group1=edu-admin-add -#rocketmq.name-server=10.0.140.141:9876 -#rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=39.101.130.96:9876 +#mq??????????? +rocketmq.name-server=172.16.130.91:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=300000 rocketmq.producer.compress-message-body-threshold=4096 @@ -77,24 +69,29 @@ rocketmq.producer.max-message-size=4194304 rocketmq.producer.retry-times-when-send-failed=3 rocketmq.producer.retry-next-server=true rocketmq.producer.retry-times-when-send-async-failed=3 -## topic \u524D\u7F00 +## topic ???? mq.topic.info=info mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -#???? +# topic ???? mq.topic.docking=docking mq.topic.dockingPicture=dockingPicture mq.group.docking=scheduled_tasks_docking +#???? ?????? perLoc.url=http://172.16.130.86/gateway-service perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ + +#????? ?????? corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ -http.file.url=https://qgqy.qhdsafety.com/file/ -#???????????? -baseimgpath =https://wwag.qhdsafety.com/file/ +#?????? +http.file.url=http://172.16.130.91:9004/file/ +#?????? +baseimgpath =http://172.16.130.91:9004/file/ +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e819eccf..b385417c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,9 +4,9 @@ server.port=8091 #?? #spring.profiles.active=local #����31ʱʹ�� -#spring.profiles.active=dev +spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 305f27b4..5691534e 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -435,6 +435,235 @@ (select count(1) from bus_units r where r.CORPINFO_ID = #{CORPINFO_ID} and r.ISDELETE = 0) as units_num, (select count(1) from BUS_SPECIALEQUIPMENT r where r.CORPINFO_ID = #{CORPINFO_ID} and r.ISDELETE = 0) as equipment_num + + + + diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index cec373b0..70d03b9d 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -2937,7 +2937,17 @@ group by f.HIDDEN_ID order by f.CREATTIME desc,f.STATE + 0 asc - + + INSERT INTO bus_hidden_emis( HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR, CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE, diff --git a/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml b/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml index cfbd707a..ea3fb06e 100644 --- a/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml @@ -297,6 +297,9 @@ left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_identificationparts id on id.IDENTIFICATIONPARTS_ID = f.IDENTIFICATION_ID where f.ISDELETE = '0' + + and f.CORPINFO_ID = #{CORPINFO_ID} + and f.IDENTIFICATION_ID=#{CHECK_IDENTIFICATION_ID} diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml new file mode 100644 index 00000000..be62d84b --- /dev/null +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml new file mode 100644 index 00000000..ff526cc1 --- /dev/null +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -0,0 +1,3399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml index 9cd9898c..8cc7722d 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml @@ -64,15 +64,14 @@ cl.FIRE_CHECK_STANDARD_NAME, cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID, IFNULL( FINISHED, 0 ) FINISHED, - d.`NAME` AS DEPARTMENTNAME, + od.`NAME` AS DEPARTMENTNAME, su.`NAME` AS USERNAME, cl.STATE, sys_dictionaries.`NAME` AS FIRE_CHECK_TYPE, cl.FIRE_CHECK_ID, ifnull(tt.CHECK_NUM,0) CHECK_NUM FROM - bus_fire_checklist AS cl - left JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID + bus_fire_checklist as cl LEFT JOIN ( SELECT FIRE_CHECK_ID, @@ -86,6 +85,8 @@ AND CORPINFO_ID = #{pd.CORPINFO_ID} GROUP BY FIRE_CHECK_ID,PERIODSTART,PERIODEND ) AS t ON cl.FIRE_CHECK_ID = t.FIRE_CHECK_ID LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID + left join oa_department od + on od.DEPARTMENT_ID = su.DEPARTMENT_ID LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA LEFT JOIN (SELECT FIRE_CHECK_ID, count(1) CHECK_NUM from bus_fire_record GROUP BY FIRE_CHECK_ID ) tt on cl.FIRE_CHECK_ID = tt.FIRE_CHECK_ID where cl.ISDELETE = 0 and cl.STATE != 2 diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateAreaMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateAreaMapper.xml new file mode 100644 index 00000000..7c209cb7 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateAreaMapper.xml @@ -0,0 +1,104 @@ + + + + mk_gate_area + + + f.GATE_AREA_ID, + f.GATE_AREA_NAME, + f.GATE_AREA_TYPE, + f.LATITUDE, + f.LONGITUDE, + f.CORPINFO_ID, + f.ISDELETE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME + + + INSERT INTO + ( + GATE_AREA_ID, + GATE_AREA_NAME, + GATE_AREA_TYPE, + LATITUDE, + LONGITUDE, + CORPINFO_ID, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME + ) + VALUES ( + #{GATE_AREA_ID}, + #{GATE_AREA_NAME}, + #{GATE_AREA_TYPE}, + #{LATITUDE}, + #{LONGITUDE}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME} + ) + + + + + update + + set + GATE_AREA_NAME = #{GATE_AREA_NAME}, + GATE_AREA_TYPE = #{GATE_AREA_TYPE}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + GATE_AREA_ID = #{GATE_AREA_ID} + + + update mk_gate_area + set ISDELETE = 1 + where GATE_AREA_ID in + + #{item} + + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml new file mode 100644 index 00000000..30963107 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml @@ -0,0 +1,166 @@ + + + + + INSERT INTO `qa-czks-prevention`.`work_mineral_io_record` + (RECORD_ID, + TRUCK_NO, + CAR_TEAM_NAME, + LRSJ, + JGSJ, + CGSJ, + LX, + GATE_MACHINE_ID, + PASS_TYPE, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{RECORD_ID}, + #{TRUCK_NO}, + #{CAR_TEAM_NAME}, + #{LRSJ}, + #{JGSJ}, + #{CGSJ}, + #{LX}, + #{GATE_MACHINE_ID}, + #{PASS_TYPE}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + INSERT INTO `qa-czks-prevention`.`work_grocery_io_record` + (RECORD_ID, + TRUCK_NO, + CAR_TEAM_NAME, + LRSJ, + JGSJ, + CGSJ, + LX, + GATE_MACHINE_ID, + PASS_TYPE, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{RECORD_ID}, + #{TRUCK_NO}, + #{CAR_TEAM_NAME}, + #{LRSJ}, + #{JGSJ}, + #{CGSJ}, + #{LX}, + #{GATE_MACHINE_ID}, + #{PASS_TYPE}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + + + update + + `qa-czks-prevention`.`work_grocery_io_record` f + + + `qa-czks-prevention`.`work_mineral_io_record` f + + set + TRUCK_NO=#{TRUCK_NO}, + CAR_TEAM_NAME=#{CAR_TEAM_NAME}, + LRSJ=#{LRSJ}, + JGSJ=#{JGSJ}, + CGSJ=#{CGSJ}, + LX=#{LX}, + PASS_TYPE=#{PASS_TYPE}, + ISDELETE=#{ISDELETE}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME} + where 1=1 + + and f.grocery_record_id=#{grocery_record_id} + + + and f.mineral_record_id=#{mineral_record_id} + + + + update + + `qa-czks-prevention`.`work_grocery_io_record` f + + + `qa-czks-prevention`.`work_mineral_io_record` f + + set ISDELETE = 1 + where 1=1 + + and f.grocery_record_id=#{grocery_record_id} + + + and f.mineral_record_id=#{mineral_record_id} + + + + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateMachineMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateMachineMapper.xml new file mode 100644 index 00000000..7f1dd7ec --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateMachineMapper.xml @@ -0,0 +1,333 @@ + + + + mk_gate_machine + + + f + . + GATE_MACHINE_ID + , + f.GATE_MACHINE_TYPE, + f.EQUIPMENTID, + f.GATE_MACHINE_MODEL, + f.GATE_MACHINE_NAME, + f.STATE, + f.DESCR, + f.LATITUDE, + f.LONGITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.REMAKE + + + INSERT INTO mk_gate_machine + ( + GATE_MACHINE_ID, + GATE_AREA_ID, + GATE_MACHINE_NAME, + GATE_MACHINE_TYPE, + EQUIPMENTID, + GATE_MACHINE_MODEL, + STATE, + DESCR, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{GATE_MACHINE_ID}, + #{GATE_AREA_ID}, + #{GATE_MACHINE_NAME}, + #{GATE_MACHINE_TYPE}, + #{EQUIPMENTID}, + #{GATE_MACHINE_MODEL}, + #{STATE}, + #{DESCR}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + + + + + + + + + + update + + set + GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE}, + GATE_MACHINE_MODEL = #{GATE_MACHINE_MODEL}, + GATE_MACHINE_NAME = #{GATE_MACHINE_NAME}, + STATE = #{STATE}, + DESCR = #{DESCR}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + REMAKE = #{REMAKE} + where + GATE_MACHINE_ID = #{GATE_MACHINE_ID} + + + + update mk_gate_machine + set ISDELETE = 1 + where GATE_MACHINE_ID in + + #{item} + + + + + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml new file mode 100644 index 00000000..28a963ef --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml @@ -0,0 +1,265 @@ + + + + + + + BUS_GATEVIDEO + + + + + SYS_DICTIONARIES + + + + + f.GATE_AREA_ID, + f.VIDEONAME, + f.OPDATE, + f.OPUSER, + f.ISDELETE, + f.CODE, + f.PLATFORMVIDEOMANAGEMENT_ID, + f.GATEVIDEO_ID, + f.LATITUDE, + f.LONGITUDE + + + + + GATE_AREA_ID, + VIDEONAME, + OPDATE, + OPUSER, + ISDELETE, + CODE, + PLATFORMVIDEOMANAGEMENT_ID, + GATEVIDEO_ID, + LATITUDE, + CORPINFO_ID, + LONGITUDE + + + + + #{GATE_AREA_ID}, + #{VIDEONAME}, + #{OPDATE}, + #{OPUSER}, + #{ISDELETE}, + #{CODE}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{GATEVIDEO_ID}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{LONGITUDE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + GATEVIDEO_ID = #{GATEVIDEO_ID} + + + + + update + + set + + GATE_AREA_ID = #{GATE_AREA_ID}, + + + VIDEONAME = #{VIDEONAME}, + + + PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID}, + + + CODE = #{CODE}, + + GATEVIDEO_ID = GATEVIDEO_ID + where + GATEVIDEO_ID = #{GATEVIDEO_ID} + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + GATEVIDEO_ID = #{GATEVIDEO_ID} + + + + update + + set CODE= #{CODE} + where + GATE_AREA_ID = #{GATE_AREA_ID} + + + update + + set CODE= #{CODE} + where + GATEVIDEO_ID = #{GATEVIDEO_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + GATEVIDEO_ID in + + #{item} + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index a87579fb..038b8435 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -275,6 +275,9 @@ and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%')) + + and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%')) + @@ -291,10 +294,10 @@ and f.STATE = #{pd.keyState} - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApplyUserName}),'%') and STATE = '11') - and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') + and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN vi_user_all u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12') diff --git a/src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml similarity index 90% rename from src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml rename to src/main/resources/mybatis/datasource/map/BiMapMapper.xml index 0c6b4109..d2c0d056 100644 --- a/src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml +++ b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml @@ -1,6 +1,6 @@ - + + SELECT count(*) AS count, + INSPECTION_SOURCE, + corp.CORPINFO_ID , + corp.CORP_NAME + + FROM + BUS_INSPECTION_SAFETYENVIRONMENTAL f + LEFT JOIN oa_department dept + on dept.DEPARTMENT_ID = f.INSPECTED_DEPARTMENT_ID + LEFT JOIN bus_corp_info corp on corp.CORPINFO_ID = dept.CORPINFO_ID + WHERE + f.ISDELETE = '0' + and corp.COR_ORDER is not null + and corp.COR_ORDER !='' + GROUP BY + INSPECTION_SOURCE, + dept.CORPINFO_ID + ORDER BY corp.COR_ORDER *1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml b/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml similarity index 97% rename from src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml rename to src/main/resources/mybatis/datasource/map/GateAreaMapper.xml index 7eb27693..ea5038e9 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml +++ b/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml @@ -1,6 +1,6 @@ - + mk_gate_area diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml b/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml similarity index 99% rename from src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml rename to src/main/resources/mybatis/datasource/map/GateMachineMapper.xml index 5c14e478..6aa1edae 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml +++ b/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml @@ -1,6 +1,6 @@ - + mk_gate_machine diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml similarity index 97% rename from src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml rename to src/main/resources/mybatis/datasource/map/GateVideoMapper.xml index 5f9afa21..0656150a 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml @@ -1,6 +1,6 @@ - + @@ -37,7 +37,6 @@ PLATFORMVIDEOMANAGEMENT_ID, GATEVIDEO_ID, LATITUDE, - CORPINFO_ID, LONGITUDE @@ -52,7 +51,6 @@ #{PLATFORMVIDEOMANAGEMENT_ID}, #{GATEVIDEO_ID}, #{LATITUDE}, - #{CORPINFO_ID}, #{LONGITUDE} @@ -245,6 +243,7 @@ SELECT GATEVIDEO_ID AS id, VIDEONAME AS `NAME`, + 'CAMERA' AS TYPE, v.LATITUDE, v.LONGITUDE FROM @@ -259,7 +258,6 @@ and o.CORPINFO_ID = #{CORPINFO_ID} - GROUP BY v.GATEVIDEO_ID diff --git a/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml similarity index 84% rename from src/main/resources/mybatis/datasource/bus/MapEightMapper.xml rename to src/main/resources/mybatis/datasource/map/MapEightMapper.xml index f2241220..2274ec23 100644 --- a/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -57,7 +57,7 @@ '0' hoistingCount, '0' electricityCount FROM - bus_hotworkapplication + bus_hotwork_cfd WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' @@ -207,10 +207,10 @@ SUM(f.COUNTAPPLY) COUNTAPPLY,SUM(f.COUNTAPPROVE) COUNTAPPROVE,SUM(f.COUNTARCHIVE) COUNTARCHIVE FROM ( SELECT - COUNT( CASE WHEN f.STATE > 0 THEN f.HOTWORKAPPLICATION_ID END ) COUNTAPPLY, - COUNT( CASE WHEN f.STATE > 0 AND f.STATE != 11 THEN f.HOTWORKAPPLICATION_ID END ) COUNTAPPROVE, - COUNT( CASE WHEN f.STATE = 11 THEN f.HOTWORKAPPLICATION_ID END ) COUNTARCHIVE - FROM bus_hotworkapplication f WHERE f.ISDELETE = '0' + COUNT( CASE WHEN f.APPLY_STATUS > 0 THEN f.HOTWORK_ID END ) COUNTAPPLY, + COUNT( CASE WHEN f.APPLY_STATUS > 0 AND f.APPLY_STATUS != 8 THEN f.HOTWORK_ID END ) COUNTAPPROVE, + COUNT( CASE WHEN f.APPLY_STATUS = 8 THEN f.HOTWORK_ID END ) COUNTARCHIVE + FROM bus_hotwork_cfd f WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} @@ -412,46 +412,88 @@ @@ -2065,11 +2107,13 @@ when 36 then '安委会办公室' when 37 then '安全总监审批' END STATUS_NAME, - IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,'')) USER_NAME, + IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, + DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME FROM bus_hotworkapplication f LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID + LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID LEFT JOIN `qa-czks-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 @@ -2420,10 +2464,10 @@ f.WORK_LONGITUDE LONGITUDE, f.WORK_LATITUDE LATITUDE, './bi/images/map/electricity.png' IMAGE_FILE, - f.CORPINFO_ID - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '5' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -2434,21 +2478,22 @@ - + + - + - + + + + + @@ -3004,6 +3068,7 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.SPECIAL_WORK, ad.NAME as APPLY_DEPARTMENT_NAME, getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL, @@ -3384,16 +3449,459 @@ #{item} - SELECT - * - FROM - ( - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS ELECTRICITY_WORK_USER_IDS FROM bus_electricity where APPLY_STATUS > 0 ) a, - ( SELECT DISTINCT GROUP_CONCAT( `PROJECT_MANAGER_IDS` SEPARATOR ',' ) AS HIGHWORK_WORK_USER_IDS FROM bus_highwork where APPLY_STATUS > 0 ) b, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS CONFINEDSPACE_WORK_USER_IDS FROM bus_confinedspace where APPLY_STATUS > 0 ) c, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS HOISTING_WORK_USER_IDS FROM bus_hoisting where APPLY_STATUS > 0 ) d, - ( SELECT DISTINCT GROUP_CONCAT( `WORK_USER_IDS` SEPARATOR ',' ) AS BLINDBOARD_WORK_USER_IDS FROM bus_blindboard where APPLY_STATUS > 0 ) e - ) + 'HOTWORK' TYPE, + f.HOTWORK_ID id, + CONCAT_WS("", '动火作业 编号：', f.CHECK_NO ) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/hotwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO, + f.CHECK_NO AS MAP_POINT_NAME + FROM bus_hotwork_cfd f + WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + AND f.APPLY_STATUS not in ('-99','8','-98','-2','-4','-5','-6','-7','-8') + + and f.CORPINFO_ID = #{CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{item} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml new file mode 100644 index 00000000..2107447c --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml index a23b026e..5e087711 100644 --- a/src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml +++ b/src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml @@ -1,12 +1,39 @@ - - - INSERT INTO - `qa-czks-prevention`.`mq_production_error_log` - (`PRODUCTION_ID`, `MARK`, `DATA`, `MESSAGE_LOG_ID`, `SUCCESS`, `CREATE_TIME`, `PRODUCTION_TIME`, `PRODUCTION_TYPE`, `ERROR_MESSAGE`) - VALUES (#{PRODUCTION_ID}, #{MARK}, #{DATA}, #{MESSAGE_LOG_ID}, #{SUCCESS}, #{CREATE_TIME}, #{PRODUCTION_TIME},#{PRODUCTION_TYPE}, #{ERROR_MESSAGE}) + + `qa-czks-prevention`.`mq_production_error_log` + + + PRODUCTION_ID, + MARK, + DATA, + MESSAGE_LOG_ID, + SUCCESS, + CREATE_TIME, + PRODUCTION_TIME, + PRODUCTION_TYPE, + ERROR_MESSAGE + + + #{PRODUCTION_ID}, + #{MARK}, + #{DATA}, + #{MESSAGE_LOG_ID}, + #{SUCCESS}, + #{CREATE_TIME}, + #{PRODUCTION_TIME}, + #{PRODUCTION_TYPE}, + #{ERROR_MESSAGE} + + + insert into + + ( + + ) values ( + + ) diff --git a/src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml index 8d499a23..499c8816 100644 --- a/src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml +++ b/src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml @@ -1,12 +1,38 @@ - - - INSERT INTO + `qa-czks-prevention`.`mq_production_log` - (`PRODUCTION_ID`, `MARK`, `DATA`, `MESSAGE_LOG_ID`, `SUCCESS`, `CREATE_TIME`, `PRODUCTION_TIME`, `PRODUCTION_TYPE`, `ERROR_MESSAGE`) - VALUES (#{PRODUCTION_ID}, #{MARK}, #{DATA}, #{MESSAGE_LOG_ID}, #{SUCCESS}, #{CREATE_TIME}, #{PRODUCTION_TIME},#{PRODUCTION_TYPE}, #{ERROR_MESSAGE}) + + + PRODUCTION_ID, + MARK, + DATA, + MESSAGE_LOG_ID, + SUCCESS, + CREATE_TIME, + PRODUCTION_TIME, + PRODUCTION_TYPE, + ERROR_MESSAGE + + + #{PRODUCTION_ID}, + #{MARK}, + #{DATA}, + #{MESSAGE_LOG_ID}, + #{SUCCESS}, + #{CREATE_TIME}, + #{PRODUCTION_TIME}, + #{PRODUCTION_TYPE}, + #{ERROR_MESSAGE} + + + insert into + + ( + + ) values ( + + ) - diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index afe6816c..5070802c 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -595,4 +595,39 @@ + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 8eb08704..fd38f590 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1361,4 +1361,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.ISDELETE = '0' AND s.cardNo = #{CARDNO} + + + + diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml new file mode 100644 index 00000000..93d7a71a --- /dev/null +++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml @@ -0,0 +1,475 @@ + + + + + + + bus_fireresources + + + + + FIRERESOURCES_ID, + FIRERESOURCES_NAME, + FIRERESOURCES_TYPE, + LONGTITUDE, + LATITUDE, + DESCR, + CREATIME, + OPERATIME, + ISDELETE, + CORPINFO_ID, + STATE + + + + + #{FIRERESOURCES_ID}, + #{FIRERESOURCES_NAME}, + #{FIRERESOURCES_TYPE}, + #{LONGTITUDE}, + #{LATITUDE}, + #{DESCR}, + #{CREATIME}, + #{OPERATIME}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{STATE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set ISDELETE = '1' + where + FIRERESOURCES_ID = #{FIRERESOURCES_ID} + + + + + update + + set + FIRERESOURCES_NAME = #{FIRERESOURCES_NAME}, + FIRERESOURCES_TYPE = #{FIRERESOURCES_TYPE}, + LONGTITUDE = #{LONGTITUDE}, + LATITUDE = #{LATITUDE}, + DESCR = #{DESCR}, + OPERATIME = #{OPERATIME}, + ISDELETE = #{ISDELETE}, + CORPINFO_ID = #{CORPINFO_ID}, + STATE = #{STATE} + where + FIRERESOURCES_ID = #{FIRERESOURCES_ID} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index d4054c1c..1d43324d 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -301,7 +301,8 @@ (SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT, vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, - p.`NAME` as UNITS_PIC_NAME + p.`NAME` as UNITS_PIC_NAME, + ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT from f left join bus_units b using (UNITS_ID) @@ -313,6 +314,9 @@ LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID from `qa-czks-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by c.OUTSOURCED_ID ) cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT + FROM + ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-czks-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID ) t GROUP BY t.OUTSOURCED_ID ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and diff --git a/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml b/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml new file mode 100644 index 00000000..bc12068c --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml @@ -0,0 +1,127 @@ + + + + + + + BUS_DATA_DOCKING_LOG + + + + + SYS_DICTIONARIES + + + + + f.DOCKING_MODULE, + f.DOCKING_TYPE, + f.DOCKING_TIME, + f.NUMBER, + f.BUS_DATA_DOCKING_ID + + + + + DOCKING_MODULE, + DOCKING_TYPE, + DOCKING_TIME, + NUMBER, + BUS_DATA_DOCKING_ID + + + + + #{DOCKING_MODULE}, + #{DOCKING_TYPE}, + #{DOCKING_TIME}, + #{NUMBER}, + #{BUS_DATA_DOCKING_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_DATA_DOCKING_ID = #{BUS_DATA_DOCKING_ID} + + + + + update + + set + DOCKING_MODULE = #{DOCKING_MODULE}, + DOCKING_TYPE = #{DOCKING_TYPE}, + DOCKING_TIME = #{DOCKING_TIME}, + NUMBER = #{NUMBER}, + BUS_DATA_DOCKING_ID = BUS_DATA_DOCKING_ID + where + BUS_DATA_DOCKING_ID = #{BUS_DATA_DOCKING_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_DATA_DOCKING_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/dsno2/fireresources/FireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/fireresources/FireResourcesMapper.xml rename to src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml index 4c0bdef0..3ebc468a 100644 --- a/src/main/resources/mybatis/dsno2/fireresources/FireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml new file mode 100644 index 00000000..e5467006 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml @@ -0,0 +1,521 @@ + + + + + + + BUS_METEOROLOGICAL + + + + + SYS_DICTIONARIES + + + + + f.OUTSOURCED_ID, + f.CORPINFO_ID, + f.EQUIPMENTNAME, + f.EQUIPMENTTYPE, + f.OPDATE, + f.OPUSER, + f.ISDELETE, + f.CODE, + f.PLATFORMMETEOROLOGICAL_ID, + f.METEOROLOGICAL_ID, + f.LATITUDE, + f.LONGITUDE, + f.TYPE + + + + + OUTSOURCED_ID, + CORPINFO_ID, + EQUIPMENTNAME, + EQUIPMENTTYPE, + OPDATE, + OPUSER, + ISDELETE, + CODE, + PLATFORMMETEOROLOGICAL_ID, + METEOROLOGICAL_ID, + LATITUDE, + LONGITUDE, + TYPE + + + + + #{OUTSOURCED_ID}, + #{CORPINFO_ID}, + #{EQUIPMENTNAME}, + #{EQUIPMENTTYPE}, + #{OPDATE}, + #{OPUSER}, + #{ISDELETE}, + #{CODE}, + #{PLATFORMMETEOROLOGICAL_ID}, + #{METEOROLOGICAL_ID}, + #{LATITUDE}, + #{LONGITUDE}, + #{TYPE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + update + + set + + OUTSOURCED_ID = #{OUTSOURCED_ID}, + + + EQUIPMENTNAME = #{EQUIPMENTNAME}, + + + EQUIPMENTTYPE = #{EQUIPMENTTYPE}, + + + CODE = #{CODE}, + + + TYPE = #{TYPE}, + + METEOROLOGICAL_ID = METEOROLOGICAL_ID + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + update + + set CODE= #{CODE} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + update + + set CODE= #{CODE} + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICAL_ID in + + #{item} + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml new file mode 100644 index 00000000..2cc7e90f --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml @@ -0,0 +1,514 @@ + + + + + + + BUS_METEOROLOGICALINFO + + + + + SYS_DICTIONARIES + + + + + f.CORPINFO_ID, + f.TEMPERATURE, + f.HUMIDITY, + f.WINDDIRECTION, + f.WINDSPEED, + f.ISDELETE, + f.OPERATTIME, + f.METEOROLOGICAL_ID, + f.METEOROLOGICALINFO_ID, + f.OPERATOR, + f.CODE + + + + + CORPINFO_ID, + TEMPERATURE, + HUMIDITY, + WINDDIRECTION, + WINDSPEED, + ISDELETE, + OPERATTIME, + METEOROLOGICAL_ID, + METEOROLOGICALINFO_ID, + OPERATOR, + CODE + + + + + #{CORPINFO_ID}, + #{TEMPERATURE}, + #{HUMIDITY}, + #{WINDDIRECTION}, + #{WINDSPEED}, + #{ISDELETE}, + #{OPERATTIME}, + #{METEOROLOGICAL_ID}, + #{METEOROLOGICALINFO_ID}, + #{OPERATOR}, + #{CODE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + update + + set + + TEMPERATURE = #{TEMPERATURE}, + + + HUMIDITY = #{HUMIDITY}, + + + WINDDIRECTION = #{WINDDIRECTION}, + + + WINDSPEED = #{WINDSPEED}, + + METEOROLOGICALINFO_ID = METEOROLOGICALINFO_ID + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + update + + set CODE= #{CODE} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + update + + set CODE= #{CODE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICALINFO_ID in + + #{item} + + + + + + + + + + + + + insert into ( + METEOROLOGICALINFO_ID, + METEOROLOGICAL_ID, + CORPINFO_ID, + TEMPERATURE, + HUMIDITY, + WINDDIRECTION, + WINDSPEED, + OPERATTIME, + OPERATOR, + ISDELETE + ) values + + ( + #{data.METEOROLOGICALINFO_ID}, + #{data.METEOROLOGICAL_ID}, + #{data.CORPINFO_ID}, + #{data.TEMPERATURE}, + #{data.HUMIDITY}, + #{data.WINDDIRECTION}, + #{data.WINDSPEED}, + #{data.OPERATTIME}, + #{data.OPERATOR}, + #{data.ISDELETE} + ) + + + + + update + + set + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID}, + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TEMPERATURE = #{TEMPERATURE}, + HUMIDITY = #{HUMIDITY}, + WINDDIRECTION = #{WINDDIRECTION}, + WINDSPEED = #{WINDSPEED}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ISDELETE = #{ISDELETE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml new file mode 100644 index 00000000..6e4c89c9 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml @@ -0,0 +1,243 @@ + + + + + + + BUS_PLATFORMELECTRONIC + + + + + SYS_DICTIONARIES + + + + + f.INDEXCODE, + f.REGIONINDEXCODE, + f.EXTERNALINDEXCODE, + f.NAME, + f.LONGITUDE, + f.LATITUDE, + f.CAMERATYPE, + f.CASCADECODE, + f.DECODETAG, + f.RESOURCETYPE, + f.CREATETIME, + f.UPDATETIME, + f.SORT, + f.DISORDER, + f.RECORDLOCATION, + f.CASCADETYPE, + f.REGIONNAME, + f.REGIONPATH, + f.REGIONPATHNAME, + f.PLATFORMELECTRONIC_ID, + f.FANGQU_IDS, + f.SUOSHUQUYU, + f.CORPINFO_ID + + + + + INDEXCODE, + REGIONINDEXCODE, + EXTERNALINDEXCODE, + NAME, + LONGITUDE, + LATITUDE, + CAMERATYPE, + CASCADECODE, + DECODETAG, + RESOURCETYPE, + CREATETIME, + UPDATETIME, + SORT, + DISORDER, + RECORDLOCATION, + CASCADETYPE, + REGIONNAME, + REGIONPATH, + REGIONPATHNAME, + PLATFORMELECTRONIC_ID, + FANGQU_IDS, + SUOSHUQUYU, + CORPINFO_ID + + + + + #{INDEXCODE}, + #{REGIONINDEXCODE}, + #{EXTERNALINDEXCODE}, + #{NAME}, + #{LONGITUDE}, + #{LATITUDE}, + #{CAMERATYPE}, + #{CASCADECODE}, + #{DECODETAG}, + #{RESOURCETYPE}, + #{CREATETIME}, + #{UPDATETIME}, + #{SORT}, + #{DISORDER}, + #{RECORDLOCATION}, + #{CASCADETYPE}, + #{REGIONNAME}, + #{REGIONPATH}, + #{REGIONPATHNAME}, + #{PLATFORMELECTRONIC_ID}, + #{FANGQU_IDS}, + #{SUOSHUQUYU}, + #{CORPINFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PLATFORMELECTRONIC_ID = #{PLATFORMELECTRONIC_ID} + + + + + update + + set + INDEXCODE = #{INDEXCODE}, + REGIONINDEXCODE = #{REGIONINDEXCODE}, + EXTERNALINDEXCODE = #{EXTERNALINDEXCODE}, + NAME = #{NAME}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CAMERATYPE = #{CAMERATYPE}, + CASCADECODE = #{CASCADECODE}, + DECODETAG = #{DECODETAG}, + RESOURCETYPE = #{RESOURCETYPE}, + CREATETIME = #{CREATETIME}, + UPDATETIME = #{UPDATETIME}, + SORT = #{SORT}, + DISORDER = #{DISORDER}, + RECORDLOCATION = #{RECORDLOCATION}, + CASCADETYPE = #{CASCADETYPE}, + REGIONNAME = #{REGIONNAME}, + REGIONPATH = #{REGIONPATH}, + REGIONPATHNAME = #{REGIONPATHNAME}, + FANGQU_IDS = #{FANGQU_IDS}, + SUOSHUQUYU = #{SUOSHUQUYU}, + CORPINFO_ID = #{CORPINFO_ID} + where + PLATFORMELECTRONIC_ID = #{PLATFORMELECTRONIC_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PLATFORMELECTRONIC_ID in + + #{item} + + + + + + + diff --git a/src/main/webapp/uploadFiles/czks/file/userExcelTemplate2.xls b/src/main/webapp/uploadFiles/czks/file/userExcelTemplate2.xls index 707f36eb..0bdf7b16 100644 Binary files a/src/main/webapp/uploadFiles/czks/file/userExcelTemplate2.xls and b/src/main/webapp/uploadFiles/czks/file/userExcelTemplate2.xls differ