diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java index 0110fc0e..7daded15 100644 --- a/src/main/java/com/zcloud/aspect/DockingAspect.java +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -26,8 +26,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -@Component -@Aspect +//@Component +//@Aspect public class DockingAspect { @Autowired private DockSendMessageService sendMessageService; diff --git a/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java new file mode 100644 index 00000000..6bea592d --- /dev/null +++ b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java @@ -0,0 +1,63 @@ +package com.zcloud.controller.anemometer; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.announcement.AnemometerMachineService; +import com.zcloud.service.gatemachine.GateAreaService; +import com.zcloud.util.ReturnMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@RestController +@RequestMapping("/anemometer") +public class AnemometerController extends BaseController { + + @Resource + private AnemometerMachineService anemometerMachineService; + + + @RequestMapping(value = "/page") + public ReturnMap page(Page page) { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + page.setPd(pageData); + List data = anemometerMachineService.getDatalistpage(page); + returnMap.put("varList", data); + returnMap.put("page", page); + return returnMap; + } + + @RequestMapping(value = "/anemometerList") + public ReturnMap anemometerList(Page page) throws Exception{ + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + List data = anemometerMachineService.listAll(pageData); + returnMap.put("varList", data); + return returnMap; + } + + @RequestMapping(value = "/getDetailByName") + public ReturnMap getDetailById() throws Exception{ + ReturnMap returnMap = new ReturnMap(); + PageData pd = this.getPageData(); + PageData data = anemometerMachineService.getDetailById(pd); + returnMap.put("varList", data); + return returnMap; + } + + @RequestMapping(value = "/edit") + public ReturnMap edit() throws Exception{ + PageData pd = this.getPageData(); + anemometerMachineService.edit(pd); + return ReturnMap.ok(); + } +} diff --git a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java index 21156c53..fc4102de 100644 --- a/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java +++ b/src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java @@ -5,7 +5,7 @@ import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.fireresources.CzksFireResourcesService; +import com.zcloud.service.fireresources.CmtFireResourcesService; import com.zcloud.util.DateUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,7 +24,7 @@ import java.util.Map; public class FireResourcesController extends BaseController { @Resource - private CzksFireResourcesService fireResourcesService; + private CmtFireResourcesService fireResourcesService; @RequestMapping(value = "/list") @ResponseBody public Object page(Page page) { diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java index bd5b35f9..ac05ade1 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java @@ -45,6 +45,7 @@ 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); @@ -156,9 +157,9 @@ public class GateVideoController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List videoList = gateVideoService.listAllForMap(pd); //根据ID读取 - map.put("videoList", videoList); + map.put("varList", videoList); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/map/CmtMapController.java b/src/main/java/com/zcloud/controller/map/CmtMapController.java new file mode 100644 index 00000000..37220b8d --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/CmtMapController.java @@ -0,0 +1,434 @@ +package com.zcloud.controller.map; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.czksbimap.CzksBiMapService; +import com.zcloud.service.fireresources.CmtFireResourcesService; +import com.zcloud.service.gatemachine.GateMachineService; +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 CmtMapController 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 CmtFireResourcesService 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; + } + + @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 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; + } + + /** + * 沧州矿石人员定位结束 定位基础信息 + */ + /** + * 获取人员、车辆进出记录 + * + * @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/map/CmtMapEightController.java b/src/main/java/com/zcloud/controller/map/CmtMapEightController.java new file mode 100644 index 00000000..45267516 --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/CmtMapEightController.java @@ -0,0 +1,185 @@ +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.czksbimap.CzksMapEightService; +import com.zcloud.util.Jurisdiction; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/czks/map/Eight") +public class CmtMapEightController extends BaseController { + + @Autowired + private CzksMapEightService mapEightService; + + /** + * @return + * @throws Exception + */ + @RequestMapping(value = "/getEcharts") + @ResponseBody + public Object getEcharts() throws Exception { + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + return mapEightService.getEchartsOrder(pd); + } + + /** + * 可视化首页统计数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/findFormCount") + @ResponseBody + public Object findFormCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + + PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); + map.put("pd", data); + map.put("result", errInfo); + return map; + } + + /** + * 作业实时情况展示（最新18条） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listHighRiskWork") + @ResponseBody + public Object listHighRiskWork(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + page.setPd(pd); + List varList = mapEightService.listHighRiskWorkOrder(page); + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listAllHighRiskWorkLocation") + @ResponseBody + public Object listAllHighRiskWorkLocation() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + List varList; + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { //一公司 + varList = mapEightService.listAllHighRiskWorkLocation(pd); + } else { + varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); + } + 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/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index a0116d3e..7ee6776f 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -5,19 +5,25 @@ 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.CmtFireResourcesService; import com.zcloud.service.gatemachine.GateCarMachineInfoService; import com.zcloud.service.gatemachine.GateMachineInfoService; import com.zcloud.service.gatemachine.GateMachineService; +import com.zcloud.service.gatemachine.GateVideoService; import com.zcloud.service.keyProjects.VideoManagerService; +import com.zcloud.service.map.BiMapService; 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 com.zcloud.util.hk.HKUtil; import com.zcloud.util.ys.YSUtil; import org.springframework.beans.factory.annotation.Autowired; 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.ResponseBody; import org.springframework.web.client.RestTemplate; @@ -34,12 +40,14 @@ import java.util.*; @RequestMapping("/map") public class MapController extends BaseController { - + @Autowired + private BiMapService biMapService; @Autowired private VideoManagerService videomanagerService; @Autowired private CorpInfoService corpInfoService; - + @Autowired + private CmtFireResourcesService fireResourcesService; @Autowired private UsersService usersService; @@ -70,6 +78,8 @@ public class MapController extends BaseController { @Autowired private GateCarMachineInfoService gateCarMachineInfoService; + @Autowired + private GateVideoService gateVideoService; @@ -218,7 +228,7 @@ public class MapController extends BaseController { */ @RequestMapping("/getGatePositionCount") @ResponseBody - public ReturnMap getGatePositionCount() { + public ReturnMap getGatePositionCount() throws Exception { ReturnMap returnMap = new ReturnMap(); PageData data = new PageData(); PageData pageData = this.getPageData(); @@ -230,6 +240,10 @@ public class MapController extends BaseController { pageData.put("GATE_AREA_TYPE", 1); List carMachine = gateAreaMapper.getGatePosition(pageData); data.put("carMachineCount", carMachine.size()); + //摄像头数 + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + List camera = gateVideoService.listAllForMap(pageData); + data.put("cameraCount", camera.size()); returnMap.put("data", data); return returnMap; } @@ -408,4 +422,62 @@ public class MapController extends BaseController { return r; } + /** + * @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; + } } diff --git a/src/main/java/com/zcloud/controller/videoreceive/VideoReceiveController.java b/src/main/java/com/zcloud/controller/videoreceive/VideoReceiveController.java new file mode 100644 index 00000000..d86a7f1b --- /dev/null +++ b/src/main/java/com/zcloud/controller/videoreceive/VideoReceiveController.java @@ -0,0 +1,217 @@ +package com.zcloud.controller.videoreceive; + +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("/videoreceive") +public class VideoReceiveController 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/anemometer/AnemometerLocalMapper.java b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java new file mode 100644 index 00000000..30a59647 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java @@ -0,0 +1,44 @@ +package com.zcloud.mapper.datasource.anemometer; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author zy + * @date 2024/1/16 19:35 + */ +public interface AnemometerLocalMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void add(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd)throws Exception; + + /**风速仪名称查询 + * @param pd + * @throws Exception + */ + List findByName(PageData pd)throws Exception; + + /**批量插入 + * @param listPd + * @throws Exception + */ + void BatchinsertInfo(List listPd); + + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerMachineMapper.java b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerMachineMapper.java new file mode 100644 index 00000000..eab64718 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerMachineMapper.java @@ -0,0 +1,47 @@ +package com.zcloud.mapper.datasource.anemometer; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * @author zy + * @date 2024/1/16 19:35 + */ +public interface AnemometerMachineMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void add(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd)throws Exception; + + /**风速仪名称查询 + * @param pd + * @throws Exception + */ + List findByName(PageData pd)throws Exception; + + /**批量插入 + * @param listPd + * @throws Exception + */ + void BatchinsertInfo(List listPd); + + List getDatalistPage(Page page); + + PageData getDetailById(PageData 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 new file mode 100644 index 00000000..b637b2f0 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/BiMapMapper.java @@ -0,0 +1,35 @@ +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/dsno2/fireresources/CzksFireResourcesMapper.java b/src/main/java/com/zcloud/mapper/dsno2/fireresources/CmtFireResourcesMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/fireresources/CzksFireResourcesMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/fireresources/CmtFireResourcesMapper.java index b4025ab0..590fbb1b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/fireresources/CzksFireResourcesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/fireresources/CmtFireResourcesMapper.java @@ -8,7 +8,7 @@ import java.util.LinkedList; import java.util.List; @Mapper -public interface CzksFireResourcesMapper { +public interface CmtFireResourcesMapper { /**新增 * @param pd */ diff --git a/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java b/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java new file mode 100644 index 00000000..dd07568c --- /dev/null +++ b/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java @@ -0,0 +1,42 @@ +package com.zcloud.service.announcement; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 风速仪 + * @author zy + * @date 2024/1/16 19:39 + */ +public interface AnemometerLocalService { + /**新增 + * @param pd + * @throws Exception + */ + public void add(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**风速仪名称查询 + * @param pd + * @throws Exception + */ + public List findByName(PageData pd)throws Exception; + + /**批量插入 + * @param listPd + * @throws Exception + */ + public void BatchinsertInfo(List listPd); +} diff --git a/src/main/java/com/zcloud/service/announcement/AnemometerMachineService.java b/src/main/java/com/zcloud/service/announcement/AnemometerMachineService.java new file mode 100644 index 00000000..74102ca0 --- /dev/null +++ b/src/main/java/com/zcloud/service/announcement/AnemometerMachineService.java @@ -0,0 +1,47 @@ +package com.zcloud.service.announcement; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 风速仪 + * @author zy + * @date 2024/1/16 19:39 + */ +public interface AnemometerMachineService { + /**新增 + * @param pd + * @throws Exception + */ + public void add(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**风速仪名称查询 + * @param pd + * @throws Exception + */ + public List findByName(PageData pd)throws Exception; + + /**批量插入 + * @param listPd + * @throws Exception + */ + public void BatchinsertInfo(List listPd); + + public List getDatalistpage(Page page); + + public PageData getDetailById(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java b/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java new file mode 100644 index 00000000..33b1124c --- /dev/null +++ b/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java @@ -0,0 +1,48 @@ +package com.zcloud.service.announcement.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.anemometer.AnemometerLocalMapper; +import com.zcloud.service.announcement.AnemometerLocalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 风速仪 + * @author zy + * @date 2024/1/16 19:39 + */ +@Service +@Transactional //开启事物 +public class AnemometerLocalServiceImpl implements AnemometerLocalService { + + @Autowired + private AnemometerLocalMapper anemometerLocalMapper; + + @Override + public void add(PageData pd) throws Exception { + anemometerLocalMapper.add(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + anemometerLocalMapper.edit(pd); + } + + @Override + public List listAll(PageData pd) throws Exception { + return anemometerLocalMapper.listAll(pd); + } + + @Override + public List findByName(PageData pd) throws Exception { + return anemometerLocalMapper.findByName(pd); + } + + @Override + public void BatchinsertInfo(List listPd) { + anemometerLocalMapper.BatchinsertInfo(listPd); + } +} diff --git a/src/main/java/com/zcloud/service/announcement/impl/AnemometerMachineServiceImpl.java b/src/main/java/com/zcloud/service/announcement/impl/AnemometerMachineServiceImpl.java new file mode 100644 index 00000000..2a0a0558 --- /dev/null +++ b/src/main/java/com/zcloud/service/announcement/impl/AnemometerMachineServiceImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.service.announcement.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.anemometer.AnemometerLocalMapper; +import com.zcloud.mapper.datasource.anemometer.AnemometerMachineMapper; +import com.zcloud.service.announcement.AnemometerMachineService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 风速仪 + * @author zy + * @date 2024/1/16 19:39 + */ +@Service +@Transactional //开启事物 +public class AnemometerMachineServiceImpl implements AnemometerMachineService { + + @Autowired + private AnemometerMachineMapper anemometerMachineMapper; + + @Override + public void add(PageData pd) throws Exception { + anemometerMachineMapper.add(pd); + } + + @Override + public void edit(PageData pd) throws Exception { + anemometerMachineMapper.edit(pd); + } + + @Override + public List listAll(PageData pd) throws Exception { + return anemometerMachineMapper.listAll(pd); + } + + @Override + public List findByName(PageData pd) throws Exception { + return anemometerMachineMapper.findByName(pd); + } + + @Override + public void BatchinsertInfo(List listPd) { + anemometerMachineMapper.BatchinsertInfo(listPd); + } + + @Override + public List getDatalistpage(Page page) { + return anemometerMachineMapper.getDatalistPage(page); + } + + @Override + public PageData getDetailById(PageData pd) { + return anemometerMachineMapper.getDetailById(pd); + } +} diff --git a/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java index 4f705f76..362a477b 100644 --- a/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java @@ -5,8 +5,8 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.czksbimap.CzksBiMapMapper; -import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper; +import com.zcloud.mapper.dsno2.fireresources.CmtFireResourcesMapper; import com.zcloud.service.czksbimap.CzksBiMapService; import com.zcloud.util.czksBiMapFactory.AbsCzksFireSourcesHandel; import com.zcloud.util.czksBiMapFactory.CzksAssemblyBeanFactory; @@ -32,7 +32,7 @@ public class CzksBiMapServiceImpl implements CzksBiMapService { private CzksBiMapMapper czksBiMapper; @Resource - private CzksFireResourcesMapper czksfireResourcesMapper; + private CmtFireResourcesMapper czksfireResourcesMapper; @Autowired private RestTemplate restTemplate; @Value("${perLoc.url}") diff --git a/src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java b/src/main/java/com/zcloud/service/fireresources/CmtFireResourcesService.java similarity index 96% rename from src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java rename to src/main/java/com/zcloud/service/fireresources/CmtFireResourcesService.java index cf6501a1..cb626464 100644 --- a/src/main/java/com/zcloud/service/fireresources/CzksFireResourcesService.java +++ b/src/main/java/com/zcloud/service/fireresources/CmtFireResourcesService.java @@ -14,7 +14,7 @@ import java.util.List; * @Param: * @Return: */ -public interface CzksFireResourcesService { +public interface CmtFireResourcesService { /**新增 * @param pd */ diff --git a/src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java b/src/main/java/com/zcloud/service/fireresources/impl/CmtFireResourcesServiceImpl.java similarity index 94% rename from src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java rename to src/main/java/com/zcloud/service/fireresources/impl/CmtFireResourcesServiceImpl.java index a2aac37d..682cd153 100644 --- a/src/main/java/com/zcloud/service/fireresources/impl/CzksFireResourcesServiceImpl.java +++ b/src/main/java/com/zcloud/service/fireresources/impl/CmtFireResourcesServiceImpl.java @@ -2,9 +2,9 @@ package com.zcloud.service.fireresources.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; +import com.zcloud.mapper.dsno2.fireresources.CmtFireResourcesMapper; import com.zcloud.service.bus.ImgFilesService; -import com.zcloud.service.fireresources.CzksFireResourcesService; +import com.zcloud.service.fireresources.CmtFireResourcesService; import com.zcloud.util.Tools; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,9 +15,9 @@ import java.util.LinkedList; import java.util.List; @Service -public class CzksFireResourcesServiceImpl implements CzksFireResourcesService { +public class CmtFireResourcesServiceImpl implements CmtFireResourcesService { @Resource - public CzksFireResourcesMapper czksfireResourcesMapper; + public CmtFireResourcesMapper czksfireResourcesMapper; @Resource private ImgFilesService imgFilesService; diff --git a/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java new file mode 100644 index 00000000..07d77d97 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java @@ -0,0 +1,35 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +import com.zcloud.service.fireresources.CmtFireResourcesService; +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 CmtFireResourcesService 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 new file mode 100644 index 00000000..918270ad --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java @@ -0,0 +1,42 @@ +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/BiMapService.java b/src/main/java/com/zcloud/service/map/BiMapService.java new file mode 100644 index 00000000..c1566624 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BiMapService.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.LinkedList; +import java.util.List; + +/** + * 说明：监管端Bi页map数据 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface BiMapService { + + List getDoorWayPeopleRecords(Page page); + + List getDoorWayCarRecords(Page page); + + PageData getRiskIdentificationCount(PageData pageData); + + public PageData listbymeteorological(PageData pd)throws Exception; + + List getCorpinfoIds(PageData pd); + + + PageData getPersonPositioningCount(PageData pageData); + + List getRiskIndex(PageData pageData); + + Object inAndoutPeoCarToday(PageData pageData); + + LinkedList getFireControl(PageData pageData) throws Exception; + + LinkedList getFireRescueTeam(PageData pageData); + + PageData getGatesInAndOutNumById(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java new file mode 100644 index 00000000..b0adbc49 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java @@ -0,0 +1,161 @@ +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.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 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) { + return null; + } +} diff --git a/src/main/java/com/zcloud/util/SaveAnemometerInfo.java b/src/main/java/com/zcloud/util/SaveAnemometerInfo.java new file mode 100644 index 00000000..05878fdf --- /dev/null +++ b/src/main/java/com/zcloud/util/SaveAnemometerInfo.java @@ -0,0 +1,68 @@ +package com.zcloud.util; + +import com.zcloud.entity.PageData; +import com.zcloud.service.announcement.AnemometerLocalService; +import com.zcloud.service.announcement.AnemometerMachineService; +import com.zcloud.service.announcement.AnemometerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +public class SaveAnemometerInfo { + @Autowired + private AnemometerService anemometerService; + @Autowired + private AnemometerLocalService anemometerLocalService; + @Autowired + private AnemometerMachineService anemometerMachineService; + +// @Scheduled(cron ="*/5 * * * * ? ") + public void scheduled() throws Exception{ + //存储车辆进出记录信息 + saveAnemometerInfo(); + } + + public void saveAnemometerInfo() throws Exception{ + PageData pageData = new PageData(); + //访问对接数据库获取风速仪数据 + List anemometerList = anemometerService.listAll(pageData); + //查询本地风速仪 + List anemometerMachineList = anemometerMachineService.listAll(pageData); + Map anemometerMachineMap = new HashMap<>(); + //将本地有的风速仪名称存入Map + anemometerMachineList.forEach(anemometerMachine -> { + anemometerMachineMap.put(anemometerMachine.getString("FID"), "FNAME"); + }); + anemometerList.forEach(anemometer -> { + anemometer.put("FLID",UuidUtil.get32UUID()); + String ftime = anemometer.getString("FTIME"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date date = simpleDateFormat.parse(ftime); + anemometer.put("FTIME",simpleDateFormat.format(date)); + } catch (ParseException e) { + throw new RuntimeException(e); + } + //判断获取的风速仪在本地是否存在 + if (!anemometerMachineMap.containsKey(anemometer.getString("FNAME"))) { + //如果不存在，则保存该风速仪 + anemometer.put("FID",anemometer.getString("FNAME")); + try { + anemometerMachineService.add(anemometer); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }); + //保存获取的风速数据到本地 + anemometerLocalService.BatchinsertInfo(anemometerList); + } +} diff --git a/src/main/java/com/zcloud/util/SaveMachineInfo.java b/src/main/java/com/zcloud/util/SaveMachineInfo.java new file mode 100644 index 00000000..5cf54cba --- /dev/null +++ b/src/main/java/com/zcloud/util/SaveMachineInfo.java @@ -0,0 +1,236 @@ +package com.zcloud.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.entity.PageData; +import com.zcloud.service.gatemachine.GateCarMachineInfoService; +import com.zcloud.service.gatemachine.GateMachineInfoService; +import com.zcloud.util.hk.HKUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +@Component +public class SaveMachineInfo { + @Autowired + private GateMachineInfoService gateMachineInfoService; + @Autowired + private GateCarMachineInfoService gateCarMachineInfoService; + + @Scheduled(cron ="*/30 * * * * ? ") + public void scheduled() { + //存储人员进出记录信息 + savePersonMachineInfo(); + //存储车辆进出记录信息 + saveCarMachineInfo(); + } + + public void saveCarMachineInfo() { + List all = gateCarMachineInfoService.findAll(); + if (all.size() > 0) { + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + String fendDate = dft.format(new Date())+"+08:00"; + String fstartDate = ""; + Calendar now = Calendar.getInstance(); + now.add(Calendar.SECOND, -30); + Date before = now.getTime(); + fstartDate = dft.format(before)+"+08:00"; + int pageNo = 1; //第几页 + int pageSize = 100; //一页查询多少条 + Map carDoorComeAndOutInfo = HKUtil.getCarDoorComeAndOutInfo(null, Integer.toString(pageNo), Integer.toString(pageSize), fstartDate, fendDate); + JSONObject data = (JSONObject)carDoorComeAndOutInfo.get("data"); + List firstInfoList = getCarInfoList(data); + if (firstInfoList.size() > 0) { + gateCarMachineInfoService.BatchinsertInfo(firstInfoList); + } + int total = Integer.parseInt(data.getString("total")); + int qvyu = total%pageSize; + //判断是否有下一页，如果有继续请求并且插入 + int totalPage = 0; + if (qvyu!=0){ + totalPage = total/pageSize + 1; + }else { + totalPage = total/pageSize; + } + + if (totalPage>1){ + for (int i=2;i<=totalPage;i++){ + pageNo = i; + Map nextDoorComeAndOutInfo = HKUtil.getCarDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject nextData = (JSONObject)nextDoorComeAndOutInfo.get("data"); + List nextInfoList = getCarInfoList(nextData); + if (nextInfoList.size() > 0) { + gateCarMachineInfoService.BatchinsertInfo(nextInfoList); + } + } + } + }else { + InitSaveCarDoorComeAndOutInfo(); + } + } + + public void savePersonMachineInfo(){ + List all = gateMachineInfoService.findAll(); + if (all.size() > 0) { + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + String fendDate = dft.format(new Date())+"+08:00"; + String fstartDate = ""; + Calendar now = Calendar.getInstance(); + now.add(Calendar.SECOND, -30); + Date before = now.getTime(); + fstartDate = dft.format(before)+"+08:00"; + int pageNo = 1; //第几页 + int pageSize = 100; //一页查询多少条 + Map doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject data = (JSONObject)doorComeAndOutInfo.get("data"); + List infoList = getInfoList(data); + if (infoList.size()>0) { + gateMachineInfoService.BatchinsertInfo(infoList); + } + //判断是否有下一页，如果有继续请求并且插入 + int totalPage = Integer.parseInt(data.getString("totalPage")); + if (totalPage>1){ + for (int i=2;i<=totalPage;i++){ + pageNo = i; + Map nextDoorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject nextData = (JSONObject)nextDoorComeAndOutInfo.get("data"); + List nextInfoList = getInfoList(nextData); + if (nextInfoList.size()>0) { + gateMachineInfoService.BatchinsertInfo(nextInfoList); + } + } + } + }else { + InitDoorComeAndOutInfo(); + } + } + + public void InitSaveCarDoorComeAndOutInfo(){ + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + String fendDate = dft.format(new Date())+"+08:00"; + String fstartDate = ""; + Calendar now = Calendar.getInstance(); + now.add(Calendar.DATE, -1); + Date before = now.getTime(); + fstartDate = dft.format(before)+"+08:00"; + int pageNo = 1; //第几页 + int pageSize = 100; //一页查询多少条 + Map carDoorComeAndOutInfo = HKUtil.getCarDoorComeAndOutInfo(null, Integer.toString(pageNo), Integer.toString(pageSize), fstartDate, fendDate); + JSONObject data = (JSONObject)carDoorComeAndOutInfo.get("data"); + List firstInfoList = getCarInfoList(data); + if (firstInfoList.size() > 0) { + gateCarMachineInfoService.BatchinsertInfo(firstInfoList); + } + int total = Integer.parseInt(data.getString("total")); + int qvyu = total%pageSize; + //判断是否有下一页，如果有继续请求并且插入 + int totalPage = 0; + if (qvyu!=0){ + totalPage = total/pageSize + 1; + }else { + totalPage = total/pageSize; + } + + if (totalPage>1){ + for (int i=2;i<=totalPage;i++){ + pageNo = i; + Map nextDoorComeAndOutInfo = HKUtil.getCarDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject nextData = (JSONObject)nextDoorComeAndOutInfo.get("data"); + List nextInfoList = getCarInfoList(nextData); + if (nextInfoList.size() > 0) { + gateCarMachineInfoService.BatchinsertInfo(nextInfoList); + } + } + } + } + + public void InitDoorComeAndOutInfo(){ + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + String fendDate = dft.format(new Date())+"+08:00"; + String fstartDate = ""; + Calendar now = Calendar.getInstance(); + now.add(Calendar.DATE, -1); + Date before = now.getTime(); + fstartDate = dft.format(before)+"+08:00"; + int pageNo = 1; //第几页 + int pageSize = 100; //一页查询多少条 + Map doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject data = (JSONObject)doorComeAndOutInfo.get("data"); + List firstInfoList = getInfoList(data); + if (firstInfoList.size() > 0) { + gateMachineInfoService.BatchinsertInfo(firstInfoList); + } + //判断是否有下一页，如果有继续请求并且插入 + int totalPage = Integer.parseInt(data.getString("totalPage")); + if (totalPage>1){ + for (int i=2;i<=totalPage;i++){ + pageNo = i; + Map nextDoorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(null,Integer.toString(pageNo),Integer.toString(pageSize),fstartDate,fendDate); + JSONObject nextData = (JSONObject)nextDoorComeAndOutInfo.get("data"); + List nextInfoList = getInfoList(nextData); + if (nextInfoList.size() > 0) { + gateMachineInfoService.BatchinsertInfo(nextInfoList); + } + } + } + } + public List getInfoList(JSONObject data){ + JSONArray list = (JSONArray)data.get("list"); + List infoList = new ArrayList<>(); + list.forEach(JSONObject -> { + Map infoMap = (Map) JSON.parse(JSONObject.toString()); + PageData infopd = new PageData(); + infopd.put("MACHINE_INFO_ID",UuidUtil.get32UUID()); + infopd.put("ISDELETE","0"); + infopd.putAll(infoMap); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + try { + String time = infopd.getString("eventTime"); + String replace = time.replace("+08:00", ""); + Date date = dft.parse(replace); + String eventTime = format.format(date); + infopd.put("eventTime",eventTime); + } catch (ParseException e) { + throw new RuntimeException(e); + } + infoList.add(infopd); + }); + return infoList; + } + + public List getCarInfoList(JSONObject data){ + JSONArray list = (JSONArray)data.get("list"); + List infoList = new ArrayList<>(); + list.forEach(JSONObject -> { + Map infoMap = (Map) JSON.parse(JSONObject.toString()); + PageData infopd = new PageData(); + infopd.put("CAR_MACHINE_INFO_ID",UuidUtil.get32UUID()); + infopd.put("ISDELETE","0"); + infopd.putAll(infoMap); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date currentTime = new Date(); + String currentTimeSdf = format.format(currentTime); + infopd.put("CREATTIME",currentTimeSdf); + infopd.put("OPERATTIME",currentTimeSdf); + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + try { + String time = infopd.getString("crossTime"); + String replace = time.replace("+08:00", ""); + Date date = dft.parse(replace); + String eventTime = format.format(date); + infopd.put("CROSSTIME",eventTime); + } catch (ParseException e) { + throw new RuntimeException(e); + } + infoList.add(infopd); + }); + return infoList; + } +} diff --git a/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java b/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java index c9b8a278..5a506444 100644 --- a/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java +++ b/src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java @@ -1,8 +1,8 @@ package com.zcloud.util.czksBiMapFactory; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper; -import com.zcloud.service.fireresources.CzksFireResourcesService; +import com.zcloud.mapper.dsno2.fireresources.CmtFireResourcesMapper; +import com.zcloud.service.fireresources.CmtFireResourcesService; import org.springframework.beans.factory.InitializingBean; import javax.annotation.Resource; @@ -16,9 +16,9 @@ public abstract class AbsCzksFireSourcesHandel implements InitializingBean { @Resource - public CzksFireResourcesMapper czksfireResourcesMapper; + public CmtFireResourcesMapper czksfireResourcesMapper; @Resource - public CzksFireResourcesService fireResourcesService; + public CmtFireResourcesService fireResourcesService; // 组装数据 diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 605894fb..8722a0aa 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -83,7 +83,7 @@ smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E -rocketmq.name-server=192.168.0.18:9876 +rocketmq.name-server=192.168.0.247:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=300000 rocketmq.producer.compress-message-body-threshold=4096 @@ -110,9 +110,9 @@ perLoc.pwd=Cfd2023@ # \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09 -corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://wwag.qhdsafety.com/ # \u6E2F\u80A1\u4F01\u4E1A\u7AEF-app\u767B\u5F55\u9ED8\u8BA4 \u540E\u53F0\u5730\u5740\u5730\u5740\uFF08\u66F9\u7164\u70AD\u4E0D\u7528\uFF09 -corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=http://192.168.0.247:8091/ # \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740 http.file.url=https://wwag.qhdsafety.com/file/ # \u672C\u670D\u52A1\u56FE\u7247\u5730\u5740 diff --git a/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml b/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml new file mode 100644 index 00000000..eb213543 --- /dev/null +++ b/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml @@ -0,0 +1,96 @@ + + + + + + + bus_anemometer_local + + + + + FLID, + FNAME, + FVALUE, + FTIME + + + + + #{FLID}, + #{FNAME}, + #{FVALUE}, + #{FTIME} + + + + + #{item.FLID}, + #{item.FNAME}, + #{item.FVALUE}, + #{item.FTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + insert into + ( + + ) + values + + ( + + ) + + + + + + update + + set + FNAME =#{FNAME}, + FVALUE =#{FVALUE} , + FTIME=#{FTIME} + where + FLID=#{FLID} + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml new file mode 100644 index 00000000..2aa864f1 --- /dev/null +++ b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml @@ -0,0 +1,119 @@ + + + + + + + bus_anemometer_machine + + + + + FID, + FNAME, + LATITUDE, + LONGITUDE + + + + + #{FID}, + #{FNAME}, + #{LATITUDE}, + #{LONGITUDE} + + + + + #{item.FID}, + #{item.FNAME}, + #{item.LATITUDE}, + #{item.LONGITUDE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + insert into + ( + + ) + values + + ( + + ) + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + FNAME=#{FNAME} + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml b/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml new file mode 100644 index 00000000..c5867d55 --- /dev/null +++ b/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml @@ -0,0 +1,3406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index 37ea0756..5f0a0e07 100644 --- a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -68,7 +68,7 @@ AND CORPINFO_ID IN #{item} - +-- GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml index 54c3ee8c..59db5645 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml @@ -23,7 +23,8 @@ f.PLATFORMVIDEOMANAGEMENT_ID, f.GATEVIDEO_ID, f.LATITUDE, - f.LONGITUDE + f.LONGITUDE, + f.CORPINFO_ID @@ -37,7 +38,8 @@ PLATFORMVIDEOMANAGEMENT_ID, GATEVIDEO_ID, LATITUDE, - LONGITUDE + LONGITUDE, + CORPINFO_ID @@ -51,7 +53,8 @@ #{PLATFORMVIDEOMANAGEMENT_ID}, #{GATEVIDEO_ID}, #{LATITUDE}, - #{LONGITUDE} + #{LONGITUDE}, + #{CORPINFO_ID} @@ -225,10 +228,15 @@ diff --git a/src/main/resources/mybatis/datasource/map/BiMapMapper.xml b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml new file mode 100644 index 00000000..d2c0d056 --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml @@ -0,0 +1,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml index dac129ea..06b9dbf2 100644 --- a/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml +++ b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml @@ -177,5 +177,8 @@ from f where 1 = 1 + + and CORPINFO_ID = #{CORPINFO_ID} + diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml index f3f61737..906e4665 100644 --- a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml @@ -1,6 +1,6 @@ - +