diff --git a/pom.xml b/pom.xml index 177c358c..63b06864 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,11 @@ spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-data-redis + net.sf.ehcache diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java deleted file mode 100644 index 34e323f9..00000000 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java +++ /dev/null @@ -1,556 +0,0 @@ -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 deleted file mode 100644 index a6957fe7..00000000 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java +++ /dev/null @@ -1,187 +0,0 @@ -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 org.springframework.web.client.RestTemplate; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 说明：实时地图八项工作内容 - * 官网：www.zcloudchina.com - */ -@Controller -@RequestMapping("/czks/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); - //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - 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); - } - 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 deleted file mode 100644 index 8088ff7c..00000000 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java +++ /dev/null @@ -1,85 +0,0 @@ -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/gatemachine/GateMachineController.java b/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java index ba62b7bc..2d3b48f9 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java @@ -4,7 +4,6 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.gatemachine.GateMachineService; -import com.zcloud.util.Jurisdiction; import com.zcloud.util.ReturnMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -53,7 +52,6 @@ public class GateMachineController extends BaseController { @RequestMapping(value = "/add") public ReturnMap add() { PageData pageData = this.getPageData(); - pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); gateMachineService.save(pageData); return ReturnMap.ok(); } diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java index e906cf47..bd5b35f9 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java @@ -45,7 +45,6 @@ public class GateVideoController extends BaseController { pd.put("GATEVIDEO_ID", this.get32UUID()); //主键 pd.put("OPDATE", DateUtil.date2Str(new Date())); //操作日期 pd.put("OPUSER", Jurisdiction.getUsername()); //操作人 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人 pd.put("ISDELETE", "0"); //是否删除 gateVideoService.save(pd); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 9d482538..a0116d3e 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -3,29 +3,27 @@ package com.zcloud.controller.map; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper; import com.zcloud.service.bus.CorpInfoService; -import com.zcloud.service.fireresources.CzksFireResourcesService; +import com.zcloud.service.gatemachine.GateCarMachineInfoService; +import com.zcloud.service.gatemachine.GateMachineInfoService; import com.zcloud.service.gatemachine.GateMachineService; 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.map.MapService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; -import com.zcloud.util.Jurisdiction; +import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; -import org.apache.commons.lang.StringUtils; +import com.zcloud.util.hk.HKUtil; +import com.zcloud.util.ys.YSUtil; 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 java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -45,27 +43,12 @@ public class MapController extends BaseController { @Autowired private UsersService usersService; - @Autowired - private MeteorologicalinfoService meteorologicalinfoService; - @Autowired - private MeteorologicalService meteorologicalService; +// @Autowired +// private MeteorologicalinfoService meteorologicalinfoService; + @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 BiMapService biMapService; - @Autowired - private CzksFireResourcesService fireResourcesService; @Autowired private DepartmentService departmentService; @@ -74,515 +57,24 @@ public class MapController extends BaseController { private GateMachineService gateMachineService; @Autowired - private WeatherUtil weatherUtil; + private MapService mapService; - @ResponseBody - @RequestMapping("/getCorpInfo") - public Object getCorpInfo() throws Exception { - Map map = new HashMap(); - PageData condition = new PageData(); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + @Autowired + private YSUtil ysUtil; - 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; - } + @Autowired + private GateAreaMapper gateAreaMapper; - /** - * @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; - } + @Autowired + private GateMachineInfoService gateMachineInfoService; - /** - * @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; - } + @Autowired + private GateCarMachineInfoService gateCarMachineInfoService; - /** - * 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; - } - - @RequestMapping("/getPointQualifiedPhotos") - @ResponseBody - 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: 消防管控 - * @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(); - 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")); - } - 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; - } /** * 气象信息对接接口 @@ -590,13 +82,14 @@ public class MapController extends BaseController { * @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: 闸机设备在线情况 只有人车闸机 @@ -610,12 +103,6 @@ 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; @@ -633,21 +120,6 @@ 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 @@ -663,51 +135,107 @@ public class MapController extends BaseController { } /** - * @Description: 口门进出记录列表 + * @Description: 闸机位置 * @Author: dearLin * @Date: 2023/9/23/023 9:04 * @Param: * @Return: */ - @RequestMapping("/getDoorWayRecords") + @RequestMapping("/listGateMachine") @ResponseBody - public ReturnMap getDoorWayRecords(Page page) { + public ReturnMap listGateMachine() { 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; + List dataList = new ArrayList<>(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String fendDate = format.format(new Date()); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); // 将时设置为0 + calendar.set(Calendar.MINUTE, 0); // 将分设置为0 + calendar.set(Calendar.SECOND, 0); // 将秒设置为0 + calendar.set(Calendar.MILLISECOND, 0); // 将毫秒设置为0 + Date currDay = calendar.getTime(); + String fstartDate = format.format(currDay); + if (pageData.get("TYPE").equals("0")) { + pageData.put("eventTime",fstartDate); + dataList = gateMachineInfoService.findByIds(pageData); + }else { + pageData.put("CROSSTIME",fstartDate); + dataList = gateCarMachineInfoService.findByIds(pageData); } + returnMap.put("varList", dataList); + return returnMap; } /** - * @Description: 口门进出记录列表 + * @Description: 闸机位置 * @Author: dearLin * @Date: 2023/9/23/023 9:04 * @Param: * @Return: */ - @RequestMapping("/getCfdDoorWayRecords") + @RequestMapping("/getPersonAndCarGateInAndOutCount") @ResponseBody - public ReturnMap getCfdDoorWayRecords() { + public ReturnMap getPersonAndCarGateInAndOutCount() { ReturnMap returnMap = new ReturnMap(); + PageData data = new PageData(); 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); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String fendDate = format.format(new Date()); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); // 将时设置为0 + calendar.set(Calendar.MINUTE, 0); // 将分设置为0 + calendar.set(Calendar.SECOND, 0); // 将秒设置为0 + calendar.set(Calendar.MILLISECOND, 0); // 将毫秒设置为0 + Date currDay = calendar.getTime(); + String fstartDate = format.format(currDay); + pageData.put("eventTime",fstartDate); + //人闸机 + PageData personCount = gateMachineInfoService.peopleCount(pageData); + if (personCount!=null){ + data.put("personInCount", personCount.get("inCount")); + data.put("personOutCount", personCount.get("outCount")); + data.put("personUnkownCount", personCount.get("noCount")); + } + //车闸机 + pageData.put("GATE_AREA_TYPE", 1); + PageData carCount = gateCarMachineInfoService.carCount(pageData); + if (carCount!=null){ + data.put("carInCount", carCount.get("inCount")); + data.put("carOutCount", carCount.get("outCount")); + } + returnMap.put("data", data); + return returnMap; } + /** + * @Description: 闸机位置 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getGatePositionCount") + @ResponseBody + public ReturnMap getGatePositionCount() { + ReturnMap returnMap = new ReturnMap(); + PageData data = new PageData(); + PageData pageData = this.getPageData(); + //人闸机 + pageData.put("GATE_AREA_TYPE", 0); + List personMachine = gateAreaMapper.getGatePosition(pageData); + data.put("personMachineCount", personMachine.size()); + //车闸机 + pageData.put("GATE_AREA_TYPE", 1); + List carMachine = gateAreaMapper.getGatePosition(pageData); + data.put("carMachineCount", carMachine.size()); + returnMap.put("data", data); + return returnMap; + } + + + /** * @Description: 闸机进出车、人的数量 * @Author: dearLin @@ -719,21 +247,58 @@ public class MapController extends BaseController { @ResponseBody public ReturnMap getGatesInAndOutNumById() { ReturnMap returnMap = new ReturnMap(); - PageData pageData = this.getPageData(); - 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 pd = this.getPageData(); + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + String fendDate = dft.format(new Date()); + String fstartDate = ""; + if (pd.getString("status").equals("0")) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); // 将时设置为0 + calendar.set(Calendar.MINUTE, 0); // 将分设置为0 + calendar.set(Calendar.SECOND, 0); // 将秒设置为0 + calendar.set(Calendar.MILLISECOND, 0); // 将毫秒设置为0 + Date currDay = calendar.getTime(); + fstartDate = dft.format(currDay); + } else { + Calendar now = Calendar.getInstance(); + now.add(Calendar.MINUTE, -1); + Date before = now.getTime(); + fstartDate = dft.format(before); } - PageData data = biMapService.getGatesInAndOutNumById(pageData); - returnMap.put("pd", data); + String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd); + Map doorComeAndOutInfo = new HashMap<>(); + if (pd.getString("TYPE").equals("PERSON_MACHINE")){ + doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate); + }else { + List infoByArea = gateCarMachineInfoService.findInfoByArea(pd); + Map data = new HashMap<>(); + data.put("list", infoByArea); + doorComeAndOutInfo.put("data", data); + doorComeAndOutInfo.put("code", 0); + doorComeAndOutInfo.put("msg", "success"); + } + returnMap.put("doorInfo", doorComeAndOutInfo); return returnMap; } +// /** +// * @Description: 闸机进出车、人的数量 +// * @Author: dearLin +// * @Date: 2023/9/23/023 9:04 +// * @Param: +// * @Return: +// */ +// @RequestMapping("/test") +// @ResponseBody +// public ReturnMap test() { +// ReturnMap returnMap = new ReturnMap(); +// PageData pd = this.getPageData(); +// String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd); +// Map doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(); +// returnMap.put("doorInfo", doorComeAndOutInfo); +// return returnMap; +// } + /** * 人员进出记录列表 * @@ -751,47 +316,6 @@ public class MapController extends BaseController { } - @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(); - //获取当前人的公司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); - map.put("result", errInfo); - return map; - } /** * 获取人员、车辆进出记录 @@ -805,13 +329,6 @@ 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; } @@ -839,23 +356,6 @@ 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; } @@ -881,12 +381,8 @@ public class MapController extends BaseController { @ResponseBody public Object getHlsPath() throws Exception { Map map = new HashMap(); - 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; + + return map; } /** @@ -899,87 +395,13 @@ public class MapController extends BaseController { public Object getCurrentPersonnelData() 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/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; + return map; } @RequestMapping("/getUserMapInfo") @ResponseBody public ReturnMap getUserMapInfo() throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + 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 deleted file mode 100644 index 65ad33fc..00000000 --- a/src/main/java/com/zcloud/controller/map/MapEightCfdController.java +++ /dev/null @@ -1,76 +0,0 @@ -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 9e6e291c..a11ba766 100644 --- a/src/main/java/com/zcloud/controller/map/MapEightController.java +++ b/src/main/java/com/zcloud/controller/map/MapEightController.java @@ -4,19 +4,16 @@ 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.util.ReturnMap; +import com.zcloud.service.system.UsersService; +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.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; @@ -31,8 +28,8 @@ public class MapEightController extends BaseController { @Autowired private MapEightService mapEightService; - @Value("${cfd.prevention.api.url}") - private String cfdUrl; + @Autowired + private UsersService usersService; @Autowired private RestTemplate restTemplate; @@ -43,19 +40,10 @@ public class MapEightController extends BaseController { @RequestMapping(value = "/getEcharts") @ResponseBody public Object getEcharts() throws Exception { - 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); - } + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + return mapEightService.getEchartsOrder(pd); } /** @@ -69,23 +57,11 @@ public class MapEightController extends BaseController { public Object findFormCount() throws Exception { Map map = new HashMap(); String errInfo = "success"; - 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); - } + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); + map.put("pd", data); //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); map.put("result", errInfo); return map; @@ -102,32 +78,10 @@ public class MapEightController extends BaseController { public Object listHighRiskWork(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; - 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"); - } + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 page.setPd(pd); - 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); - } + List varList = mapEightService.listHighRiskWorkOrder(page); map.put("varList", varList); map.put("result", errInfo); return map; @@ -141,53 +95,13 @@ public class MapEightController extends BaseController { */ @RequestMapping(value = "/listAllHighRiskWorkLocation") @ResponseBody - public Object listAllHighRiskWorkLocation(@RequestParam(value = "CORPINFO_ID") String CORPINFO_ID, @RequestParam("TYPE") String type, @RequestParam("GANGKOU") String GANGKOU, @RequestParam("AREA") String AREA) throws Exception { + public Object listAllHighRiskWorkLocation() 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 = 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"))) { //一公司 + 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); @@ -208,6 +122,8 @@ 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); } @@ -224,6 +140,8 @@ 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); } @@ -241,6 +159,8 @@ 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); @@ -261,94 +181,31 @@ public class MapEightController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - // 港口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; - } + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + 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: + * 获取动火防护措施 + * + * @param + * @throws Exception */ - @RequestMapping("/getAllWorkUserCards") + @RequestMapping(value = "/findEightsByUserCardNo") @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); + public Object findEightsByUserId() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData byCardNo = usersService.findByCardNo(pd); + map.put("INFO", byCardNo); + map.put("result", errInfo); + return map; } - /** - * @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 deleted file mode 100644 index 7b3f5160..00000000 --- a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java +++ /dev/null @@ -1,121 +0,0 @@ -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 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(); - //根据条件增加参数或减少参数 都没有 直接返回空 - 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 c26eb59c..8cd738ee 100644 --- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java +++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java @@ -1,92 +1,83 @@ package com.zcloud.controller.map; import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.PageData; -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; -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/czksmap/CzksObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java similarity index 87% rename from src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java rename to src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java index ec858b3d..daa30af0 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java +++ b/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java @@ -1,4 +1,4 @@ -package com.zcloud.controller.czksmap; +package com.zcloud.controller.map; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller -@RequestMapping("/czks/ObtainDisplayData") -public class CzksObtainDisplayDataController extends BaseController { +@RequestMapping("/ObtainDisplayData") +public class ObtainDisplayDataController extends BaseController { @Autowired private RiskUnitService riskUnitService; diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java b/src/main/java/com/zcloud/controller/map/UserPositionController.java similarity index 52% rename from src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java rename to src/main/java/com/zcloud/controller/map/UserPositionController.java index f686fa8d..82f561cb 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java +++ b/src/main/java/com/zcloud/controller/map/UserPositionController.java @@ -1,4 +1,4 @@ -package com.zcloud.controller.czksmap; +package com.zcloud.controller.map; 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("/czks/UserPosition") -public class CzksUserPositionController extends BaseController { +@RequestMapping("/UserPosition") +public class UserPositionController extends BaseController { @Autowired private UsersService usersService; @@ -21,30 +21,6 @@ public class CzksUserPositionController extends BaseController { return usersService.getCurrentLocation(pd); } - /** - * 查询人员在线及统计数据 - * @return - * @throws Exception - */ - @RequestMapping(value = "/getCurrentPersonnelData") - @ResponseBody - public Object getCurrentPersonnelData() throws Exception{ - PageData pd = this.getPageData(); - return usersService.getCurrentPersonnelData(pd); - } - - /** - * 获取人员定位统计列表 - * @return - * @throws Exception - */ - @RequestMapping(value = "/personPositioningStatistics") - @ResponseBody - public Object getPersonPositioningStatistics() throws Exception{ - PageData pd = new PageData(); - pd = this.getPageData(); - return usersService.getPersonPositioningStatistics(pd); - } @RequestMapping(value="/getCurrentLocationOnlineCount") @ResponseBody diff --git a/src/main/java/com/zcloud/controller/sync/SyncVideoReceiveController.java b/src/main/java/com/zcloud/controller/sync/SyncVideoReceiveController.java new file mode 100644 index 00000000..d0ddb5bb --- /dev/null +++ b/src/main/java/com/zcloud/controller/sync/SyncVideoReceiveController.java @@ -0,0 +1,215 @@ +package com.zcloud.controller.sync; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.receive.VideoReceiveService; +import com.zcloud.util.ys.YSUtil; +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; + +/** + * 说明：特种设备安全巡检管理 + * 作者：luoxiaobao + * 时间：2021-06-19 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/sync/videoreceive") +public class SyncVideoReceiveController extends BaseController { + + @Autowired + private VideoReceiveService videoReceiveService; + @Autowired + private YSUtil ysUtil; + + /**列表 + * @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(); + List varList = videoReceiveService.listAll(pd); //列出Platformvideomanagement列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/findVideo") + @ResponseBody + public Object findVideo() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + pd.put("ResCode",pd.getString("org")); + PageData videoByResCode = videoReceiveService.findVideoByResCode(pd); + map.put("pd",videoByResCode); + map.put("result", "success"); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/platformList") + @ResponseBody + public Object platformList() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + JSONObject area = ysUtil.queryAreaList(pd); + JSONObject areaResult = (JSONObject) area.get("Result"); + Map resultMap = areaResult.toJavaObject(Map.class); + List list = JSONArray.parseArray(resultMap.get("InfoList").toString(), PageData.class); + ArrayList arrayList = new ArrayList<>(); + list.forEach(areaPd -> { + JSONObject resItemV1 = (JSONObject) areaPd.get("ResItemV1"); + Map map1 = JSONObject.parseObject(resItemV1.toString(), Map.class); + PageData data = new PageData(); + data.putAll(map1); + arrayList.add(data); + }); + + arrayList.forEach(pageData -> { + String resCode = pageData.getString("ResCode"); + PageData condition = new PageData(); + condition.put("org", resCode); + try { + //查询是否有下一级区域 + JSONObject jsonObject1 = ysUtil.queryAreaList(condition); + JSONObject result = (JSONObject) jsonObject1.get("Result"); + Map results = result.toJavaObject(Map.class); + List nextList = JSONArray.parseArray(results.get("InfoList").toString(), PageData.class); + if (nextList.size()>0) { + pageData.put("hasChildren",true); + } + //查询下一级是否有摄像头 + JSONObject cameraObject = ysUtil.queryCameraList(condition); + JSONObject cameraResult = (JSONObject) cameraObject.get("Result"); + Map cameraMap = cameraResult.toJavaObject(Map.class); + List cameraList = JSONArray.parseArray(cameraMap.get("InfoList").toString(), PageData.class); + if (cameraList.size()>0) { + pageData.put("hasChildren",true); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + //查询当前级摄像头数据 + JSONObject cameraObject = ysUtil.queryCameraList(pd); + JSONObject cameraResult = (JSONObject) cameraObject.get("Result"); + Map cameraMap = cameraResult.toJavaObject(Map.class); + List cameraList = JSONArray.parseArray(cameraMap.get("InfoList").toString(), PageData.class); + cameraList.forEach(cameraPd -> { + JSONObject resItemV1 = (JSONObject) cameraPd.get("ResItemV1"); + Map map1 = JSONObject.parseObject(resItemV1.toString(), Map.class); + PageData data = new PageData(); + data.putAll(map1); + arrayList.add(data); + }); + map.put("varList",arrayList); + map.put("result", "success"); + return map; + } + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("VIDEORECEIVE_ID", this.get32UUID()); //主键 + videoReceiveService.save(pd); + map.put("pd",pd); + map.put("result", errInfo); + return map; + } + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ISDELETE","0"); + if(pd.get("VIDEORECEIVE_ID") != null){ + videoReceiveService.edit(pd); + }else{ + pd.put("VIDEORECEIVE_ID", this.get32UUID()); //主键 + videoReceiveService.save(pd); + } + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/delLocation") + @ResponseBody + public Object delLocation() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + videoReceiveService.delLocation(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @throws Exception + */ + @RequestMapping(value="/deleteVideo") + @ResponseBody + public Object deleteVideo() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + videoReceiveService.deleteVideo(pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value="/listAllCameraForMap") + @ResponseBody + public Object listAllCameraForMap() throws Exception{ + PageData pd = this.getPageData(); + return videoReceiveService.listAllForMap(pd); + } + + @RequestMapping(value="/getHlsPath") + @ResponseBody + public Object getHlsPath() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateAreaMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateAreaMapper.java similarity index 92% rename from src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateAreaMapper.java rename to src/main/java/com/zcloud/mapper/datasource/gatemachine/GateAreaMapper.java index c684979c..fc116e36 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateAreaMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateAreaMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 官网：www.zcloudchina.com */ @Mapper -public interface CzksGateAreaMapper { +public interface GateAreaMapper { List getDatalistPage(Page page); void edit(PageData pd); diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateCarMachineInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateCarMachineInfoMapper.java new file mode 100644 index 00000000..07f854ae --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateCarMachineInfoMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.gatemachine; + +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Mapper +public interface GateCarMachineInfoMapper { + void BatchinsertInfo(List listPd); + + List findAll(); + + List findByIds(PageData pd); + + List findInfoByArea(PageData pd); + + PageData carCount(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java new file mode 100644 index 00000000..218cc569 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java @@ -0,0 +1,22 @@ +package com.zcloud.mapper.datasource.gatemachine; + +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Mapper +public interface GateMachineInfoMapper { + void BatchinsertInfo(List listPd); + + List findAll(); + + List findByIds(PageData pd); + + PageData perpleCount(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateMachineMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateMachineMapper.java rename to src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineMapper.java index cda0e456..8f7ce6ba 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateMachineMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineMapper.java @@ -13,7 +13,7 @@ import java.util.List; * 官网：www.zcloudchina.com */ @Mapper -public interface CzksGateMachineMapper { +public interface GateMachineMapper { ArrayList getDatalistPage(Page page); void edit(PageData pd); diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateVideoMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateVideoMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateVideoMapper.java rename to src/main/java/com/zcloud/mapper/datasource/gatemachine/GateVideoMapper.java index 58c9b4e6..f8a41232 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateVideoMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/GateVideoMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 时间：2021-05-10 * 官网：www.zcloudchina.com */ -public interface CzksGateVideoMapper { +public interface GateVideoMapper { /**新增 * @param pd diff --git a/src/main/java/com/zcloud/mapper/datasource/map/BiMapMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/BiMapMapper.java deleted file mode 100644 index b637b2f0..00000000 --- a/src/main/java/com/zcloud/mapper/datasource/map/BiMapMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.mapper.datasource.map; - -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; - -import java.util.List; - -/** - * 说明：TODO - * 作者：wangxuan - * 官网：www.zcloudchina.com - */ -public interface BiMapMapper { - List getCarRecordslistPage(Page page); - - List getPeopleRecordslistPage(Page page); - - List getCorpinfoIds(String[] ArrayDATA_IDS); - - // 统计今日人员刷卡数据 - PageData statisticsCardUserCount(PageData pd); - // 统计今日临时人员刷卡数据 - PageData statisticsOutsiderCount(PageData pd); - - PageData getRiskIdentificationCount(PageData pageData); - - PageData listbymeteorological(PageData pd); - -// 部门把自己 -1 - PageData getPersonPositioningCount(PageData pageData); - - List getRiskIndex(PageData pageData); - - List inAndoutPeoCarToday(PageData pageData); -} diff --git a/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapMapper.java new file mode 100644 index 00000000..f347a0ec --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapMapper.java @@ -0,0 +1,25 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Mapper +public interface GateAreaMapMapper { + List getDatalistPage(Page page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void save(PageData pageData); + + List getGatePosition(PageData pageData); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapMapper.java new file mode 100644 index 00000000..55b44121 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapMapper.java @@ -0,0 +1,48 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Mapper +public interface GateMachineMapMapper { + ArrayList getDatalistPage(Page page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void save(PageData pageData); + + List getOnlineGateMachine(PageData pageData); + + List getTodayInOutCount(PageData pageData); + + // 弃用 因需求变更 + List getGatePosition(PageData pageData); + + PageData getGateMachineInfoById(PageData pageData); + + List getPersonRecordCountByEId(PageData gateMachineInfo); + + List getCarRecordCountByEId(PageData gateMachineInfo); + + List getCarRecordCountByCorpId(PageData gateMachineInfo); + + /** + * 今天闸机的进出记录 + * @param gateMachineInfo + * @return + */ + List getPersonRecordListAllByIdlistPage(Page page); + + String[] getMachineEquipmentIdsByAreaId(PageData pageData); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java index f8fe4c5f..3d00a62e 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -287,9 +287,6 @@ public interface MapEightMapper { */ List listAllMeasuresELECTRICITYOrder(PageData pd); - - List listAllGasELECTRICTITYOrder(PageData pd); - /**盲板查询数据 * @param pd * @throws Exception @@ -366,36 +363,6 @@ public interface MapEightMapper { */ List getListDongHuo(List shuzu); - /** - * 获取cfd动火作业高危作业坐标统计 - * @param pd - * @return - */ - List getHOTWORKHighRiskWorkLocationCfd(PageData pd); - - - List findByELECTRICTITYAcceptuserId(PageData pd); - - List findByELECTRICTITYAcceptuserIds(PageData pd); - - List findByBLINDBOARDAcceptuserId(PageData pd); - - List findByBLINDBOARDAcceptuserIds(PageData pd); - - List findByCUTROADAcceptuserId(PageData pd); - - List findByCUTROADAcceptuserIds(PageData pd); - - List findByBREAKGROUNDAcceptuserId(PageData pd); - - List findByBREAKGROUNDAcceptuserIds(PageData pd); - - List findByHIGHWORKAcceptuserId(PageData pd); - - List findByHIGHWORKAcceptuserIds(PageData pd); - - List findByHOISTINGAcceptuserId(PageData pd); - - List findByHOISTINGAcceptuserIds(PageData pd); + PageData getAllWorkUserIds(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java deleted file mode 100644 index fadcdac0..00000000 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zcloud.mapper.datasource.map; - -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; - -import java.util.List; - -/** - * 说明：重点工程处罚 - * 作者：luoxiaobao - * 时间：2022-09-21 - * 官网：www.zcloudchina.com - */ -public interface MapKeyProjectMapper { - - /** - * 获取统计数数据 - * @param pd - * @return - */ - PageData findFormCount(PageData pd); - - /** - * 获取列表 - * @param page - * @return - */ - List datalistPage(Page page); - - /** - * 获取重点工程有坐标数据 - * @param pd - * @return - */ - List getProjectLocation(PageData pd); - - /** - * 获取视频有坐标数据 - * @param pd - * @return - */ - List getVideoLocation(PageData pd); - - /** - * 通过重点工程id获取重点工程详细信息 - * @param pd - * @return - */ - PageData getProjectById(PageData pd); - - /** - * 通过摄像头id 获取摄像头详细信息 - * @param pd - * @return - */ - PageData getVideoById(PageData pd); - -} - diff --git a/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java new file mode 100644 index 00000000..e13ce048 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java @@ -0,0 +1,29 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.PageData; + +/** + * @author zhangyue + * @date 2023/9/20/020 17:41 + */ +public interface PersonLocationTokenMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + + /**修改 + * @param pd + * @throws Exception + */ + void edit(String token); + + /** + * @throws Exception + */ + String getToken(); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/videoreceive/VideoReceiveMapper.java b/src/main/java/com/zcloud/mapper/datasource/videoreceive/VideoReceiveMapper.java new file mode 100644 index 00000000..f572459f --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/videoreceive/VideoReceiveMapper.java @@ -0,0 +1,44 @@ +package com.zcloud.mapper.datasource.videoreceive; + +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Mapper +public interface VideoReceiveMapper { + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**清空坐标 + * @param pd + * @throws Exception + */ + void delLocation(PageData pd); + + void deleteVideo(PageData pd); + + PageData findVideoByResCode(PageData pd); + + List listAllForMap(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/gatemachine/GateCarMachineInfoService.java b/src/main/java/com/zcloud/service/gatemachine/GateCarMachineInfoService.java new file mode 100644 index 00000000..e4d85316 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/GateCarMachineInfoService.java @@ -0,0 +1,21 @@ +package com.zcloud.service.gatemachine; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface GateCarMachineInfoService { + public List findAll(); + void BatchinsertInfo(List listPd); + + List findInfoByArea(PageData pd); + + public List findByIds(PageData pd); + + PageData carCount(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java b/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java new file mode 100644 index 00000000..2aeece72 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java @@ -0,0 +1,20 @@ +package com.zcloud.service.gatemachine; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface GateMachineInfoService { + public void BatchinsertInfo(List listPd); + + public List findAll(); + + public List findByIds(PageData pd); + + PageData peopleCount(PageData pd); +} 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 006d9e1d..74a2f2cb 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.CzksGateAreaMapper; +import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper; 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 CzksGateAreaMapper gateAreaMapper; + private GateAreaMapper gateAreaMapper; @Resource private InitPageDataUtil initPageDataUtil; diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarMachineInfoServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarMachineInfoServiceImpl.java new file mode 100644 index 00000000..2751a693 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarMachineInfoServiceImpl.java @@ -0,0 +1,45 @@ +package com.zcloud.service.gatemachine.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gatemachine.GateCarMachineInfoMapper; +import com.zcloud.service.gatemachine.GateCarMachineInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Service +public class GateCarMachineInfoServiceImpl implements GateCarMachineInfoService { + @Autowired + private GateCarMachineInfoMapper gateCarMachineInfoMapper; + + @Override + public void BatchinsertInfo(List listPd) { + gateCarMachineInfoMapper.BatchinsertInfo(listPd); + } + + @Override + public List findInfoByArea(PageData pd) { + return gateCarMachineInfoMapper.findInfoByArea(pd); + } + + @Override + public List findByIds(PageData pd) { + return gateCarMachineInfoMapper.findByIds(pd); + } + + @Override + public List findAll() { + return gateCarMachineInfoMapper.findAll(); + } + + @Override + public PageData carCount(PageData pd) { + return gateCarMachineInfoMapper.carCount(pd); + } +} diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java new file mode 100644 index 00000000..472a0482 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java @@ -0,0 +1,40 @@ +package com.zcloud.service.gatemachine.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gatemachine.GateMachineInfoMapper; +import com.zcloud.service.gatemachine.GateMachineInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Service +public class GateMachineInfoServiceImpl implements GateMachineInfoService { + @Autowired + private GateMachineInfoMapper gateMachineInfoMapper; + + @Override + public void BatchinsertInfo(List listPd) { + gateMachineInfoMapper.BatchinsertInfo(listPd); + } + + @Override + public List findAll() { + return gateMachineInfoMapper.findAll(); + } + + @Override + public List findByIds(PageData pd) { + return gateMachineInfoMapper.findByIds(pd); + } + + @Override + public PageData peopleCount(PageData pd) { + return gateMachineInfoMapper.perpleCount(pd); + } +} 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 a7e02032..beba7f00 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.CzksGateAreaMapper; -import com.zcloud.mapper.datasource.gatemachine.CzksGateMachineMapper; -import com.zcloud.mapper.datasource.gatemachine.CzksGateVideoMapper; +import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper; +import com.zcloud.mapper.datasource.gatemachine.GateMachineMapper; +import com.zcloud.mapper.datasource.gatemachine.GateVideoMapper; 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 CzksGateMachineMapper gateMachineMapper; + private GateMachineMapper gateMachineMapper; @Resource - private CzksGateAreaMapper gateAreaMapper; + private GateAreaMapper gateAreaMapper; @Resource - private CzksGateVideoMapper gateVideoMapper; + private GateVideoMapper gateVideoMapper; @Resource private InitPageDataUtil initPageDataUtil; @@ -82,16 +82,17 @@ public class GateMachineServiceImpl implements GateMachineService { @Override public List getGatePosition(PageData pageData) { - if ("PERSON".equals(pageData.getString("TYPE"))) { + // todo 需求变更，现在闸机变成了区域 + if (pageData.getString("TYPE").equals("PERSON_MACHINE")) { pageData.put("GATE_AREA_TYPE", 0); // 人闸机定位 } - if ("CAR".equals(pageData.getString("TYPE"))) { + if (pageData.getString("TYPE").equals("CAR_MACHINE")) { // 车闸机定位 pageData.put("GATE_AREA_TYPE", 1); } - if ("camera".equals(pageData.getString("TYPE"))) { + if (pageData.getString("TYPE").equals("CAMERA")) { // 摄像头定位 return gateVideoMapper.getCameraPosition(pageData); } @@ -99,6 +100,8 @@ public class GateMachineServiceImpl implements GateMachineService { return gateAreaMapper.getGatePosition(pageData); } + + @Override public PageData getGateMachineInfoById(PageData pageData) { return gateMachineMapper.getGateMachineInfoById(pageData); 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 b6014802..27b0ee85 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.CzksGateVideoMapper; +import com.zcloud.mapper.datasource.gatemachine.GateVideoMapper; 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 CzksGateVideoMapper gateVideoMapper; + private GateVideoMapper gateVideoMapper; /**新增 * @param pd diff --git a/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java deleted file mode 100644 index 34836172..00000000 --- a/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.service.map; - -import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.map.FireResourcesMapper; -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 AbsFireSourcesHandel implements InitializingBean { - - - @Resource - public FireResourcesMapper fireResourcesMapper; - @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/service/map/AssemblyBeanFactory.java b/src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java deleted file mode 100644 index 918270ad..00000000 --- a/src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zcloud.service.map; - -import org.apache.commons.lang.StringUtils; - -import java.util.HashMap; -import java.util.Map; - -/** - * 说明：TODO - * 作者：wangxuan - * 官网：www.zcloudchina.com - */ -public class AssemblyBeanFactory { - - private static Map strategyMap = new HashMap<>(); - - /** - * @Description: 获取组装数据工厂类 - * xfsy01 消防水源 - * xfbf01 消防泵房 - * xfjyd01 防救援队 - * xfkzs01 消防控制室 - */ - public static AbsFireSourcesHandel getInvokeStrategy(String type) { - return strategyMap.get(type); - } - - /** - * @Description: 注册组装数据工厂类 - * xfsy01 消防水源 - * xfbf01 消防泵房 - * xfjyd01 防救援队 - * xfkzs01 消防控制室 - */ - public static void register(String type, AbsFireSourcesHandel handler) { - if (StringUtils.isEmpty(type) && handler == null) { - return; - } - strategyMap.put(type, handler); - } - -} diff --git a/src/main/java/com/zcloud/service/map/BaseResultInterface.java b/src/main/java/com/zcloud/service/map/BaseResultInterface.java deleted file mode 100644 index 158c595f..00000000 --- a/src/main/java/com/zcloud/service/map/BaseResultInterface.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index c1566624..00000000 --- a/src/main/java/com/zcloud/service/map/BiMapService.java +++ /dev/null @@ -1,38 +0,0 @@ -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/CorpDepartmentService.java b/src/main/java/com/zcloud/service/map/CorpDepartmentService.java deleted file mode 100644 index a775ca28..00000000 --- a/src/main/java/com/zcloud/service/map/CorpDepartmentService.java +++ /dev/null @@ -1,164 +0,0 @@ -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 deleted file mode 100644 index e25a1d99..00000000 --- a/src/main/java/com/zcloud/service/map/DataDockingLogService.java +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 02f55995..00000000 --- a/src/main/java/com/zcloud/service/map/MapEightCfdService.java +++ /dev/null @@ -1,36 +0,0 @@ -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 079e284a..692eabb0 100644 --- a/src/main/java/com/zcloud/service/map/MapEightService.java +++ b/src/main/java/com/zcloud/service/map/MapEightService.java @@ -95,5 +95,7 @@ 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 deleted file mode 100644 index c9ed7187..00000000 --- a/src/main/java/com/zcloud/service/map/MapKetProjectService.java +++ /dev/null @@ -1,23 +0,0 @@ -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/MapService.java b/src/main/java/com/zcloud/service/map/MapService.java new file mode 100644 index 00000000..e7849fd4 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapService.java @@ -0,0 +1,7 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; + +public interface MapService { + String[] getGateIdsByGateAreaId(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalService.java b/src/main/java/com/zcloud/service/map/MeteorologicalService.java deleted file mode 100644 index 25fb0073..00000000 --- a/src/main/java/com/zcloud/service/map/MeteorologicalService.java +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 8b80b9d2..00000000 --- a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java +++ /dev/null @@ -1,103 +0,0 @@ -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 deleted file mode 100644 index 52281c56..00000000 --- a/src/main/java/com/zcloud/service/map/PlatformelectronicService.java +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 1700e47e..00000000 --- a/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java +++ /dev/null @@ -1,195 +0,0 @@ -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 index 8fa61b1a..d201ee62 100644 --- a/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java @@ -3,7 +3,6 @@ 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; diff --git a/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java deleted file mode 100644 index 41b9b2f5..00000000 --- a/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java +++ /dev/null @@ -1,267 +0,0 @@ -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 deleted file mode 100644 index 34b1d2c4..00000000 --- a/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -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 deleted file mode 100644 index f3008652..00000000 --- a/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -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 bd1316c3..e56718fb 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -3,6 +3,7 @@ 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; @@ -25,6 +26,8 @@ public class MapEightServiceImpl implements MapEightService { @Autowired private MapEightMapper mapEightMapper; + @Autowired + private UsersMapper usersMapper; @Override public List getCorpinfoIds(PageData pd) { @@ -112,8 +115,7 @@ public class MapEightServiceImpl implements MapEightService { String typeStr = pd.getString("TYPE"); //动火 if(StringUtils.equals(typeStr,"HOTWORK")){ -// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); - r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); + r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); //临时用电 }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); @@ -203,19 +205,6 @@ 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"); @@ -277,15 +266,6 @@ 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); } @@ -346,9 +326,6 @@ 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); @@ -359,14 +336,10 @@ public class MapEightServiceImpl implements MapEightService { 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); @@ -378,26 +351,73 @@ public class MapEightServiceImpl implements MapEightService { 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 deleted file mode 100644 index 2dd375c6..00000000 --- a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -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/MapServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapServiceImpl.java new file mode 100644 index 00000000..43142657 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapServiceImpl.java @@ -0,0 +1,19 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.GateMachineMapMapper; +import com.zcloud.service.map.MapService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class MapServiceImpl implements MapService { + @Autowired + private GateMachineMapMapper gateMachineMapMapper; + + + @Override + public String[] getGateIdsByGateAreaId(PageData pageData) { + return gateMachineMapMapper.getMachineEquipmentIdsByAreaId(pageData); + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java deleted file mode 100644 index 69447cf5..00000000 --- a/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -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 deleted file mode 100644 index 42c149a5..00000000 --- a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -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 deleted file mode 100644 index 1843ad16..00000000 --- a/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -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 deleted file mode 100644 index 2e4555e4..00000000 --- a/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java +++ /dev/null @@ -1,199 +0,0 @@ -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 deleted file mode 100644 index 413fe903..00000000 --- a/src/main/java/com/zcloud/service/map/util/HKPostUtil.java +++ /dev/null @@ -1,190 +0,0 @@ -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 deleted file mode 100644 index be0d9c9f..00000000 --- a/src/main/java/com/zcloud/service/map/util/HKUtil.java +++ /dev/null @@ -1,86 +0,0 @@ -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 deleted file mode 100644 index a4cd6b4e..00000000 --- a/src/main/java/com/zcloud/service/map/util/ReturnMap.java +++ /dev/null @@ -1,145 +0,0 @@ -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 deleted file mode 100644 index a623d28f..00000000 --- a/src/main/java/com/zcloud/service/map/util/WeatherUtil.java +++ /dev/null @@ -1,78 +0,0 @@ -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/receive/VideoReceiveService.java b/src/main/java/com/zcloud/service/receive/VideoReceiveService.java new file mode 100644 index 00000000..b0cbe2ba --- /dev/null +++ b/src/main/java/com/zcloud/service/receive/VideoReceiveService.java @@ -0,0 +1,41 @@ +package com.zcloud.service.receive; + +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface VideoReceiveService { + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**清空坐标 + * @param pd + * @throws Exception + */ + void delLocation(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteVideo(PageData pd); + + public PageData findVideoByResCode(PageData pd)throws Exception; + + Object listAllForMap(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/receive/impl/VideoReceiveServiceImpl.java b/src/main/java/com/zcloud/service/receive/impl/VideoReceiveServiceImpl.java new file mode 100644 index 00000000..4253efb7 --- /dev/null +++ b/src/main/java/com/zcloud/service/receive/impl/VideoReceiveServiceImpl.java @@ -0,0 +1,64 @@ +package com.zcloud.service.receive.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.videoreceive.VideoReceiveMapper; +import com.zcloud.service.receive.VideoReceiveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class VideoReceiveServiceImpl implements VideoReceiveService { + @Autowired + private VideoReceiveMapper videoReceiveMapper; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return videoReceiveMapper.listAll(pd); + } + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + videoReceiveMapper.save(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + videoReceiveMapper.edit(pd); + } + + @Override + public void delLocation(PageData pd) { + videoReceiveMapper.delLocation(pd); + } + + @Override + public void deleteVideo(PageData pd) { + videoReceiveMapper.deleteVideo(pd); + } + + @Override + public PageData findVideoByResCode(PageData pd) throws Exception { + return videoReceiveMapper.findVideoByResCode(pd); + } + + @Override + public Object listAllForMap(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + List varList = videoReceiveMapper.listAllForMap(pd); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 4d2855a7..e0629b44 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -356,9 +356,7 @@ public interface UsersService { Object getCurrentLocation(PageData pd); - Object getCurrentPersonnelData(PageData pd) throws Exception; - Object getPersonPositioningStatistics(PageData pd) throws Exception; Object getCurrentLocationCount(PageData pd); 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 60438fea..b31bdb1b 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.CzksPerLocUtil; +//import com.zcloud.util.CzksPerLocUtil; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; @@ -31,8 +31,8 @@ import com.zcloud.service.system.UsersService; @Service @Transactional //开启事物 public class UsersServiceImpl implements UsersService { - @Autowired - private CzksPerLocUtil perLocUtil; +// @Autowired +// private CzksPerLocUtil perLocUtil; @Autowired private UsersMapper usersMapper; @Value("${perLoc.url}") @@ -558,79 +558,4 @@ public class UsersServiceImpl implements UsersService { } - /** - * 查询人员在线统计数据 - * @param pd - * @return - */ - @Override - public Object getCurrentPersonnelData(PageData pd) throws Exception { - Map map = new HashMap<>(); - String errInfo = "success"; - String path = url + pd.getString("route") + "?office="; - String _response = HttpRequestUtil.doGetUser(path, perLocUtil.getToken()); - if (Tools.notEmpty(_response)) { - JSONObject response = JSONObject.parseObject(_response); - if(response.get("data") != null && Tools.notEmpty(response.get("data").toString())){ - List _varList = JSONObject.parseArray(JSON.toJSON(response.get("data")).toString(), PageData.class); - PageData resultPd = new PageData(); - int internalPersonCount = 0; // 内部人员在线数量 - int outsourcingPersonCount = 0; // 外协人员在线数量 - int temporaryPersonCount = 0; // 临时人员在线数量 - if (!Tools.isEmpty(_varList)) { - for (PageData pageData : _varList) { - if ("内部员工".equals(pageData.getString("officeName"))){ // 内部员工 - internalPersonCount++; - continue; - } - if ("外协员工".equals(pageData.getString("officeName"))){ - outsourcingPersonCount++; - continue; - } - if ("临时员工".equals(pageData.getString("officeName"))){ - temporaryPersonCount++; - } - } - } - resultPd.put("onlinePersonCount",_varList.size()); - resultPd.put("internalPersonCount",internalPersonCount); - resultPd.put("outsourcingPersonCount",outsourcingPersonCount); - resultPd.put("temporaryPersonCount", temporaryPersonCount); - map.put("pd",resultPd); - } - - } - map.put("result",errInfo); - return map; - } - - @Override - public Object getPersonPositioningStatistics(PageData pd) throws Exception { - Map map = new HashMap<>(); - String errInfo = "success"; - String path = url + pd.getString("route"); - String _response = HttpRequestUtil.doGetUser(path, perLocUtil.getToken()); - if (Tools.notEmpty(_response)) { - JSONObject response = JSONObject.parseObject(_response); - List _varList = JSONObject.parseArray(JSON.toJSON(response.get("data")).toString(), PageData.class); - List varList = new ArrayList<>(); - if (!Tools.isEmpty(_varList)) { - for (PageData pageData : _varList) { - PageData data = new PageData(); - data.put("cardNo",pageData.getString("cardNo")); - data.put("name",pageData.getString("name")); - data.put("cardType", (boolean) pageData.get("cardType") ? "在线" : "离线"); - varList.add(data); - } - } - if (varList.size() > 8) { - map.put("varList",varList.subList(0,8)); - } else { - map.put("varList",varList); - } - } - map.put("result",errInfo); - return map; - } - } diff --git a/src/main/java/com/zcloud/util/CzksPerLocUtil.java b/src/main/java/com/zcloud/util/CzksPerLocUtil.java deleted file mode 100644 index 7341d147..00000000 --- a/src/main/java/com/zcloud/util/CzksPerLocUtil.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.zcloud.util; - -import com.alibaba.fastjson.JSONObject; -import org.springframework.stereotype.Component; - -/** - * 人员定位系统工具类 - * @author zhangyue - * @date 2023/9/20/020 17:33 - */ -@Component -public class CzksPerLocUtil { - -// @Value("${perLoc.url}") - // 线上地址 - // 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}") - private static String username = "qinan"; - private static String password = "ZBo7pZ6UKDGLXq/xc87WB/J84jk0B7jpujsQZFcGbG4NrNN0CuWSiImfNln0nloVYC0BOp+9bnCq7MEFpzJXy11z2iYnlOA8B7MM5YDi2dpI+bHO0+lfL57eH6IXP7rrSjiKWCBDjNPgYGETkSgXNRVb8L9LnwX6qbHDri4ARTI="; - private static String userName = "n3Q3nVlzQ/8wVC0CObso2H+i8Y3g8q7k0DGZrZY4ofqnAv1wgfFst7AnlTYu7Rw1aJv36cPD/nrWARmNqP+UghX17K5iutwmKLVwC4EZaVmVABQGLjYdCekj2ePHpGjDFyHYaGQrIVJ651WxFZfKtdBexSL7b9sm7FRbpievNmA="; - private static String source = "API"; - private static String code = "1"; - // token - private static String perLocToken = ""; - - - public static String getToken(){ - // token 不为空。验证token是否失效 - if (Tools.notEmpty(perLocToken)) { - JSONObject request = new JSONObject(); - request.put("pageNum", 1); - request.put("pageSize", 10); - String httpResponseStr = HttpRequestUtil.doPost(perLocToken, perLocUrl + "/system/menu/menuTree",request.toJSONString()); - JSONObject httpResponse = JSONObject.parseObject(httpResponseStr); - // token 有效 - if (Tools.notEmpty(httpResponseStr) && httpResponse != null && httpResponse.get("code") != null && httpResponse.getInteger("code") == 200) { - return perLocToken; - } else { // token 失效 或者报错 - perLocToken = goToLogin(); - } - } else { - perLocToken = goToLogin(); - } - return perLocToken; - } - - - private static String goToLogin(){ - JSONObject request = new JSONObject(); - request.put("username", username); - request.put("password", password); - request.put("userName", userName); - request.put("source", source); - request.put("code", code); - String loginResStr = HttpRequestUtil.doPost(perLocUrl + "/auth/encryptLogin", request.toJSONString()); - JSONObject loginResponse = JSONObject.parseObject(loginResStr); - // 登录成功 - if(Tools.notEmpty(loginResStr) && loginResponse != null - && loginResponse.get("code") != null && loginResponse.getInteger("code") == 200 - && loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){ - return loginResponse.getJSONObject("data").getString("token"); - } else { // 登录失败 - throw new RuntimeException("人员定位第三方登录失败"); - } - } -} diff --git a/src/main/java/com/zcloud/util/HttpClientService.java b/src/main/java/com/zcloud/util/HttpClientService.java index 64be5883..654957db 100644 --- a/src/main/java/com/zcloud/util/HttpClientService.java +++ b/src/main/java/com/zcloud/util/HttpClientService.java @@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.PageData; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -249,6 +247,76 @@ public class HttpClientService { } return null; } + /** + * 发送POST请求 + * @param url + * @param headerMap + * @param bodyMap + * @return JSON或者字符串 + * @throws Exception + */ + public static Map sendPostJsonForMap(String url, Map headerMap, PageData bodyMap) throws Exception{ + JSONObject jsonObject = null; + HttpClient client = new SSLClient(); + HttpResponse response = null; + try{ + /** + * 创建一个httpclient对象 + */ + client = HttpClients.createDefault(); + /** + * 创建一个post对象 + */ + HttpPost post = new HttpPost(url); + for (String key : headerMap.keySet()) { + post.setHeader(key, headerMap.get(key).toString()); + } + /** + * 包装成一个Entity对象 + */ + StringEntity entity = new StringEntity(JSONObject.toJSONString(bodyMap), ContentType.create("application/json", "utf-8")); + /** + * 设置请求的内容 + */ + post.setEntity(entity); + /** + * 执行post请求 + */ + response = client.execute(post); + /** + * 获取响应码 + */ + int statusCode = response.getStatusLine().getStatusCode(); + if (SUCCESS_CODE == statusCode){ + /** + * 通过EntityUitls获取返回内容 + */ + String result = EntityUtils.toString(response.getEntity(),"UTF-8"); + /** + * 转换成json,根据合法性返回json或者字符串 + */ + try{ + jsonObject = JSONObject.parseObject(result); + Map maps = new HashMap(); + maps = parseJSON2Map(jsonObject); + return maps; + }catch (Exception e){ + e.printStackTrace(); + return null; + } + }else{ + LOGGER.error("HttpClientService-line: {}, errorMsg：{}", 146, "POST请求失败！"); + } + }catch (Exception e){ + LOGGER.error("HttpClientService-line: {}, Exception：{}", 149, e); + }finally { + /* response.close(); + client.close();*/ + } + return null; + } + + /** * 发送POST请求（无请求头Accept） @@ -365,9 +433,46 @@ public class HttpClientService { } public static Map doPost(String url, PageData pd) { + /* 正式上面总是显示一次断一次，未找到原因 + MultiValueMap requestBody = new LinkedMultiValueMap(); + pd.forEach((key, value) -> { + requestBody.add(key.toString(), value.toString()); + }); + System.out.println(requestBody); + Map responseBody = new HashMap(); + TcpClient tcpClient = TcpClient.create() + .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000) // Connection Timeout + .doOnConnected(connection -> + connection.addHandlerLast(new ReadTimeoutHandler(10)) // Read Timeout + .addHandlerLast(new WriteTimeoutHandler(10))); // Write Timeout + WebClient client = WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.from(tcpClient))).build(); + client.post() + .uri(url) + .header("Source","zcloud") + .contentType(MediaType.APPLICATION_FORM_URLENCODED) + .body(BodyInserters.fromFormData(requestBody)) + .exchange() + .flatMap(response -> { + System.out.println("Status code: " + response.statusCode().value()); + return response.bodyToMono(JSONObject.class); + }) + .doOnSuccess(body -> { + System.out.println("success"); + responseBody.putAll(body); + }) + .doOnError(throwable -> { + responseBody.put("msg",throwable.getMessage()); + System.out.println("Error occurred: " + throwable.getMessage()); + }) + .block(); + return responseBody; + */ JSONObject jsonObject = null; HttpResponse response = null; List nameValuePairList = new ArrayList(); +// pd.forEach((key, value) -> { // 这个遍历不好使 +// System.out.println("键：" + key.toString() + "，值：" + value.toString()); +// }); Map map = (Map)pd; System.out.print("参数：{"); for(Map.Entry entry : map.entrySet()){ diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index d61e99a1..dc13c444 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -11,6 +11,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.util.HashMap; +import java.util.Map; /** * description: http请求工具类 @@ -132,13 +133,77 @@ public class HttpRequestUtil { return result.toString(); } + + /** * Http get请求 * * @param httpUrl 连接 * @return 响应数据 */ - public static String doGetUser(String httpUrl, String token) throws Exception { + public static String doGetInitHearer(String httpUrl, Map headerMap) throws Exception { + //链接 + HttpURLConnection connection = null; + InputStream is = null; + BufferedReader br = null; + StringBuffer result = new StringBuffer(); + try { + //创建连接 + URL url = new URL(httpUrl); + connection = (HttpURLConnection) url.openConnection(); + //设置请求方式 + connection.setRequestMethod("GET"); + + //设置请求头 + for (String key : headerMap.keySet()) { + connection.setRequestProperty(key, headerMap.get(key).toString()); + } + //设置连接超时时间 + connection.setReadTimeout(15000); + //开始连接 + 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); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (null != br) { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (null != is) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + //关闭远程连接 + connection.disconnect(); + } + return result.toString(); + } + + /** + * Http get请求 + * + * @param httpUrl 连接 + * @return 响应数据 + */ + public static String doGetUser(String httpUrl,String token) throws Exception { //链接 HttpURLConnection connection = null; InputStream is = null; @@ -283,181 +348,5 @@ public class HttpRequestUtil { return result.toString(); } - public static String doPost(String token, String httpUrl, @Nullable String param) { - StringBuffer result = new StringBuffer(); - //连接 - HttpURLConnection connection = null; - OutputStream os = null; - InputStream is = null; - BufferedReader br = null; - try { - //创建连接对象 - URL url = new URL(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"); - connection.setRequestProperty("Authorization", token); - System.out.println(param); - //拼装参数 - 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(); - } - return result.toString(); - } - - - public static ReturnMap getPeopleApi(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.perLocUrl + 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("")) { - //设置参数 - 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; - } } diff --git a/src/main/java/com/zcloud/util/RedisUtil.java b/src/main/java/com/zcloud/util/RedisUtil.java new file mode 100644 index 00000000..0278fd76 --- /dev/null +++ b/src/main/java/com/zcloud/util/RedisUtil.java @@ -0,0 +1,67 @@ +package com.zcloud.util; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; + +/** + * @author fangjiakai + * @date 2024/1/8 20:56 + */ +@Component +public class RedisUtil { + @Autowired + private RedisTemplate redisTemplate; + + /** + * 保存string + * @param key + * @param value + */ + public void setString(String key, String value){ + redisTemplate.opsForValue().set(key,value); + } + /** + * 获取string + * @param key + * @param value + */ + public String getString(String key){ + return redisTemplate.opsForValue().get(key).toString(); + } + + /** + * 保存string并设置失效（time为秒） + * @param key + * @param value + * @param time + */ + public void setString(String key, String value, long time){ + redisTemplate.opsForValue().set(key,value,time, TimeUnit.SECONDS); + } + /** + * 查看是否有key + * @param key + */ + public boolean hasKey(String key){ + return redisTemplate.hasKey(key); + } + /** + * 查看key过期时间 + * @param key + */ + public long getExpire(String key){ + return redisTemplate.getExpire(key); + } + + /** + * 设置过期时间 + * @param key + * @param time + */ + public void expire(String key, long time) { + redisTemplate.expire(key, time, TimeUnit.SECONDS); + } +} diff --git a/src/main/java/com/zcloud/util/hk/HKUtil.java b/src/main/java/com/zcloud/util/hk/HKUtil.java index 2a3c53a7..c069ca7b 100644 --- a/src/main/java/com/zcloud/util/hk/HKUtil.java +++ b/src/main/java/com/zcloud/util/hk/HKUtil.java @@ -5,27 +5,96 @@ import com.alibaba.fastjson.JSONObject; import com.hikvision.artemis.sdk.ArtemisHttpUtil; import com.hikvision.artemis.sdk.config.ArtemisConfig; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.ImgFilesMapper; +import com.zcloud.service.bus.ImgFilesService; +import com.zcloud.util.PathUtil; +import org.apache.commons.collections.bag.SynchronizedSortedBag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import java.io.File; +import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; /** * 海康工具类 */ +@Component public class HKUtil { static { // 代理API网关nginx服务器ip端口 - ArtemisConfig.host = "172.17.100.1:443"; + ArtemisConfig.host = "172.16.21.248:443"; // 秘钥appkey - ArtemisConfig.appKey = "29806794"; + ArtemisConfig.appKey = "29316621"; // 秘钥appSecret - ArtemisConfig.appSecret = "LyM1zaj3YpjwrWQEhi0u"; + ArtemisConfig.appSecret = "3utKIXXtC43gLfxkjib1"; } + + @Autowired + private ImgFilesService imgFilesService; /** * 能力开放平台的网站路径 * TODO 路径不用修改，就是/artemis */ private static final String ARTEMIS_PATH = "/artemis"; + + + @Scheduled(cron ="0 06 * * * ?") + public void scheduled(){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 1000); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/door/search"); + JSONObject w = (JSONObject) returnMap; + JSONArray s = w.getJSONObject("data").getJSONArray("list"); + for (int i = 0; i < s.size(); i++) { + JSONObject jsonObject = s.getJSONObject(i); + PageData pageData = new PageData(); + pageData.put("indexCode", jsonObject.getString("indexCode")); + pageData.put("controlOneId", jsonObject.getString("controlOneId")); + pageData.put("parentIndexCode", jsonObject.getString("parentIndexCode")); + pageData.put("readerInId", jsonObject.getString("readerInId")); + pageData.put("name", jsonObject.getString("name")); + pageData.put("channelNo", jsonObject.getString("channelNo")); + pageData.put("channelType", jsonObject.getString("channelType")); + pageData.put("controlTwoId", jsonObject.getString("controlTwoId")); + pageData.put("createTime", jsonObject.getString("createTime")); + pageData.put("description", jsonObject.getString("description")); + pageData.put("disOrder", jsonObject.getString("disOrder")); + pageData.put("doorNo", jsonObject.getString("doorNo")); + pageData.put("doorSerial", jsonObject.getString("doorSerial")); + pageData.put("isCascade", jsonObject.getString("isCascade")); + pageData.put("readerOutId", jsonObject.getString("readerOutId")); + pageData.put("regionIndexCode", jsonObject.getString("regionIndexCode")); + pageData.put("regionName", jsonObject.getString("regionName")); + pageData.put("regionPath", jsonObject.getString("regionPath")); + pageData.put("regionPathName", jsonObject.getString("regionPathName")); + pageData.put("resourceType", jsonObject.getString("resourceType")); + pageData.put("sort", jsonObject.getString("sort")); + pageData.put("treatyType", jsonObject.getString("treatyType")); + pageData.put("updateTime", jsonObject.getString("updateTime")); + try { +// imgFilesService.insertsss(pageData); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + public static void main(String[] args) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 20); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + Map returnMap=publicHkInterface(jsonBody,"/api/acs/v2/door/events"); + System.out.println(returnMap); + } /** * 通用海康接口 * 调用POST请求类型(application/json)接口* @@ -49,14 +118,68 @@ public class HKUtil { */ public static Map camerasPreviewURLs(String id,String type){ JSONObject jsonBody = new JSONObject(); - jsonBody.put("cameraIndexCode", id); + 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/video/v1/cameras/previewURLs"); + Map returnMap=publicHkInterface(jsonBody,"/api/vnsc/mls/v1/preview/openApi/getPreviewParam"); + return returnMap; + } + + /** + * @param ids 设备编号 + * @return + */ + public static Map getDoorComeAndOutInfo(String[] ids, String pageNo, String pageSize, String currDay, String before) { + JSONObject jsonBody = new JSONObject(); + if (ids != null) + jsonBody.put("doorIndexCodes",ids); + if (pageNo != null) + jsonBody.put("pageNo",pageNo); + if (pageSize != null) + jsonBody.put("pageSize",pageSize); + if (currDay != null) + jsonBody.put("receiveStartTime",currDay); + if (before != null) + jsonBody.put("receiveEndTime",before); + jsonBody.put("sort","eventTime"); + jsonBody.put("order","desc"); + Map returnMap = publicHkInterface(jsonBody,"/api/acs/v2/door/events"); + return returnMap; + } + + /** + * + * @param ids 设备编号 + * @return + */ + public static Map getCarDoorComeAndOutInfo(String ids, String pageNo, String pageSize,String currDay, String before ) { + JSONObject jsonBody = new JSONObject(); + if (ids != null) + jsonBody.put("entranceSyscode","1bb725001c8d4660a96350ffbfe77c3a"); + if (pageNo != null) + jsonBody.put("pageNo",pageNo); + if (pageSize != null) + jsonBody.put("pageSize",pageSize); + if (currDay != null) + jsonBody.put("startTime",currDay); + if (before != null) + jsonBody.put("endTime",before); + Map returnMap = publicHkInterface(jsonBody,"/api/pms/v1/crossRecords/page"); + return returnMap; + } + + /** + * 获取监控点预览取流URL + * @param id 设备编号 + * @return + */ + public static Map getDoorComeAndOutInfo(){ + JSONObject jsonBody = new JSONObject(); + Map returnMap = publicHkInterface(jsonBody,"/api/resource/v1/entrance/entranceList"); return returnMap; } @@ -82,4 +205,23 @@ public class HKUtil { Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/camera/search"); return returnMap; } + + + // 门口门禁相关对接 + /** + * API名称： + * 查询门禁设备列表v2 + * @return + */ + public static Map acsDeviceSearch(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/acsDevice/search"); + return returnMap; + } } diff --git a/src/main/java/com/zcloud/util/ys/YSUtil.java b/src/main/java/com/zcloud/util/ys/YSUtil.java new file mode 100644 index 00000000..f0c654c9 --- /dev/null +++ b/src/main/java/com/zcloud/util/ys/YSUtil.java @@ -0,0 +1,147 @@ +package com.zcloud.util.ys; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.HttpRequestUtil; +import com.zcloud.util.MD5; +import com.zcloud.util.RedisUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Map; + +/** + * 宇视工具类 + */ + +@Component +public class YSUtil { + private static final String vmip = "http://172.14.0.54"; + private static final String name = "loadmin"; + private static final String passwd = "_Ab54321"; + private static final String vmport = "7010"; + private static final String linkPort = "8093"; + private static final String VIIDPort = "8088"; + @Autowired + private RedisUtil redisUtil; + + + public void loginOrKeepAlive() throws Exception { + // 剩余过期时间 -2为AccessToken已经过期 + Long residueTimeOut = redisUtil.getExpire("AccessToken"); + // 如果已经过期，重新获取AccessToken + if (residueTimeOut < 0) { + Map resultFinal = null; + // 首次登录获取accessCode + Map resultFirst = HttpClientService.sendPostJsonForMap(vmip + ":" + VIIDPort + "/VIID/login/v2", new HashMap(), null); + if (resultFirst != null && resultFirst.get("AccessCode") != null) { + String accessCode = resultFirst.get("AccessCode").toString(); + // MD5(BASE64(UserName)+ AccessCode + MD5(用户密码)) + PageData pd = new PageData(); + String LoginSignature = MD5.md5(encode(name.getBytes()) + accessCode + MD5.md5(passwd)); + pd.put("UserName", name); + pd.put("AccessCode", accessCode); + pd.put("LoginSignature", LoginSignature); + // 第二次登录获取AccessToken + resultFinal = HttpClientService.sendPostJsonForMap(vmip + ":" + VIIDPort + "/VIID/login/v2", new HashMap(), pd); + if (resultFinal != null && resultFinal.get("AccessToken") != null) { + String AccessToken = resultFinal.get("AccessToken").toString(); + redisUtil.setString("AccessToken", AccessToken, 30); + } + } + } else if (residueTimeOut < 10) { // 10秒内过期，进行AccessToken保活，并刷新redis过期时间 + Map header = new HashMap(); + System.out.println(redisUtil.getString("AccessToken")); + header.put("Authorization", redisUtil.getString("AccessToken")); + Map keepAliveResult = HttpClientService.sendPostJsonForMap(vmip + ":" + VIIDPort + "/VIID/hadesadapter/user/keepalive", header, null); + if (keepAliveResult != null && keepAliveResult.get("ErrCode") != null && ("0").equals(keepAliveResult.get("ErrCode").toString())) { + redisUtil.expire("AccessToken", 30); + } + } + } + + public JSONObject queryAreaList(PageData pd) throws Exception { + this.loginOrKeepAlive(); + Map header = new HashMap(); + header.put("Authorization", redisUtil.getString("AccessToken")); + JSONObject condition = new JSONObject(); + condition.put("QueryCount", 1); + condition.put("PageFirstRowNumber", 0); + condition.put("PageRowNum", 200); + JSONArray conditionArray = new JSONArray(); + // 查询条件 + // 这个queryCondition查询条件翻译过来就是 where RES_TYPE = "1" + // 查询条件的类型 - 256-资源类型(RES_TYPE) + // 查询条件的逻辑关系 0 代表等于 +// 查询条件的值 在资源类型中 1 -组织域 +// JSONObject queryCondition = initQueryCondition(256, 0, "1"); + + // 这个queryCondition1查询条件翻译过来就是 order by RES_SUB_TYPE asc + // 查询条件的类型 - 11-资源子类型(RES_SUB_TYPE) + // 查询条件的逻辑关系 6 代表升序 +// JSONObject queryCondition2 = initQueryCondition(11, 6, ""); + + // 这个queryCondition3查询条件翻译过来就是 order by EVENT_TYPE_NAME asc + // 查询条件的类型 - 273-事件类型名称(EVENT_TYPE_NAME) + // 查询条件的逻辑关系 6 代表升序 +// JSONObject queryCondition3 = initQueryCondition(273, 6, ""); + // 以此类推，下面将不在举例说明具体的查询条件，编码数据字典附录在src/main/webapp/uploadFiles/ys/ysDictionaries.md 这里 + + conditionArray.add(initQueryCondition(256, 0, "1")); + conditionArray.add(initQueryCondition(11, 6, "")); + conditionArray.add(initQueryCondition(273, 6, "")); + conditionArray.add(initQueryCondition(1, 6, "")); + conditionArray.add(initQueryCondition(269, 0, "1")); + condition.put("Condition", conditionArray); + condition.put("ItemNum", conditionArray.size()); + String encodedOrg = URLEncoder.encode(pd.get("org").toString(), "UTF-8"); + String encodedCondition = URLEncoder.encode(condition.toJSONString(), "UTF-8"); + String resultStr = HttpRequestUtil.doGetInitHearer(vmip + ":" + VIIDPort +"/VIID/query?org="+encodedOrg+"&condition="+encodedCondition, header); + JSONObject resultJson = JSONObject.parseObject(resultStr); + return resultJson; + } + + public JSONObject queryCameraList(PageData pd) throws Exception { + this.loginOrKeepAlive(); + Map header = new HashMap(); + header.put("Authorization", redisUtil.getString("AccessToken")); + JSONObject condition = new JSONObject(); + condition.put("QueryCount", 1); + condition.put("PageFirstRowNumber", 0); + condition.put("PageRowNum", 200); + JSONArray conditionArray = new JSONArray(); + + conditionArray.add(initQueryCondition(256, 0, "1001")); + conditionArray.add(initQueryCondition(273, 6, "")); + conditionArray.add(initQueryCondition(1, 6, "")); + condition.put("Condition", conditionArray); + condition.put("ItemNum", conditionArray.size()); + String encodedOrg = URLEncoder.encode(pd.get("org").toString(), "UTF-8"); + String encodedCondition = URLEncoder.encode(condition.toJSONString(), "UTF-8"); + String resultStr = HttpRequestUtil.doGetInitHearer(vmip + ":" + VIIDPort +"/VIID/query?org="+encodedOrg+"&condition="+encodedCondition, header); + JSONObject resultJson = JSONObject.parseObject(resultStr); + return resultJson; + } + + + private JSONObject initQueryCondition(int queryType, int logicFlag, String queryData) { + JSONObject queryCondition = new JSONObject(); + queryCondition.put("QueryType", queryType); // 查询条件的类型 + queryCondition.put("LogicFlag", logicFlag); // 查询条件的逻辑关系 + queryCondition.put("QueryData", queryData); // 查询条件的值 + return queryCondition; + } + + + + //base64加密 + public static String encode(byte[] content) { + return new sun.misc.BASE64Encoder().encode(content); + } + + +} diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml deleted file mode 100644 index 5d1d8cff..00000000 --- a/src/main/resources/mybatis/datasource/gatemachine/CzksGateVideoMapper.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - 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/map/GateAreaMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml similarity index 96% rename from src/main/resources/mybatis/datasource/map/GateAreaMapper.xml rename to src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml index ea5038e9..86d52e3f 100644 --- a/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml @@ -1,6 +1,6 @@ - + mk_gate_area @@ -66,6 +66,7 @@ select LONGITUDE, LATITUDE, GATE_AREA_NAME, + GATE_AREA_NAME as MAP_POINT_NAME, '${TYPE}' TYPE, GATE_AREA_ID id FROM diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml new file mode 100644 index 00000000..ff4901c4 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml @@ -0,0 +1,120 @@ + + + + mk_gate_car_machine_info + + + f.CAR_MACHINE_INFO_ID, + f.ENTRANCESYSCODE, + f.ENTRANCENAME, + f.ROADWAYNAME, + f.VEHICLEOUT, + f.PLATENO, + f.CARDNO, + f.VEHICLECOLOR, + f.VEHICLETYPE, + f.PLATETYPE, + f.PLATECOLOR, + f.CARCATEGORY, + f.CARCATEGORYNAME, + f.CROSSTIME, + f.CREATTIME, + f.OPERATTIME, + f.ISDELETE + + + + insert into mk_gate_car_machine_info + ( + CAR_MACHINE_INFO_ID, + ENTRANCESYSCODE, + ENTRANCENAME, + ROADWAYNAME, + VEHICLEOUT, + PLATENO, + CARDNO, + VEHICLECOLOR, + VEHICLETYPE, + PLATETYPE, + PLATECOLOR, + CARCATEGORY, + CARCATEGORYNAME, + CROSSTIME, + CREATTIME, + OPERATTIME, + ISDELETE + ) + values + + ( + #{item.CAR_MACHINE_INFO_ID}, + #{item.entranceSyscode}, + #{item.entranceName}, + #{item.roadwayName}, + #{item.vehicleOut}, + #{item.plateNo}, + #{item.cardNo}, + #{item.vehicleColor}, + #{item.vehicleType}, + #{item.plateType}, + #{item.plateColor}, + #{item.carCategory}, + #{item.carCategoryName}, + #{item.crossTime}, + #{item.CREATTIME}, + #{item.OPERATTIME}, + #{item.ISDELETE} + ) + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml new file mode 100644 index 00000000..947db57c --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml @@ -0,0 +1,77 @@ + + + + mk_gate_person_machine_info + + + f.MACHINE_INFO_ID, + f.doorIndexCode, + f.readerDevName, + f.devName, + f.personName, + f.cardNo, + f.eventTime, + f.ISDELETE + + + + insert into mk_gate_person_machine_info ( MACHINE_INFO_ID,doorIndexCode, + readerDevName,devName, + personName,cardNo, + eventTime,ISDELETE,inAndOutType) + values + + ( + #{item.MACHINE_INFO_ID}, + #{item.doorIndexCode}, + #{item.readerDevName}, + #{item.devName}, + #{item.personName}, + #{item.cardNo}, + #{item.eventTime}, + #{item.ISDELETE}, + #{item.inAndOutType} + ) + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml similarity index 92% rename from src/main/resources/mybatis/datasource/map/GateMachineMapper.xml rename to src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml index 6aa1edae..9340db14 100644 --- a/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml @@ -1,6 +1,6 @@ - + mk_gate_machine @@ -321,13 +321,26 @@ + + + diff --git a/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml similarity index 96% rename from src/main/resources/mybatis/datasource/map/GateVideoMapper.xml rename to src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml index ef957c72..54c3ee8c 100644 --- a/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml @@ -1,6 +1,6 @@ - + @@ -157,7 +157,7 @@ pv.INDEXCODE from f - left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID + left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and f.GATE_AREA_ID=#{pd.GATE_AREA_ID} @@ -196,7 +196,7 @@ pv.INDEXCODE from f - left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID + left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and f.CORPINFO_ID=#{CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/map/BiMapMapper.xml b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml deleted file mode 100644 index 6fd72429..00000000 --- a/src/main/resources/mybatis/datasource/map/BiMapMapper.xml +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml b/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml index 3783e764..b52fb9d6 100644 --- a/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml +++ b/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml @@ -77,7 +77,7 @@ SELECT - f.* + f.* from bus_carduser f WHERE - 1=1 - and f.EQUIPMENTID in (select EQUIPMENTID from mk_gate_machine where GATE_AREA_ID = #{pd.GATE_AREA_ID}) - AND f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' ) - AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) + 1=1 + and f.EQUIPMENTID in (select EQUIPMENTID from mk_gate_machine where GATE_AREA_ID = #{pd.GATE_AREA_ID}) + AND f.TIME BETWEEN CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 00:00:00' ) + AND CONCAT( DATE_FORMAT( now(), '%Y-%m-%d' ), ' 23:59:59' ) order by f.time desc + + + + + diff --git a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml deleted file mode 100644 index ae87909e..00000000 --- a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml +++ /dev/null @@ -1,3707 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml deleted file mode 100644 index cc6522fb..00000000 --- a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml new file mode 100644 index 00000000..dac129ea --- /dev/null +++ b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml @@ -0,0 +1,181 @@ + + + + + + + BUS_VIDEORECEIVE + + + + + SYS_DICTIONARIES + + + + + f.VIDEORECEIVE_ID, + f.ResCode, + f.OrgCode, + f.ResName, + f.ResType, + f.ResSubType, + f.ISDELETE, + f.LONGITUDE, + f.LATITUDE + + + + + VIDEORECEIVE_ID, + ResCode, + OrgCode, + ResName, + ResType, + ResSubType, + ISDELETE, + LONGITUDE, + LATITUDE + + + + + #{VIDEORECEIVE_ID}, + #{ResCode}, + #{OrgCode}, + #{ResName}, + #{ResType}, + #{ResSubType}, + #{ISDELETE}, + #{LONGITUDE}, + #{LATITUDE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + VIDEORECEIVE_ID = #{VIDEORECEIVE_ID} + + + + + update + + set + ResCode = #{ResCode}, + OrgCode = #{OrgCode}, + ResName = #{ResName}, + ResType = #{ResType}, + ResSubType = #{ResSubType}, + ISDELETE = #{ISDELETE}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + VIDEORECEIVE_ID = VIDEORECEIVE_ID + where + VIDEORECEIVE_ID = #{VIDEORECEIVE_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + VIDEORECEIVE_ID in + + #{item} + + + + + + + update + + set + LONGITUDE = null, + LATITUDE = null + where + VIDEORECEIVE_ID = #{VIDEORECEIVE_ID} + + + + + delete from + + where + VIDEORECEIVE_ID = #{VIDEORECEIVE_ID} + + + + + + +