From fa82dc7272741dcb71e61b2681067ca0839bf5be Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 28 Dec 2023 13:49:21 +0800 Subject: [PATCH 01/38] =?UTF-8?q?add=EF=BC=9A=E6=B8=AF=E5=8A=A1=E5=B1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=B3=A8=E8=A7=A3=E4=B8=8E?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/aspect/DockAnnotation.java | 18 +++ .../java/com/zcloud/aspect/DockingAspect.java | 133 ++++++++++++++++++ .../service/mq/DockSendMessageService.java | 11 ++ .../mq/impl/DockSendMessageServiceImpl.java | 111 +++++++++++++++ src/main/resources/application-dev.properties | 7 + .../resources/application-local.properties | 5 + .../resources/application-master.properties | 5 + 7 files changed, 290 insertions(+) create mode 100644 src/main/java/com/zcloud/aspect/DockAnnotation.java create mode 100644 src/main/java/com/zcloud/aspect/DockingAspect.java create mode 100644 src/main/java/com/zcloud/service/mq/DockSendMessageService.java create mode 100644 src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java diff --git a/src/main/java/com/zcloud/aspect/DockAnnotation.java b/src/main/java/com/zcloud/aspect/DockAnnotation.java new file mode 100644 index 00000000..920b2b78 --- /dev/null +++ b/src/main/java/com/zcloud/aspect/DockAnnotation.java @@ -0,0 +1,18 @@ +package com.zcloud.aspect; + +import java.lang.annotation.*; + +/** + * @Description: 对接切面注解 + * @Author: dearLin + * @Date: 2023/3/8 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DockAnnotation { + // 是否有额外数据 + boolean isAdd() default false; + //是否有附件 + boolean hasAnnex() default false; +} diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java new file mode 100644 index 00000000..171a8ee9 --- /dev/null +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -0,0 +1,133 @@ +package com.zcloud.aspect; + +import com.alibaba.fastjson.JSON; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.User; +import com.zcloud.service.mq.DockSendMessageService; +import com.zcloud.util.Const; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import com.zcloud.util.UuidUtil; +import org.apache.shiro.session.Session; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.PostConstruct; +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +@Component +@Aspect +public class DockingAspect { + @Autowired + private DockSendMessageService sendMessageService; + @Value("${baseimgpath}") + public String baseimgpath; + @Pointcut("@annotation(com.zcloud.aspect.DockAnnotation)") + public void pointcut() { + } + + public static Map dockingRelationMap = new HashMap(); + + // 增强逻辑:在切点方法执行前打印日志 + @Around("pointcut()") + public Object beforeApi(ProceedingJoinPoint joinPoint) throws Throwable { + + try { + Object proceed = joinPoint.proceed(); + HashMap parseProceed = JSON.parseObject(JSON.toJSONString(proceed), HashMap.class); + if (parseProceed == null) { + return parseProceed; + } + // 数据同步 + dataSync(parseProceed, joinPoint); + return proceed; + } catch (Exception e) { + throw e; + } + } + + private void dataSync(HashMap proceed, ProceedingJoinPoint joinPoint) throws Exception { + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes()); + DockAnnotation annotation = method.getAnnotation(DockAnnotation.class); + //获取资源映射路径：servlet路径 + String servletPath = getRequest().getServletPath(); + //验证该数据是否需要对接 + System.out.println("------------------------切面方法执行------------------------"); + PageData sendData = this.getPageData(); + // app 方法 不取session + PageData login_user = new PageData(); + if (!servletPath.contains("/app/")) { + login_user.put("USER_ID", Jurisdiction.getUSER_ID()); + login_user.put("USERNAME", Jurisdiction.getUsername()); + login_user.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + login_user.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); + login_user.put("NAME", Jurisdiction.getName()); + login_user.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); + login_user.put("POST_ID", Jurisdiction.getPOST_ID()); + login_user.put("IS_MAIN", Jurisdiction.getIS_MAIN()); + Session session = Jurisdiction.getSession(); + User user = (User)session.getAttribute(Const.SESSION_USER); + login_user.put("user",JSON.toJSONString(user)); + sendData.put("LOGIN_USER", login_user); + } else { + // 手机app 会传递值。 + login_user.put("USER_ID", Tools.notEmpty(sendData.getString("USER_ID")) ? sendData.getString("USER_ID") : ""); + sendData.put("LOGIN_USER", login_user); + } + // 路径地址 + sendData.put("url", servletPath); + // 有存自己表里的图片 把自己图片服务器的前缀传过去 + if (annotation.hasAnnex()) { + sendData.put("BASEIMGPATH", baseimgpath); + // 自己表里的图片集合 + sendData.put("sendPicturesList", proceed.get("sendPicturesList")); + proceed.remove("sendPicturesList"); + } + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setMessage("港务局数据同步消息"); + tenCorpDto.setData(sendData); + tenCorpDto.setId(UuidUtil.get32UUID()); + tenCorpDto.setTopic("docking"); + tenCorpDto.setProducer_name("qa-prevention-czks"); + // 有dockData + if (Tools.notEmpty(proceed.get("dockData"))) { + sendData.put("dockData", proceed.get("dockData")); + proceed.remove("dockData"); + sendMessageService.sendMessage(tenCorpDto); + } else { + System.out.println("------------------------无dockData不发消息------------------------"); + } + + System.out.println("------------------------切面方法结束------------------------"); + } + + + + private PageData getPageData() { + return new PageData(this.getRequest()); + } + + /** + * 得到request对象 + * + * @return + */ + private HttpServletRequest getRequest() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + return request; + } +} diff --git a/src/main/java/com/zcloud/service/mq/DockSendMessageService.java b/src/main/java/com/zcloud/service/mq/DockSendMessageService.java new file mode 100644 index 00000000..f56d0e22 --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/DockSendMessageService.java @@ -0,0 +1,11 @@ +package com.zcloud.service.mq; + +import com.zcloud.dto.TenCorpDto; + +public interface DockSendMessageService { + + void sendMessage(TenCorpDto tenCorpDto) throws Exception; + void sendMessagePicture(TenCorpDto tenCorpDto) throws Exception; + void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception; + +} diff --git a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java new file mode 100644 index 00000000..ca474cd1 --- /dev/null +++ b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java @@ -0,0 +1,111 @@ +package com.zcloud.service.mq.impl; + +import com.alibaba.fastjson.JSONObject; +import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; +import com.zcloud.service.mq.DockSendMessageService; +import com.zcloud.service.mq.LogService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Warden; +import com.zcloud.util.mq.MqUtil; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.spring.core.RocketMQTemplate; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.messaging.support.GenericMessage; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class DockSendMessageServiceImpl implements DockSendMessageService { + + @Value("${mq.gwj.data.topic}") + private String gwjDataTopic; + @Value("${mq.gwj.file.topic}") + private String gwjFileTopic; + @Resource + private RocketMQTemplate rocketMQTemplate; + + @Resource + private MqErrorMessageLogMapper mqErrorMessageLogMapper; + + @Resource + private LogService logService; + + @Resource + private MqMessageLogMapper mqMessageLogMapper; + + @Override + public void sendMessage(TenCorpDto tenCorpDto) throws Exception { + try { + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + log.put("CREATE_TIME", DateUtil.getTime()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + SendResult sendResult = rocketMQTemplate.syncSend(this.gwjDataTopic, tenCorpDto.toString()); + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + e.printStackTrace(); + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("ERROR_MESSAGE", e.getMessage()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } + } + + @Override + public void sendMessagePicture(TenCorpDto tenCorpDto) throws Exception { + try { + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + log.put("CREATE_TIME", DateUtil.getTime()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + SendResult sendResult = rocketMQTemplate.syncSend(this.gwjFileTopic, tenCorpDto.toString()); + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + e.printStackTrace(); + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("ERROR_MESSAGE", e.getMessage()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } + } + + @Override + public void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception { + try { + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_LOG_ID", Warden.get32UUID()); + log.put("CREATE_TIME", DateUtil.getTime()); + mqMessageLogMapper.save(log); + System.out.println("生产者:" + tenCorpDto.toString()); + SendResult sendResult = rocketMQTemplate.syncSend(this.gwjFileTopic, tenCorpDto.toString()); + if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + throw new RuntimeException("产品入栈失败"); + } + } catch (Exception e) { + e.printStackTrace(); + PageData log = tenCorpDto.getPd(); + log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID()); + log.put("ERROR_MESSAGE", e.getMessage()); + log.put("TYPE", "0"); + log.put("TIME", DateUtil.getTime()); + mqErrorMessageLogMapper.save(log); + } + } + + +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index c8ee675a..2d5f8d76 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -89,3 +89,10 @@ mq.topic.info=info mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork + + +#数据同步topic +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture +#港务局文件服务器前缀 +baseimgpath=https://qgqy.qhdsafety.com/file/ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 8d8cc1c0..8b0f52f4 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -93,3 +93,8 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://qgqy.qhdsafety.com/file/ corp.default.back-end-path=http://192.168.151.57:8092/ +#数据同步topic +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture +#港务局文件服务器前缀 +baseimgpath=https://qgqy.qhdsafety.com/file/ diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index c6426837..d4811098 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -87,3 +87,8 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://qgqy.qhdsafety.com/file/ corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ +#数据同步topic +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture +#港务局文件服务器前缀 +baseimgpath=https://qgqy.qhdsafety.com/file/ From cb3db28e8335d94211e925d2b893850e1951c108 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 28 Dec 2023 14:06:55 +0800 Subject: [PATCH 02/38] =?UTF-8?q?add=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 2d5f8d76..1bf34f5d 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -92,7 +92,7 @@ mq.group.eightWork=scheduled_tasks_eightWork #数据同步topic -mq.gwj.data.topic=czks_docking -mq.gwj.file.topic=czks_dockingPicture +mq.gwj.data.topic=czks_qy_docking +mq.gwj.file.topic=czks_qy_dockingPicture #港务局文件服务器前缀 baseimgpath=https://qgqy.qhdsafety.com/file/ From 18b1a824b406f6137d774649c5b2519111a1c5e0 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 28 Dec 2023 16:45:28 +0800 Subject: [PATCH 03/38] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=88=B0=E6=B2=A7?= =?UTF-8?q?=E5=B7=9E=E7=9F=BF=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/UnitsController.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java b/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java index 1c6234bf..f5d91978 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/UnitsController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -41,11 +43,13 @@ public class UnitsController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("units:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + List picturesList = new ArrayList<>(); pd.put("UNITS_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -66,9 +70,13 @@ public class UnitsController extends BaseController { String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + "/" + ffile + "/" + fileName); + picturesList.add(Const.FILEPATHFILE + "/" + ffile + "/" + fileName+"@@"+fileName); } // List list = unitsService.listAll(pd); unitsService.save(pd); + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList",JSON.toJSONString(picturesList)); map.put("result", errInfo); return map; } @@ -76,12 +84,13 @@ public class UnitsController extends BaseController { /** * 删除 * - * @param out + * @param * @throws Exception */ @RequestMapping(value = "/delete") @RequiresPermissions("units:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -95,6 +104,8 @@ public class UnitsController extends BaseController { map.put("msg", "只有添加人"+state+"可以删除相关方！"); return map; } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -108,12 +119,13 @@ public class UnitsController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("units:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + List picturesList = new ArrayList<>(); String state = unitsService.IsJudgeCreator(pd.getString("UNITS_ID")); if(!"1".equals(state)){ errInfo = "fail"; @@ -136,10 +148,13 @@ public class UnitsController extends BaseController { String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + "/" + ffile + "/" + fileName); + picturesList.add(Const.FILEPATHFILE + "/" + ffile + "/" + fileName+"@@"+fileName); } unitsService.edit(pd); - + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList",JSON.toJSONString(picturesList)); map.put("result", errInfo); return map; } @@ -236,6 +251,7 @@ public class UnitsController extends BaseController { @RequestMapping(value = "/deleteAll") @RequiresPermissions("units:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -249,6 +265,8 @@ public class UnitsController extends BaseController { } else { errInfo = "fail"; } + pd.put("sendAllCorp",1); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } From 4be8922c590c4def7d597eea211032db265a1141 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 2 Jan 2024 14:12:40 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=AB=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiBiTongjiCotroller.java | 363 ++ .../controller/bus/BiTongjiController.java | 454 ++ .../zcloud/controller/map/MapController.java | 987 +++++ .../controller/map/MapEightCfdController.java | 76 + .../controller/map/MapEightController.java | 354 ++ .../map/MapKeyProjectController.java | 121 + .../map/MapPlatFormElectronicController.java | 92 + .../mapper/datasource/bus/CorpInfoMapper.java | 8 + .../mapper/datasource/bus/HiddenMapper.java | 2 + .../mapper/datasource/map/BiMapMapper.java | 35 + .../mapper/datasource/map/BiTongjiMapper.java | 59 + .../mapper/datasource/map/GateAreaMapper.java | 25 + .../datasource/map/GateMachineMapper.java | 46 + .../datasource/map/GateVideoMapper.java | 75 + .../mapper/datasource/map/MapEightMapper.java | 401 ++ .../datasource/map/MapKeyProjectMapper.java | 59 + .../datasource/system/DepartmentMapper.java | 2 + .../mapper/datasource/system/UsersMapper.java | 6 + .../dsno2/map/DataDockingLogMapper.java | 59 + .../mapper/dsno2/map/FireResourcesMapper.java | 68 + .../dsno2/map/MeteorologicalMapper.java | 83 + .../dsno2/map/MeteorologicalinfoMapper.java | 104 + .../dsno2/map/PlatformelectronicMapper.java | 69 + .../zcloud/service/bus/CorpInfoService.java | 6 + .../com/zcloud/service/bus/HiddenService.java | 5 + .../service/bus/impl/CorpInfoServiceImpl.java | 15 + .../service/bus/impl/HiddenServiceImpl.java | 5 + .../service/map/AbsFireSourcesHandel.java | 34 + .../service/map/AssemblyBeanFactory.java | 42 + .../service/map/BaseResultInterface.java | 18 + .../com/zcloud/service/map/BiMapService.java | 38 + .../zcloud/service/map/BiTongjiService.java | 117 + .../service/map/CorpDepartmentService.java | 164 + .../service/map/DataDockingLogService.java | 59 + .../service/map/FireResourcesService.java | 62 + .../service/map/GateMachineService.java | 46 + .../service/map/MapEightCfdService.java | 36 + .../zcloud/service/map/MapEightService.java | 99 + .../service/map/MapKetProjectService.java | 23 + .../service/map/MeteorologicalService.java | 85 + .../map/MeteorologicalinfoService.java | 103 + .../map/PlatformelectronicService.java | 65 + .../service/map/impl/BiMapServiceImpl.java | 195 + .../service/map/impl/BiTongjiServiceImpl.java | 156 + .../map/impl/CorpDepartmentServiceImpl.java | 267 ++ .../map/impl/DataDockingLogServiceImpl.java | 83 + .../map/impl/FireResourcesServiceImpl.java | 136 + .../map/impl/GateMachineServiceImpl.java | 234 ++ .../map/impl/MapEightCfdServiceImpl.java | 129 + .../service/map/impl/MapEightServiceImpl.java | 586 +++ .../map/impl/MapKeyProjectServiceImpl.java | 144 + .../map/impl/MeteorologicalServiceImpl.java | 154 + .../impl/MeteorologicalinfoServiceImpl.java | 222 + .../impl/PlatformelectronicServiceImpl.java | 93 + .../service/map/util/CodeMessageEnum.java | 199 + .../zcloud/service/map/util/HKPostUtil.java | 190 + .../com/zcloud/service/map/util/HKUtil.java | 86 + .../zcloud/service/map/util/ReturnMap.java | 145 + .../zcloud/service/map/util/WeatherUtil.java | 78 + .../zcloud/service/system/UsersService.java | 6 + .../service/system/impl/UsersServiceImpl.java | 13 + src/main/java/com/zcloud/util/Const.java | 2 + .../java/com/zcloud/util/Jurisdiction.java | 7 + .../mybatis/datasource/bus/CorpInfoMapper.xml | 229 + .../mybatis/datasource/bus/HiddenMapper.xml | 12 +- .../mybatis/datasource/map/BiMapMapper.xml | 326 ++ .../mybatis/datasource/map/BiTongjiMapper.xml | 573 +++ .../mybatis/datasource/map/GateAreaMapper.xml | 104 + .../datasource/map/GateMachineMapper.xml | 333 ++ .../datasource/map/GateVideoMapper.xml | 263 ++ .../mybatis/datasource/map/MapEightMapper.xml | 3707 +++++++++++++++++ .../datasource/map/MapKeyProjectMapper.xml | 177 + .../datasource/system/DepartmentMapper.xml | 35 + .../mybatis/datasource/system/UsersMapper.xml | 86 + .../dsno2/map/DataDockingLogMapper.xml | 127 + .../mybatis/dsno2/map/FireResourcesMapper.xml | 472 +++ .../dsno2/map/MeteorologicalMapper.xml | 521 +++ .../dsno2/map/MeteorologicalinfoMapper.xml | 514 +++ .../dsno2/map/PlatformelectronicMapper.xml | 243 ++ 79 files changed, 15416 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java create mode 100644 src/main/java/com/zcloud/controller/bus/BiTongjiController.java create mode 100644 src/main/java/com/zcloud/controller/map/MapController.java create mode 100644 src/main/java/com/zcloud/controller/map/MapEightCfdController.java create mode 100644 src/main/java/com/zcloud/controller/map/MapEightController.java create mode 100644 src/main/java/com/zcloud/controller/map/MapKeyProjectController.java create mode 100644 src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/BiMapMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/BiTongjiMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/GateVideoMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/map/DataDockingLogMapper.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/map/FireResourcesMapper.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalMapper.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java create mode 100644 src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java create mode 100644 src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java create mode 100644 src/main/java/com/zcloud/service/map/AssemblyBeanFactory.java create mode 100644 src/main/java/com/zcloud/service/map/BaseResultInterface.java create mode 100644 src/main/java/com/zcloud/service/map/BiMapService.java create mode 100644 src/main/java/com/zcloud/service/map/BiTongjiService.java create mode 100644 src/main/java/com/zcloud/service/map/CorpDepartmentService.java create mode 100644 src/main/java/com/zcloud/service/map/DataDockingLogService.java create mode 100644 src/main/java/com/zcloud/service/map/FireResourcesService.java create mode 100644 src/main/java/com/zcloud/service/map/GateMachineService.java create mode 100644 src/main/java/com/zcloud/service/map/MapEightCfdService.java create mode 100644 src/main/java/com/zcloud/service/map/MapEightService.java create mode 100644 src/main/java/com/zcloud/service/map/MapKetProjectService.java create mode 100644 src/main/java/com/zcloud/service/map/MeteorologicalService.java create mode 100644 src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java create mode 100644 src/main/java/com/zcloud/service/map/PlatformelectronicService.java create mode 100644 src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/FireResourcesServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java create mode 100644 src/main/java/com/zcloud/service/map/util/HKPostUtil.java create mode 100644 src/main/java/com/zcloud/service/map/util/HKUtil.java create mode 100644 src/main/java/com/zcloud/service/map/util/ReturnMap.java create mode 100644 src/main/java/com/zcloud/service/map/util/WeatherUtil.java create mode 100644 src/main/resources/mybatis/datasource/map/BiMapMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/GateAreaMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/GateMachineMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/GateVideoMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/MapEightMapper.xml create mode 100644 src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml create mode 100644 src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml create mode 100644 src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml create mode 100644 src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml create mode 100644 src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml create mode 100644 src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml diff --git a/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java b/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java new file mode 100644 index 00000000..0cb70ccb --- /dev/null +++ b/src/main/java/com/zcloud/controller/api/ApiBiTongjiCotroller.java @@ -0,0 +1,363 @@ +package com.zcloud.controller.api; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.BiTongjiService; +import com.zcloud.service.system.DepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import java.util.*; + +@Controller +@RequestMapping("/api/biTongji") +public class ApiBiTongjiCotroller extends BaseController { + + @Autowired + private BiTongjiService biTongjiService; + @Autowired + private RestTemplate restTemplate; + + @Value("${preventionxgf.api.url}") + private String url; + + @Autowired + private DepartmentService departmentService; + + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountInsByCorpSource") + @ResponseBody + public Object getCountInsByCorpSource() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List insList = biTongjiService.getCountInsByCorpSource(pd); // 数据库中有的 + Map insMap = new HashMap<>(); // key= 企业id + 标识 ；val = 数量 ; 检查来源（4-监管端 5-企业端） + for (PageData pageData : insList) { + String key = pageData.getString("CORPINFO_ID") + "_" + pageData.getString("INSPECTION_SOURCE"); + String val = pageData.getString("count"); + insMap.put(key, val); + } + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList) { + String supeCount = "0"; + String corpCount = "0"; + String corpinfoID = corpinfo.getString("CORPINFO_ID"); + if (insMap.containsKey(corpinfoID + "_4")) { + supeCount = insMap.get(corpinfoID + "_4"); + } + if (insMap.containsKey(corpinfoID + "_5")) { + corpCount = insMap.get(corpinfoID + "_5"); + } + Map corpinfoCount = new HashMap<>(); + corpinfoCount.put("corpinfName", corpinfo.getString("CORP_NAME")); + corpinfoCount.put("supeCount", supeCount); + corpinfoCount.put("corpCount", corpCount); + valList.add(corpinfoCount); + } + map.put("varList", valList); + map.put("result", errInfo); + return map; + } + + /** + * @Description: 按照隐患类型bi页进行统计 + * @Author: dearLin + * @Date: 2023/10/30/030 15:21 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getHiddenCountByHiddenType") + @ResponseBody + public Object getHiddenCountByHiddenType() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = this.getPageData(); + new ArrayList(); + //物的不安全状态 + //管理的缺陷 + //其他 + //环境的不安全因素 + //人的不安全因素 + List typeList = Arrays.asList( + "rdbaqys", + "wdbaqzt", + "hjdbaqys", + "gldqx", + "aqyh-qt" + ); + pageData.put("typeList", typeList); + List varList = biTongjiService.getHiddenCountByHiddenType(pageData); + map.put("result", errInfo); + map.put("varList", varList); + + return map; + } + + + /** + * 客户数据 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getUserCount") + @ResponseBody + public Object getUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// Integer corpUserCount = biTongjiService.getCorpUser(pd); // 企业的所有人数 + List corpUserCount = biTongjiService.getCorpUser2(pd); // 企业的所有人数 + +// Integer superUserCount = biTongjiService.getSupeUser(pd); // 部门的所有人数 + List superUserCount = biTongjiService.getSupeUser2(pd); // 部门的所有人数 + + map.put("corpUserCount", corpUserCount.size()); + map.put("superUserCount", superUserCount.size()); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 人员数量 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpUserCountTop10") + @ResponseBody + public Object getCorpUserCountTop10() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpUserCountTop10 = biTongjiService.getCorpUserCountTop10(pd); // 所有需要统计的企业信息 + map.put("corpUserCountTop10", corpUserCountTop10); + map.put("result", errInfo); + return map; + } + + //分子公司数量 + @RequestMapping(value = "/getCorpCount") + @ResponseBody + public Object getCorpCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = biTongjiService.listAllCorp(pd); + int size = pageData.size(); + map.put("corpCount", size); + map.put("result", errInfo); + return map; + } + + // 股份公司部门数量 + @RequestMapping(value = "/getRegulatoryDepartmentCount") + @ResponseBody + public Object getRegulatoryDepartmentCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("PARENT_ID", "28945926d1e34cad8c6a91e2a18ae0ce"); // BI页统计只查询港股第一级部门 + List pageData = (List) departmentService.listAll(pd); + int size = pageData.size(); + map.put("regulatoryDepartmentCount", size); + map.put("result", errInfo); + return map; + } + + // 相关方单位数 + @RequestMapping("/unitCorpCount") + @ResponseBody + public Map getUnitCorpCount() { + Map result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class); + String errInfo = "success"; + List unitCorp = (List) result.get("unitCorp"); + int size = unitCorp.size(); + Map map = new HashMap<>(); + map.put("unitCorpCount", size); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 部门使用情况 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpDeptCount") + @ResponseBody + public Object getCorpDeptCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpDeptCount = biTongjiService.getCorpDeptCount(pd); // 所有需要统计的企业信息 + Map corpLevelMap = new HashMap<>(); + for (PageData pageData : corpDeptCount) { + corpLevelMap.put(pageData.getString("CORPINFO_ID") + "-" + pageData.getString("LEVEL"), pageData.getString("count")); + } + String[] levelAll = {"departmentLevel0001", "departmentLevel0002", "departmentLevel0003",}; + + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList) { + Map valMap = new HashMap<>(); + for (int le = 0; le < levelAll.length; le++) { + String key = corpinfo.getString("CORPINFO_ID") + "-" + levelAll[le]; + String deptLevelCount = "0"; + if (corpLevelMap.containsKey(key)) { + deptLevelCount = corpLevelMap.get(key).toString(); + } + valMap.put(levelAll[le], deptLevelCount); + } + valMap.put("corpName", corpinfo.getString("CORP_NAME")); + valList.add(valMap); + } + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsCountAndHiddeCount") + @ResponseBody + public Object getSuperInsCountAndHiddeCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Integer superInsCount = biTongjiService.getInsCountBySuper(pd); + Integer superHiddenCount = biTongjiService.getHiddenCountBySuper(pd); + map.put("superInsCount", superInsCount); + map.put("superHiddenCount", superHiddenCount); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsBySubjectAndTop") + @ResponseBody + public Object getSuperInsBySubjectAndTop() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + + List count = biTongjiService.getSuperInsCountBySubjec(pd); + List insList = biTongjiService.getSuperInsTop(pd); + map.put("count", count); + map.put("insList", insList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患来源 日常检查 安环环保检查 隐患快报 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountBySubject") + @ResponseBody + public Object getHiddenCountBySubject() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountBySubjec(pd); + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患处置情况 忽略 一般 重大 特殊 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHiddenLevel") + @ResponseBody + public Object getHiddenCountByHiddenLevel() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByHiddenLevel(pd); + Integer countByStateIsSpecial = biTongjiService.getHiddenCountBySpecial(pd); + PageData pecial = new PageData(); + pecial.put("count", countByStateIsSpecial); + pecial.put("HIDDENLEVEL", "pecial"); + valList.add(pecial); + + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getHiddenCountByCorpInfoHandle") + @ResponseBody + public Object getHiddenCountByCorpInfoHandle() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByCorpInfoHandle(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 获取高危作业数量 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHighriskworkCount") + @ResponseBody + public Object getHighriskworkCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHighriskworkCount(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/bus/BiTongjiController.java b/src/main/java/com/zcloud/controller/bus/BiTongjiController.java new file mode 100644 index 00000000..3dd51d36 --- /dev/null +++ b/src/main/java/com/zcloud/controller/bus/BiTongjiController.java @@ -0,0 +1,454 @@ +package com.zcloud.controller.bus; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.bus.HiddenService; +import com.zcloud.service.map.BiTongjiService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.service.system.corpsystem.CorpUsersService; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/biTongji") +public class BiTongjiController extends BaseController { + + @Autowired + private BiTongjiService biTongjiService; + @Autowired + private UsersService usersService; + @Autowired + private CorpInfoService corpInfoService; + @Autowired + private DepartmentService departmentService; + @Autowired + private CorpUsersService corpUsersService; + @Autowired + private HiddenService hiddenService; + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getCountInsByCorpSource") + @ResponseBody + public Object getCountInsByCorpSource() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("istongji","1"); //2023年10月31日17:34:28 孙部提出的BI右侧中间的只统计 19加数据 + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List insList = biTongjiService.getCountInsByCorpSource(pd); // 数据库中有的 + List hidList = biTongjiService.getHiddenBySource(pd); + Map insMap = new HashMap<>(); // key= 企业id + 标识 ；val = 数量 ; 检查来源（4-监管端 5-企业端） + for (PageData pageData: insList){ + String key = pageData.getString("CORPINFO_ID") +"_" + pageData.getString("INSPECTION_SOURCE"); + String val = pageData.getString("count"); + insMap.put(key,val); + } + Map hidMap = new HashMap<>(); + for (PageData pageData: hidList){ + String key = pageData.getString("CORPINFO_ID") +"_" + pageData.getString("SOURCE"); + String val = pageData.getString("count(*)"); + hidMap.put(key,val); + } + List> valList = new ArrayList<>(); + for (PageData corpinfo : corpinfoAllList){ + String supeCount = "0"; + String corpCount = "0"; + String supeHiddenCount = "0"; + String corpHiddenCount = "0"; + String corpinfoID = corpinfo.getString("CORPINFO_ID"); + if(insMap.containsKey(corpinfoID + "_4")){ + supeCount = insMap.get(corpinfoID + "_4"); + } + if(insMap.containsKey(corpinfoID + "_5")){ + corpCount = insMap.get(corpinfoID + "_5"); + } + if(hidMap.containsKey(corpinfoID + "_4")){ + supeHiddenCount = hidMap.get(corpinfoID + "_4"); + } + if(hidMap.containsKey(corpinfoID + "_5")){ + corpHiddenCount = hidMap.get(corpinfoID + "_5"); + } + Map corpinfoCount = new HashMap<>(); + corpinfoCount.put("corpinfName",corpinfo.getString("CORP_NAME")); + corpinfoCount.put("supeCount",supeCount); + corpinfoCount.put("corpCount",corpCount); + corpinfoCount.put("supeHiddenCount",supeHiddenCount); + corpinfoCount.put("corpHiddenCount",corpHiddenCount); + valList.add(corpinfoCount); + } + map.put("varList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 客户数据 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/getUserCount") + @ResponseBody + public Object getUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Integer corpUserCount = biTongjiService.getCorpUser(pd); // 企业的所有人数 + Integer superUserCount = biTongjiService.getSupeUser(pd); // 部门的所有人数 + map.put("corpUserCount", corpUserCount); + map.put("superUserCount", superUserCount); + map.put("result", errInfo); + return map; + } + + /** + * 分公司使用统计 -- 人员数量 + * @return + * @throws Exception + */ + + //分子公司人员数量 + @RequestMapping(value = "/getcorpUserCount") + @ResponseBody + public Object getcorpUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = corpUsersService.listAllUser(pd); + int size = pageData.size(); + map.put("corpUserCount",size); + map.put("result", errInfo); + return map; + } + + //监控端用户数量 + @RequestMapping(value = "/getRegulatoryUserCount") + @ResponseBody + public Object getRegulatoryUserCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = usersService.listAllUser(pd); + int size = pageData.size(); + map.put("regulatoryUserCount",size); + map.put("result", errInfo); + return map; + } + + //分子公司数量 + @RequestMapping(value = "/getCorpCount") + @ResponseBody + public Object getCorpCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List pageData = corpInfoService.listAll(pd); + int size = pageData.size(); + map.put("corpCount",size); + map.put("result", errInfo); + return map; + } + + //股份公司部门数量 + @RequestMapping(value = "/getRegulatoryDepartmentCount") + @ResponseBody + public Object getRegulatoryDepartmentCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("PARENT_ID", "28945926d1e34cad8c6a91e2a18ae0ce"); // BI页统计只查询港股第一级部门 + List pageData = (List)departmentService.listAll(pd); + int size = pageData.size(); + map.put("regulatoryDepartmentCount",size); + map.put("result", errInfo); + return map; + } + + //隐患数 港股检查发现隐患数 分子公司发现隐患数 + @RequestMapping(value = "/getHiddenDangerCount") + @ResponseBody + public Object getHiddenDangerCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List hiddenList = hiddenService.listAll(pd); + int allHiddenCount = hiddenList.size(); + int regulatoryHiddenCount = hiddenService.findBySource(5).size(); + int corpHiddenCount = hiddenService.findBySource(4).size(); + map.put("allHiddenCount",allHiddenCount); + map.put("regulatoryHiddenCount",regulatoryHiddenCount); + map.put("corpHiddenCount",corpHiddenCount); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getCorpUserCountTop10") + @ResponseBody + public Object getCorpUserCountTop10() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List corpUserCountTop10 = biTongjiService.getCorpUserCountTop10(pd); // 所有需要统计的企业信息 + map.put("corpUserCountTop10", corpUserCountTop10); + map.put("result", errInfo); + return map; + } + /** + * 分公司使用统计 -- 部门使用情况 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getCorpDeptCount") + @ResponseBody + public Object getCorpDeptCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpDeptCount = biTongjiService.getCorpDeptCount(pd); // 所有需要统计的企业信息 + Map corpLevelMap = new HashMap<>(); + for (PageData pageData : corpDeptCount){ + corpLevelMap.put(pageData.getString("CORPINFO_ID") + "-" + pageData.getString("LEVEL") ,pageData.getString("count")); + } + String[] levelAll = {"departmentLevel0001", "departmentLevel0002", "departmentLevel0003",}; + + List> valList = new ArrayList<>(); + for (PageData corpinfo :corpinfoAllList){ + Map valMap = new HashMap<>(); + for (int le = 0;le map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); +// Integer superInsCount = biTongjiService.getInsCountBySuper(pd); +// Integer superHiddenCount = biTongjiService.getHiddenCountBySuper(pd); + + List superInsCount = biTongjiService.getInsCountPageBySuper(pd); + List superHiddenCount = biTongjiService.getHiddenCountPageBySuper(pd); + + map.put("superInsCount", superInsCount); + map.put("superHiddenCount", superHiddenCount); + map.put("result", errInfo); + return map; + } + + /** + * bus_inspection_safetyenvironmental + * 秦港股份 统计 - 安全环保检查此事- 发现隐患数 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getSuperInsBySubjectAndTop") + @ResponseBody + public Object getSuperInsBySubjectAndTop() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + + List count = biTongjiService.getSuperInsCountBySubjec(pd); + List insList = biTongjiService.getSuperInsTop(pd); + map.put("count", count); + map.put("insList", insList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患来源 隐患排查 安环环保检查 隐患快报 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountBySubject") + @ResponseBody + public Object getHiddenCountBySubject() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountBySubjec(pd); + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + + /** + * 海因里希 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHeinrich") + @ResponseBody + public Object getHiddenCountByHeinrich() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + PageData valList = biTongjiService.getHiddenCountByHeinrich(pd); + map.put("pd", valList); + map.put("result", errInfo); + return map; + } + + /** + * 隐患处置情况 忽略 一般 重大 特殊 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHiddenCountByHiddenLevel") + @ResponseBody + public Object getHiddenCountByHiddenLevel() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByHiddenLevel(pd); + Integer countByStateIsSpecial = biTongjiService.getHiddenCountBySpecial(pd); + PageData pecial = new PageData(); + pecial.put("count",countByStateIsSpecial); + pecial.put("HIDDENLEVEL","pecial"); + valList.add(pecial); + + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + @RequestMapping(value = "/getHiddenCountByCorpInfoHandle") + @ResponseBody + public Object getHiddenCountByCorpInfoHandle() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHiddenCountByCorpInfoHandle(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + /** + * 获取高危作业数量 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getHighriskworkCount") + @ResponseBody + public Object getHighriskworkCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List valList = biTongjiService.getHighriskworkCount(pd); + + map.put("valList", valList); + map.put("result", errInfo); + return map; + } + /** + * 列表 + * + * @throws Exception + */ + @RequestMapping(value = "/statisticsByCorpinfo") + @ResponseBody + public Object mainStatisticsByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("CITY_CODE", Jurisdiction.getUserCityCode()); + + List corpinfoAllList = biTongjiService.getCorpinfoAllByOrder(pd); // 所有需要统计的企业信息 + List corpinfoCount = biTongjiService.mainStatisticsByCorpinfo(pd); + Map corpMap = new HashMap<>(); + for (PageData pageData :corpinfoCount){ + corpMap.put(pageData.getString("corpId"),pageData); + } + + + List varList = new ArrayList<>(); + for (PageData corpinfo:corpinfoAllList){ + PageData valMap = new PageData(); + valMap.put("SBHD_NUM","0"); + valMap.put("ZGHD_NUM","0"); + valMap.put("corpId",corpinfo.getString("CORPINFO_ID")); + valMap.put("corpName",corpinfo.getString("CORP_NAME")); + if(corpMap.containsKey(corpinfo.getString("CORPINFO_ID"))){ + PageData countMap = corpMap.get(corpinfo.getString("CORPINFO_ID")); + valMap.put("SBHD_NUM",countMap.getString("SBHD_NUM")); + valMap.put("ZGHD_NUM",countMap.getString("ZGHD_NUM")); + } + varList.add(valMap); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/mainInsByCorpinfo") + @ResponseBody + public Object mainInsByCorpinfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + List varList = this.biTongjiService.mainInsByCorpinfo(pd); + + + map.put("varList", varList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java new file mode 100644 index 00000000..99296de5 --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -0,0 +1,987 @@ +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.bus.CorpInfoService; +import com.zcloud.service.keyProjects.VideoManagerService; +import com.zcloud.service.map.*; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.service.map.util.WeatherUtil; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import java.util.*; + +/** + * 说明：实时地图 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/map") +public class MapController extends BaseController { + + + @Autowired + private VideoManagerService videomanagerService; + @Autowired + private CorpInfoService corpInfoService; + + @Autowired + private UsersService usersService; + + @Autowired + private MeteorologicalinfoService meteorologicalinfoService; + @Autowired + private MeteorologicalService meteorologicalService; + @Autowired + private RestTemplate restTemplate; + + @Value("${preventionxgf.api.url}") + private String url; + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + + @Autowired + private BiMapService biMapService; + @Autowired + private FireResourcesService fireResourcesService; + + @Autowired + private DepartmentService departmentService; + + @Autowired + private GateMachineService gateMachineService; + + @Autowired + private WeatherUtil weatherUtil; + + @ResponseBody + @RequestMapping("/getCorpInfo") + public Object getCorpInfo() throws Exception { + Map map = new HashMap(); + PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + + PageData entity = corpInfoService.findById(condition); + PageData info = new PageData(); + info.put("CORP_INFO_ID",entity.get("CORPINFO_ID")); + info.put("longitude",entity.get("LONGITUDE")); + info.put("latitude",entity.get("LATITUDE")); + map.put("info", info); + map.put("result", "success"); + return map; + } + + /** + * @Description: 单位基础信息 + * @Author: dearLin + * @Date: 2023/9/21/021 16:14 + * @Param: AREA + * @Return: java.lang.Object + */ + @RequestMapping(value = "/basicInformation") + @ResponseBody + public Object basicInformation() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + // 分公司数量 + PageData numberCountData = corpInfoService.listAllByArea(pd); + // 相关方单位数 + // 0 ->分公司企业数 + // 1 ->相关方单位数 + // 2 ->员工数 + Map result = restTemplate.getForObject(url + "/api/corpinfo/unitCorpInfo", Map.class); + List unitCorp = (List) result.get("unitCorp"); + int size = unitCorp != null ? unitCorp.size() : 0; + // 员工数 + PageData userCountData = usersService.countAllByArea(pd); + PageData resData = new PageData(); + resData.put("UNITCOUNT", size); + resData.putAll(numberCountData); + resData.putAll(userCountData); + map.put("data", resData); + map.put("result", errInfo); + return map; + } + + /** + * @Description: 风险区域统计 + * @Author: dearLin + * @Date: 2023/9/21/021 16:14 + * @Param: AREA + * @Return: 重大风险区域数 + * @Return: 较大风险区域数 + * @Return: 一般风险区域数 + * @Return: 低风险区域数 + */ + @RequestMapping(value = "/getRiskAreaCount") + @ResponseBody + public Object getRiskAreaCount() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List riskIndex = biMapService.getRiskIndex(pd); + PageData pageData = new PageData(); + riskIndex.forEach(item -> { + pageData.put(item.getString("TYPE"), item.getString("COUNT")); + }); + map.put("pd", pageData); + map.put("result", errInfo); + return map; + } + + /** + * listRetrieval + * + * @Description: 单位人员信息统计 + * @Author: dearLin + * @Date: 2023/9/21/021 17:48 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value = "/getUnitPersonnel") + @ResponseBody + public Object getUnitPersonnel(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + page.setPd(pd); + if (pd.getString("INDEX").equals("0")) { + List varList = corpInfoService.listRetrieval(page); + map.put("varList", varList); + map.put("page", page); + } else { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("showCount", page.getShowCount()); + paramMap.add("currentPage", pd.get("currentPage")); +// Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/list", pd); + Map result = restTemplate.postForObject(xgfUrl + "/api/corpinfo/list", paramMap, Map.class); + map.put("varList", result.get("varList")); + map.put("page", result.get("page")); + } + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/corpsForMap") + @ResponseBody + public Object corpsForMap() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = corpInfoService.listAllForMap(pd); //根据ID读取 + for (PageData pageData : varList) { + if (StringUtils.isBlank(pageData.getString("CORP_NAME"))) { + pageData.put("MAP_POINT_NAME", ""); + } else { + pageData.put("MAP_POINT_NAME", pageData.getString("CORP_NAME")); + } + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbymeteorological") + @ResponseBody + public Object listbymeteorological() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + pd = meteorologicalinfoService.listbymeteorological(pd); //列出meteorological列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listbyType") + @ResponseBody + public Object listbyType(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + page.setPd(pd); + if (pd.getString("INDEX").equals("0") || "".equals(pd.getString("INDEX"))) { + List varList = meteorologicalService.listbyType(page); + for (PageData data : varList) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + map.put("varList", varList); + map.put("page", page); + } +// List varList = meteorologicalService.listbyType(page); //列出electronic列表 +// map.put("varList", varList); +// map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 设备数量 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listbyequipmentcount") + @ResponseBody + public Object listbyequipmentcount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = biMapService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + map.put("result", errInfo); + return map; + } + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + pd = meteorologicalService.listbyequipmentcount(pd); //列出electronic列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 根据id以及类型获取气象监测信息数据 + * + * @param id 数据id + * @param type 数据类型 气象站 等等 + * @return + */ + @RequestMapping(value = "/getById") + @ResponseBody + public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if (StringUtils.equals(typeStr, "293187ddfd984c9ab3fd716aef58da0e")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "561347f0cff641dba8b2b22c0f443348")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "2da29f00852a4653ba3e760b9de57412")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } else if (StringUtils.equals(typeStr, "732fe73933b845c6b1e2aee06a38ed31")) { + pd.put("METEOROLOGICAL_ID", idStr); + pd = biMapService.listbymeteorological(pd); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getWeatherInfo") + @ResponseBody + public Object getWeatherInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + map.put("data", WeatherUtil.getWeatherInfo()); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/getPointsInfo") + @ResponseBody + public Object getPointsInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + + List pointsList = videomanagerService.getPointsInfo(pd); //根据ID读取 + map.put("pointsList", pointsList); + map.put("result", errInfo); + return map; + } + /*************************************************/ + + /** + * @Description: 风险辨识管控 + * 风险单元数 + * 辨识部位数 + * 风险因素数 + * @Author: dearLin + * @Date: 2023/9/19/019 16:14 + * @Param: CORPINFO_ID + * @Return: java.lang.Object + */ + @RequestMapping("/getRiskIdentificationCount") + @ResponseBody + public Object getRiskIdentificationCount() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + // bus_riskunit + // bus_identificationparts + + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/getRiskList", paramMap, Map.class); + return result; + } + PageData data = biMapService.getRiskIdentificationCount(pageData); + map.put("result", "success"); + map.put("riskIdentificationCount", data); + return map; + } + // 人员定位信息 + + /** + * @Description: 人员定位信息 + * @Author: dearLin + * @Date: 2023/9/20/020 11:06 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getPersonPositioningCount") + @ResponseBody + public Object getPersonPositioningCount() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = new HashMap(); + try { + result = restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/getUsersCount", paramMap, Map.class); + } catch (Exception e) { + result.put("regulatoryUsersInfo", 0); + result.put("preventionUsersInfo", 0); + } + try { + + Map perResult = restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentLocationOnlineCount", paramMap, Map.class); + result.put("perCount", perResult.get("perCount")); + } catch (Exception e) { + result.put("perCount", 0); + } + + return result; + } + // bus_riskunit + // bus_identificationparts + PageData data = biMapService.getPersonPositioningCount(pageData); + map.put("result", "success"); + map.put("personPositioningCount", data); + return map; + } + + /** + * @Description: 口门管理 Gate management + * @Author: dearLin + * @Date: 2023/9/20/020 11:07 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping("/getDoorManagement") + @ResponseBody + public Object getDoorManagement() { + Map map = new HashMap(); + PageData pageData = this.getPageData(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pageData.get("id")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPerpleCarGateMachineCount", paramMap, Map.class); + return result; + } + List data = new ArrayList<>(); + PageData riskIndex = new PageData(); + riskIndex.put("title", "风险指数"); + riskIndex.put("list", biMapService.getRiskIndex(pageData)); + data.add(riskIndex); + // 今日情况 + /* + * todo + * 是否也按照公司来进行统计 + * bus_carduser 人员进出 + * bus_foreigncar 车辆进出 + * + * */ + PageData today = new PageData(); + today.put("title", "今日情况"); + today.put("list", biMapService.inAndoutPeoCarToday(pageData)); + data.add(today); + map.put("result", "success"); + map.put("varList", data); + return map; + } + + @RequestMapping("/getPointInfoADeviceByPid") + @ResponseBody + public Object getPointInfoADeviceByPid() { + PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("FIRE_POINT_ID", pd.getString("FIRE_POINT_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getPointInfoADeviceByPid", paramMap, Map.class); + return result; + } + PageData map = fireResourcesService.getPointInfoADeviceByPid(pd); + map.put("result", "success"); + return map; + } + + @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; + } + + /** + * 气象信息对接接口 + * + * @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(); + 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; + } + + /** + * @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(); + 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 + 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("/getCfdDoorWayRecords") + @ResponseBody + public ReturnMap getCfdDoorWayRecords() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("TYPE", pageData.get("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/listPerpleCarGateMachine", paramMap, Map.class); + return ReturnMap.ok(result); + } + + + /** + * @Description: 闸机进出车、人的数量 + * @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(); + if ("00004".equals(pageData.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pageData.get("id")); + paramMap.add("TYPE", pageData.get("TYPE")); + paramMap.add("status", pageData.get("status")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/getGatesInAndOutNumById", paramMap, Map.class); + return ReturnMap.ok(result); + } + PageData data = biMapService.getGatesInAndOutNumById(pageData); + returnMap.put("pd", data); + return returnMap; + } + + /** + * 人员进出记录列表 + * + * @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(); + //获取当前人的公司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; + } + + /** + * 获取人员、车辆进出记录 + * + * @param + * @return + */ + @RequestMapping(value = "/getPerpleCarGateMachineCount") + @ResponseBody + public Object getPerpleCarGateMachineCount() { + 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; + } + + @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; + } + + /** + * 获取人员、车辆进出记录 + * + * @param + * @return + */ + @RequestMapping(value = "/getCurrentLocationOnline") + @ResponseBody + public Object getCurrentLocationOnline() { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCurrentLocationOnline", paramMap, Map.class); + return result; + } else if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("carPosition")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/UserPosition/getCarCurrentLocationOnline", paramMap, Map.class); + return result; + } else if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("CAMERA")) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/ObtainDisplayData/listAllCameraForMap", paramMap, Map.class); + return result; + } + map.put("result", errInfo); + return map; + } + + // 获取人员定位信息 根据定位卡编码 + @RequestMapping(value = "/getPersonByCardNo") + @ResponseBody + public Object getPersonByCardNo() throws Exception { + 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(); + 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; + } + + /** + * 查询人员在线及统计数据(曹妃甸使用） + * + * @throws Exception + */ + @RequestMapping(value = "/getCurrentPersonnelData") + @ResponseBody + 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; + } + + @RequestMapping("/getUserMapInfo") + @ResponseBody + public ReturnMap getUserMapInfo() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = usersService.findByCardNo(pd); //列出HotWorkApplicationDelayed列表 + ReturnMap r = ReturnMap.ok(); + r.put("pd", pd); + return r; + } + +} diff --git a/src/main/java/com/zcloud/controller/map/MapEightCfdController.java b/src/main/java/com/zcloud/controller/map/MapEightCfdController.java new file mode 100644 index 00000000..65ad33fc --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapEightCfdController.java @@ -0,0 +1,76 @@ +package com.zcloud.controller.map; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.MapEightCfdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/map/Eight/cfd") +public class MapEightCfdController extends BaseController { + @Autowired + private MapEightCfdService mapEightCfdService; + + /** + * 根据id以及类型获取数据 + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getByIdOrder") + @ResponseBody + public Object getByIdOrder(@RequestParam(value = "id")String id,@RequestParam("TYPE") String type) throws Exception { + PageData pd = new PageData(); + pd = this.getPageData(); + return mapEightCfdService.getByIdOrder(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = mapEightCfdService.listAll(pd); //列出HotWorkApplicationDelayed列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**获取动火防护措施 + * @param + * @throws Exception + */ + @RequestMapping(value="/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = mapEightCfdService.listAllMeasures(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/map/MapEightController.java b/src/main/java/com/zcloud/controller/map/MapEightController.java new file mode 100644 index 00000000..9e6e291c --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapEightController.java @@ -0,0 +1,354 @@ +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.util.ReturnMap; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.client.RestTemplate; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作内容 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/map/Eight") +public class MapEightController extends BaseController { + + @Autowired + private MapEightService mapEightService; + @Value("${cfd.prevention.api.url}") + private String cfdUrl; + @Autowired + private RestTemplate restTemplate; + + /** + * @return + * @throws Exception + */ + @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); + } + } + + /** + * 可视化首页统计数据 + * + * @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(); + if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6", pd.getString("CORPINFO_ID"))) { // 一公司 + /*风险管控 数据统计*/ + //获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]） + PageData data = mapEightService.statisticsHighRiskWorkByState(pd); + map.put("pd", data); + }else if (StringUtils.equals("8854edee3aa94be496cee676b6d4845a", pd.getString("CORPINFO_ID"))) { //曹妃甸东 + MultiValueMap paramMap = new LinkedMultiValueMap(); + //paramMap.add("CORPINFO_ID", pd.getString("CORPINFO_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findFormCount", paramMap, Map.class); + return result; + } else { + PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); + map.put("pd", data); + } + //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + map.put("result", errInfo); + return map; + } + + /** + * 作业实时情况展示（最新18条） + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/listHighRiskWork") + @ResponseBody + 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"); + } + 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); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * + * @param + * @throws Exception + */ + @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 { + 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"))) { //一公司 + 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(); + 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(); + 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(); + 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(); + // 港口04消防点东港 + if ("00004".equals(pd.getString("GANGKOU"))) { + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("HOTWORKAPPLICATION_ID", pd.getString("HOTWORKAPPLICATION_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/listAllMeasures", paramMap, Map.class); + return result; + } + List varList = mapEightService.listAllMeasures(pd); //根据ID读取 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + + /** + * 根据id以及类型获取数据 //曹妃甸东 + * + * @param id 数据id + * @param type 数据类型 动火 等等 + * @return + */ + @RequestMapping(value = "/getByIdCfdD") + @ResponseBody + public Object getByIdCfdD(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception { + PageData pd = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("id", pd.getString("id")); + paramMap.add("TYPE", pd.getString("TYPE")); + paramMap.add("HOTWORK_ID", pd.getString("HOTWORK_ID")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getByIdOrder", paramMap, Map.class); + return result; + } + + /*曹妃甸专用接口-开始*/ + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getAllWorkUserCards") + @ResponseBody + public ReturnMap getAllWorkUserCards() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllWorkUserCards", paramMap, Map.class); + return ReturnMap.ok(result); + } + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getAllTickets") + @ResponseBody + public ReturnMap getAllTickets() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/getAllTickets", paramMap, Map.class); + return ReturnMap.ok(result); + } + + /** + * @Description: 获取八项作业所有作业人员 + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/findEightsByUserId") + @ResponseBody + public ReturnMap findEightsByUserId() { + PageData pageData = this.getPageData(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("empNo", pageData.getString("empNo")); + paramMap.add("TYPE", pageData.getString("TYPE")); + Map result = + restTemplate.postForObject(cfdUrl + "/sync/map/Eight/findEightsByUserId", paramMap, Map.class); + return ReturnMap.ok(result); + } + + + /*曹妃甸专用接口-结束*/ + +} diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java new file mode 100644 index 00000000..7b3f5160 --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java @@ -0,0 +1,121 @@ +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 new file mode 100644 index 00000000..c26eb59c --- /dev/null +++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java @@ -0,0 +1,92 @@ +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; + + /**总摄像头数 + * @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/mapper/datasource/bus/CorpInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java index 1964e42c..3d1f18d9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java @@ -76,5 +76,13 @@ public interface CorpInfoMapper{ //从公司端修改企业用户信息 新 void editCorpUserNew(PageData pd); + + List getCorpinfoIds(String[] arrayDATAIds); + + PageData listAllByArea(PageData pd); + + List datalistPageRetrieval(Page page); + + List listAllForMap(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/bus/HiddenMapper.java b/src/main/java/com/zcloud/mapper/datasource/bus/HiddenMapper.java index 31f7e220..7a942c2b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bus/HiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/bus/HiddenMapper.java @@ -352,5 +352,7 @@ public interface HiddenMapper{ void deleteForEmis(PageData pd); void saveForEmis(PageData pd); void updateGoConfirm (PageData pd); + + List findBySource(Integer sourceNumber); } 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/datasource/map/BiTongjiMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/BiTongjiMapper.java new file mode 100644 index 00000000..6a040653 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/BiTongjiMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * bi + */ +public interface BiTongjiMapper { + + List getCountInsByCorpSource(PageData pd); + + + List getCorpinfoAllByOrder(PageData pd); + + Integer getCorpUser(PageData pd); + + Integer getSupeUser(PageData pd); + + List getCorpUserCountTop10(PageData pd); + List getCorpDeptCount(PageData pd); + + + List getCorpinfoAllByDeptCountOrder(PageData pd); + + Integer getInsCountBySuper(PageData pd); + List getInsCountPageBySuper(PageData pd); + + + Integer getHiddenCountBySuper(PageData pd); + List getHiddenCountPageBySuper(PageData pd); + + + List getSuperInsCountBySubjec(PageData pd); + List getSuperInsTop(PageData pd); + List getHiddenCountBySubjec(PageData pd); + List getHiddenCountByHiddenLevel(PageData pd); + List getHighriskworkCount(PageData pd); + + Integer getHiddenCountBySpecial(PageData pd); + + List getHiddenCountByCorpInfoHandle(PageData pd); + List mainStatisticsByCorpinfo(PageData pd); + List mainInsByCorpinfo(PageData pd); + List getHiddenBySource(PageData pd); + + List getCorpUser2(PageData pd); + + List getSupeUser2(PageData pd); + + List listAllCorp(PageData pd); + + List getHiddenCountByHiddenType(PageData pageData); + + PageData getHiddenCountByHeinrich(PageData pd); +} + + diff --git a/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapper.java new file mode 100644 index 00000000..42159124 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/GateAreaMapper.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 GateAreaMapper { + 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/GateMachineMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapper.java new file mode 100644 index 00000000..994d9e75 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/GateMachineMapper.java @@ -0,0 +1,46 @@ +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 GateMachineMapper { + 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); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/map/GateVideoMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/GateVideoMapper.java new file mode 100644 index 00000000..6157c8f2 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/GateVideoMapper.java @@ -0,0 +1,75 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface GateVideoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + void savePosition(PageData pd); + void editIsShow(PageData pd); + void editIsShowBycorpinfoid(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listBo(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + PageData findByCode(PageData pd); + + List listAllForMap(PageData pd); + + List getPointsInfo(PageData pd); + + List getCameraPosition(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 new file mode 100644 index 00000000..f8fe4c5f --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -0,0 +1,401 @@ +package com.zcloud.mapper.datasource.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; +import java.util.Map; + +/** + * 说明：重点工程处罚 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapEightMapper { + + + List getCorpinfoIds(String[] ArrayDATA_IDS); + + /** + * 获取柱状图 + * @param pd + * @return + */ + List> getEcharts(PageData pd); + + + /** + * 获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]） + * @param pd + * @return + * @throws Exception + */ + PageData statisticsHighRiskWorkByState(PageData pd); + + + /** + * 作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List realTimeHighRiskWorklistPage(Page page); + + + /**动火查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getHOTWORKHighRiskWorkLocation(PageData pd); + + /**临时用电查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getELECTRICITYHighRiskWorkLocation(PageData pd); + + /**盲板查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getBLINDBOARDHighRiskWorkLocation(PageData pd); + + /**高处作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getHIGHWORKHighRiskWorkLocation(PageData pd); + + /**有限空间作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getCONFINEDSPACEHighRiskWorkLocation(PageData pd); + + /**吊装作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getHOISTINGHighRiskWorkLocation(PageData pd); + + + + + + + + /**动火查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdHOTWORK(PageData pd); + + /** + * 动火数据 + * @param pd + * @return + */ + List listAlldelayed(PageData pd); + + /** + * 动火数据 + * @param pd + * @return + */ + List listAllcuoshiHOTWORK(PageData pd); + /**动火措施查询 + * @param pd + * @return + */ + List listAllMeasuresHOTWORK(PageData pd); + + /**动火 + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**动火审批详情 + * @param pd + * @throws Exception + */ + List getList(PageData pd); + + + /**动火 + * @param pd + * @throws Exception + */ + List listAllMeasures(PageData pd); + + /**动火查询数据列表 + * @param pd + * @throws Exception + */ + List listAllHOTWORK(PageData pd); + + /**临时用电查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdELECTRICITY(PageData pd); + + /**临时用电措施查询 + * @param pd + * @return + */ + List listAllMeasuresELECTRICITY(PageData pd); + + /**盲板查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdBLINDBOARD(PageData pd); + + /**通过id数据经纬度 盲板 + * @param pd + * @throws Exception + */ + PageData findByIdJWD(PageData pd); + + /**盲板图片查询 + * @param pd + * @return + */ + List listAllBLINDBOARD(PageData pd); + + /**高处作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdHIGHWORK(PageData pd); + + /**高处作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresHIGHWORK(PageData pd); + + /**有限空间作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdCONFINEDSPACE(PageData pd); + + /**有限空间作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCONFINEDSPACE(PageData pd); + + /**有限空间作业 + * @param pd + * @throws Exception + */ + List listAllCONFINEDSPACE(PageData pd); + + /**吊装作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdHOISTING(PageData pd); + + /**吊装作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresHOISTING(PageData pd); + + + /** + * 获取其他公司柱状图 + * @param pd + * @return + */ + List> getEchartsOrder(PageData pd); + + + /** + * 其他公司获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]） + * @param pd + * @return + * @throws Exception + */ + PageData statisticsHighRiskWorkByStateOrder(PageData pd); + + /** + * 其他公司作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List realTimeHighRiskWorklistPageOrder(Page page); + + /**临时用电查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getELECTRICITYHighRiskWorkLocationOrder(PageData pd); + + /**盲板查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getBLINDBOARDHighRiskWorkLocationOrder(PageData pd); + + /**高处作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getHIGHWORKHighRiskWorkLocationOrder(PageData pd); + + /**有限空间作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getCONFINEDSPACEHighRiskWorkLocationOrder(PageData pd); + + /**吊装作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getHOISTINGHighRiskWorkLocationOrder(PageData pd); + + /**破土作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getBREAKGROUNDHighRiskWorkLocationOrder(PageData pd); + + + /**断路作业查询数据（有坐标数据） + * @param pd + * @throws Exception + */ + List getCUTROADHighRiskWorkLocationOrder(PageData pd); + + /**临时用电查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdELECTRICITYOrder(PageData pd); + + /**临时用电措施查询 + * @param pd + * @return + */ + List listAllMeasuresELECTRICITYOrder(PageData pd); + + + List listAllGasELECTRICTITYOrder(PageData pd); + + /**盲板查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdBLINDBOARDOrder(PageData pd); + + /**通过id数据经纬度 盲板 + * @param pd + * @throws Exception + */ + PageData findByIdJWDOrder(PageData pd); + + + /** + * 获取盲板安全措施数据 + * @param pd + * @return + */ + List listAllMeasuresBLINDBOARDOrder(PageData pd); + + + /**高处作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdHIGHWORKOrder(PageData pd); + + /**高处作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresHIGHWORKOrder(PageData pd); + + /**吊装作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdHOISTINGOrder(PageData pd); + + /**吊装作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresHOISTINGOrder(PageData pd); + + /**破土作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdBREAKGROUNDOrder(PageData pd); + + /**破土作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresBREAKGROUNDOrder(PageData pd); + + /**断路作业查询数据 + * @param pd + * @throws Exception + */ + PageData findByIdCUTROADOrder(PageData pd); + + /**断路作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCUTROADOrder(PageData pd); + + /** + * 动火获取字典展示 + * @param shuzu + * @return + */ + 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); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java new file mode 100644 index 00000000..fadcdac0 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java @@ -0,0 +1,59 @@ +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/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index 5fdb5712..60c8ea25 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -181,5 +181,7 @@ public interface DepartmentMapper{ List listSubCorpDepartmentByParentId(String parentId); PageData findByCorpDepartmentId(PageData condition); + + List listTreeManageAndCorp(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 9bce4376..73227ebc 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -302,4 +302,10 @@ public interface UsersMapper { PageData getUserInfo(PageData pd); List getUsersInfo(PageData pd); + + PageData countAllByArea(PageData pd); + + PageData getPersonByCardNo(PageData pd); + + PageData findByCardNo(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/DataDockingLogMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/DataDockingLogMapper.java new file mode 100644 index 00000000..aa74d874 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/DataDockingLogMapper.java @@ -0,0 +1,59 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：曹妃甸数据对接日志 + * 作者：luoxiaobao + * 时间：2023-09-11 + * 官网：www.zcloudchina.com + */ +public interface DataDockingLogMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/FireResourcesMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/FireResourcesMapper.java new file mode 100644 index 00000000..7d94e5cf --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/FireResourcesMapper.java @@ -0,0 +1,68 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.LinkedList; +import java.util.List; + +@Mapper +public interface FireResourcesMapper { + /**新增 + * @param pd + */ + void save(PageData pd); + + /**删除 + * @param pd + */ + void delete(PageData pd); + + /**修改 + * @param pd + */ + void edit(PageData pd); + + /**列表 + * @param page + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + */ + PageData findById(PageData pd); + + LinkedList getControlRoomDataList(PageData pageData); + LinkedList getPumpRoomDataList(PageData pageData); + LinkedList getRescueTeamDataList(PageData pageData); + LinkedList getWaterSourceDataList(PageData pageData); + + LinkedList getPointDataList(PageData pageData); + + PageData getDataById(PageData pddata); + + + List getCheckRecordByPid(PageData pageData); + + + PageData findPointById(PageData pageData); + + List listAll4H5(PageData pageData); + + List getPointQualifiedPhotosByEpid(PageData pageData); + + List getPointQualifiedPhotos(PageData pageData); + + List goRecordDeviceByPid(PageData pd); + + List devicelistPage(Page page); + + List getPointCheckPhotoById(PageData pageData); +} diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalMapper.java new file mode 100644 index 00000000..555daa03 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalMapper.java @@ -0,0 +1,83 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + void savePosition(PageData pd); + void editIsShow(PageData pd); + void editIsShowBycorpinfoid(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listBo(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List listByEquipmentdatalistPage(Page page); + List listbyTypeLocation(PageData pd); + PageData listbyequipmentcount(PageData pd); + List listbyType(Page page); + + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + PageData findByCode(PageData pd); + + List listAllForMap(PageData pd); + + List getPointsInfo(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java new file mode 100644 index 00000000..c51056b7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/MeteorologicalinfoMapper.java @@ -0,0 +1,104 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalinfoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + void savePosition(PageData pd); + void editIsShow(PageData pd); + void editIsShowBycorpinfoid(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表 + * @param page + * @throws Exception + */ + PageData listbymeteorological(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listBo(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List listbyinfodatalistPage(Page page); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + PageData findByCode(PageData pd); + + List listAllForMap(PageData pd); + + List getPointsInfo(PageData pd); + + /** + * 根据部门ID列表查询气象信息 + * @param pd + * @return + */ + List getMeteorologicalinfoListByIds(PageData pd); + + Integer insertAll(@Param("list") List list); + + Integer updateMeteorologicalinfo(PageData pageData); + + /** + * 10秒内相同设备的数据 + * @param pd + * @return + */ + List tensList(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java b/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java new file mode 100644 index 00000000..e3b1a705 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/map/PlatformelectronicMapper.java @@ -0,0 +1,69 @@ +package com.zcloud.mapper.dsno2.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformelectronicMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 获取总摄像头数 + * @param pd + * @return + */ + Integer countAllForMap(PageData pd); + + + List countAllByArea(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/bus/CorpInfoService.java b/src/main/java/com/zcloud/service/bus/CorpInfoService.java index 3f51604d..b23168d9 100644 --- a/src/main/java/com/zcloud/service/bus/CorpInfoService.java +++ b/src/main/java/com/zcloud/service/bus/CorpInfoService.java @@ -88,5 +88,11 @@ public interface CorpInfoService{ * @throws Exception */ void editCorpUserNew(PageData pd)throws Exception; + + PageData listAllByArea(PageData pd) throws Exception; + + List listRetrieval(Page page) throws Exception; + + List listAllForMap(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/bus/HiddenService.java b/src/main/java/com/zcloud/service/bus/HiddenService.java index 88cad8ae..edbefe61 100644 --- a/src/main/java/com/zcloud/service/bus/HiddenService.java +++ b/src/main/java/com/zcloud/service/bus/HiddenService.java @@ -1,6 +1,8 @@ package com.zcloud.service.bus; import java.util.List; +import java.util.Map; + import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -442,5 +444,8 @@ public interface HiddenService{ * @throws Exception */ public void updateGoConfirm(PageData hiddens)throws Exception; + + //根据Source查询Hidden + public List findBySource(Integer sourceNumber); } diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index a68630c9..fadc0770 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -121,5 +121,20 @@ public class CorpInfoServiceImpl implements CorpInfoService{ public void editCorpUserNew(PageData pd) throws Exception { corpinfoMapper.editCorpUserNew(pd); } + + @Override + public PageData listAllByArea(PageData pd) throws Exception { + return corpinfoMapper.listAllByArea(pd); + } + + @Override + public List listRetrieval(Page page) throws Exception { + return corpinfoMapper.datalistPageRetrieval(page); + } + + @Override + public List listAllForMap(PageData pd) throws Exception { + return corpinfoMapper.listAllForMap(pd); + } } diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java index 9eb2acd9..d241489a 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java @@ -703,5 +703,10 @@ public class HiddenServiceImpl implements HiddenService{ public void updateGoConfirm(PageData hiddens)throws Exception{ hiddenMapper.updateGoConfirm(hiddens); } + + @Override + public List findBySource(Integer sourceNumber) { + return hiddenMapper.findBySource(sourceNumber); + } } diff --git a/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java new file mode 100644 index 00000000..be8cd94d --- /dev/null +++ b/src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java @@ -0,0 +1,34 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +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 FireResourcesService 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/BaseResultInterface.java b/src/main/java/com/zcloud/service/map/BaseResultInterface.java new file mode 100644 index 00000000..158c595f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BaseResultInterface.java @@ -0,0 +1,18 @@ +package com.zcloud.service.map; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +/** + * @desc 对象返回到前端以及异常抛出的接口类 + */ +public interface BaseResultInterface { + + + String getCode(); + + + String getMessage(); +} diff --git a/src/main/java/com/zcloud/service/map/BiMapService.java b/src/main/java/com/zcloud/service/map/BiMapService.java new file mode 100644 index 00000000..c1566624 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BiMapService.java @@ -0,0 +1,38 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.LinkedList; +import java.util.List; + +/** + * 说明：监管端Bi页map数据 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface BiMapService { + + List getDoorWayPeopleRecords(Page page); + + List getDoorWayCarRecords(Page page); + + PageData getRiskIdentificationCount(PageData pageData); + + public PageData listbymeteorological(PageData pd)throws Exception; + + List getCorpinfoIds(PageData pd); + + + PageData getPersonPositioningCount(PageData pageData); + + List getRiskIndex(PageData pageData); + + Object inAndoutPeoCarToday(PageData pageData); + + LinkedList getFireControl(PageData pageData) throws Exception; + + LinkedList getFireRescueTeam(PageData pageData); + + PageData getGatesInAndOutNumById(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/map/BiTongjiService.java b/src/main/java/com/zcloud/service/map/BiTongjiService.java new file mode 100644 index 00000000..195cd26e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/BiTongjiService.java @@ -0,0 +1,117 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface BiTongjiService { + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + */ + List getCountInsByCorpSource(PageData pd); + + /** + * 获取首页需要显示的企业信息 + * @param pd + * @return + */ + List getCorpinfoAllByOrder(PageData pd); + + /** + * 获取用户数量 + * @param pd + * @return + */ + Integer getCorpUser(PageData pd); + + Integer getSupeUser(PageData pd); + + List getCorpUserCountTop10(PageData pd); + List getCorpDeptCount(PageData pd); + + /** + * 分公司使用情况的前十部门数的分公司 + * @param pd + * @return + */ + List getCorpinfoAllByDeptCountOrder(PageData pd); + + /** + * 获取港股安全环保检查次数 + * @param pd + * @return + */ + public Integer getInsCountBySuper(PageData pd); + + public Integer getHiddenCountBySuper(PageData pd); + + /** + * 安全环保检查分类 数量 + * @param pd + * @return + */ + List getSuperInsCountBySubjec(PageData pd); + + /** + * 获取前十的安全环保的数据 + * @param pd + * @return + */ + List getSuperInsTop(PageData pd); + + /** + * 获取所有的隐患 -根据隐患类型分类 + * + */ + List getHiddenCountBySubjec(PageData pd); + + + /** + * 获取所有的隐患 -根据隐患等级分类 + * + */ + List getHiddenCountByHiddenLevel(PageData pd); + + /** + * 获取已经处理的特殊隐患 + * @param pd + * @return + */ + Integer getHiddenCountBySpecial(PageData pd); + + /** + * + */ + List getHighriskworkCount(PageData pd); + /** + * + */ + List getHiddenCountByCorpInfoHandle(PageData pd); + + + /** + * 首页统计 + */ + List mainStatisticsByCorpinfo (PageData pd); + + + + List mainInsByCorpinfo (PageData pd); + List getHiddenBySource (PageData pd); + + List getInsCountPageBySuper(PageData pd); + + List getHiddenCountPageBySuper(PageData pd); + + List getCorpUser2(PageData pd); + + List getSupeUser2(PageData pd); + + List listAllCorp(PageData pd); + + List getHiddenCountByHiddenType(PageData pageData); + + PageData getHiddenCountByHeinrich(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/map/CorpDepartmentService.java b/src/main/java/com/zcloud/service/map/CorpDepartmentService.java new file mode 100644 index 00000000..a775ca28 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/CorpDepartmentService.java @@ -0,0 +1,164 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; + +import java.util.List; + +/** + * 说明： 组织机构接接口 + * 创建人：FH Q313596790 + * 官网： + */ +public interface CorpDepartmentService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + /**通过名称获取数据 + * @param pd + * @throws Exception + */ + public PageData findByName(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId,String url) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId, List zdepartmentPdList) throws Exception; + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception; + + /**通过条件获取全部 + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过企业主部门 + * @param pd + * @throws Exception + */ + public PageData findByCorpId(PageData pd)throws Exception; + /**列表 关联 部门级别名称 + * @param page + * @throws Exception + */ + public List listForLevelName(Page page)throws Exception; + + /** + * 向下递归查询企业部门 + * @param pd + * @return + */ + List listTreeCorpDept(PageData pd)throws Exception; + + /** + * 向下递归查询企业部门（集团部门+子公司部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp(PageData pd)throws Exception; + + /** + * pc新增需求，重点工程中添加处罚人功能所用的 根据企业ID查询部门的service + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorpForPcPunishThePerson(PageData pd)throws Exception; + /** + * 向下递归查询企业部门（只查监管端部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp1(PageData pd)throws Exception; + /** + * 向下递归查询企业部门（只查企业端部门） + * @param pd + * @return + * @throws Exception + */ + List listTreeManageAndCorp2(PageData pd)throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd)throws Exception; + List listDept(PageData pd)throws Exception; + + public List listTreeCorp(String s)throws Exception; + + /** + * 使用数据库中的函数 + * 获取pid下的所有子集id + * @param pd + * @return + * @throws Exception + */ + public List getSonIdsByParid(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/map/DataDockingLogService.java b/src/main/java/com/zcloud/service/map/DataDockingLogService.java new file mode 100644 index 00000000..e25a1d99 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/DataDockingLogService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：曹妃甸数据对接日志 + * 作者：luoxiaobao + * 时间：2023-09-11 + * 官网：www.zcloudchina.com + */ +public interface DataDockingLogService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/map/FireResourcesService.java b/src/main/java/com/zcloud/service/map/FireResourcesService.java new file mode 100644 index 00000000..ef2fb17e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/FireResourcesService.java @@ -0,0 +1,62 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.springframework.web.multipart.MultipartFile; + +import java.util.LinkedList; +import java.util.List; + +/** + * @Description: 点检标准 + * @Author: dearLin + * @Date: 2023/3/8/008 17:21 + * @Param: + * @Return: + */ +public interface FireResourcesService { + /**新增 + * @param pd + */ + void save(PageData pd, MultipartFile[] files) throws Exception; + + /**删除 + * @param pd + */ + void delete(PageData pd); + + /**修改 + * @param pd + */ + void edit(PageData pd, MultipartFile[] files) throws Exception; + + /**列表 + * @param page + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + */ + PageData findById(PageData pd); + + //消防控制室 + LinkedList getControlRoomDataList(PageData pageData); + + PageData getDataById(PageData pddata); + + List getCheckRecordByPid(PageData pageData); + + PageData getPointInfoADeviceByPid(PageData pageData); + + List getPointQualifiedPhotos(PageData pageData); + + List goRecordDeviceByPid(PageData pd); + + List devicelistPage(Page page); +} diff --git a/src/main/java/com/zcloud/service/map/GateMachineService.java b/src/main/java/com/zcloud/service/map/GateMachineService.java new file mode 100644 index 00000000..0374fd59 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/GateMachineService.java @@ -0,0 +1,46 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public interface GateMachineService { + + + ArrayList getDatalistpage(Page page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void save(PageData pageData); + + PageData getOnlineGateMachine(PageData pageData); + + List getGatePosition(PageData pageData); + + PageData getGateMachineInfoById(PageData pageData); + + + List getPersonRecordCountByEId(PageData gateMachineInfo); + List getTodayInOutCount(PageData pd); + + List getCarRecordCountByEId(PageData gateMachineInfo); + + List getCarRecordCountByCorpId(PageData gateMachineInfo); + + /** + * 一公司 + * 今天闸机的进出记录 + * @param gateMachineInfo + * @return + */ + List getPersonRecordListAllByEId(Page page); +} diff --git a/src/main/java/com/zcloud/service/map/MapEightCfdService.java b/src/main/java/com/zcloud/service/map/MapEightCfdService.java new file mode 100644 index 00000000..02f55995 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapEightCfdService.java @@ -0,0 +1,36 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.PageData; + +import java.util.List; +import java.util.Map; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapEightCfdService { + + /**动火 + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**动火 + * @param pd + * @throws Exception + */ + List listAllMeasures(PageData pd); + + /** + * 获取其他公司详细数据 + * @param pd + * @return + */ + Map getByIdOrder(PageData pd) throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/map/MapEightService.java b/src/main/java/com/zcloud/service/map/MapEightService.java new file mode 100644 index 00000000..079e284a --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapEightService.java @@ -0,0 +1,99 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; +import java.util.Map; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapEightService { + + List getCorpinfoIds(PageData pd); + + Object getEcharts(PageData pd); + + PageData statisticsHighRiskWorkByState(PageData pd)throws Exception; + + /** + * 作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List listHighRiskWork(Page page)throws Exception; + + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * @param pd + * @return + * @throws Exception + */ + List listAllHighRiskWorkLocation(PageData pd)throws Exception; + + + /**动火 + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**动火 + * @param pd + * @throws Exception + */ + List listAllMeasures(PageData pd); + + /** + * 根据id获取数据 + * @param pd + * @return + */ + Map getById (PageData pd); + + /** + * 获取其他公司柱状图 + * @param pd + * @return + */ + Object getEchartsOrder(PageData pd); + + /** + * 其他公司获取统计数据 + * @param pd + * @return + * @throws Exception + */ + PageData statisticsHighRiskWorkByStateOrder(PageData pd)throws Exception; + + /** + * 其他作业实时情况展示 + * @param page + * @return + * @throws Exception + */ + List listHighRiskWorkOrder(Page page)throws Exception; + + + /** + * 获取所有高危作业的位置坐标（有坐标数据） + * @param pd + * @return + * @throws Exception + */ + List listAllHighRiskWorkLocationOrder(PageData pd)throws Exception; + + /** + * 获取其他公司详细数据 + * @param pd + * @return + */ + Map getByIdOrder(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/map/MapKetProjectService.java b/src/main/java/com/zcloud/service/map/MapKetProjectService.java new file mode 100644 index 00000000..c9ed7187 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MapKetProjectService.java @@ -0,0 +1,23 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +/** + * 说明：实施地图八项作业 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +public interface MapKetProjectService { + + Object findFormCount(PageData pd); + + Object listAllLocation(PageData pd); + + Object getById(PageData pd) throws Exception ; + + Object list(Page page); + +} + diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalService.java b/src/main/java/com/zcloud/service/map/MeteorologicalService.java new file mode 100644 index 00000000..25fb0073 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MeteorologicalService.java @@ -0,0 +1,85 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + public void savePosition(PageData pd)throws Exception; + public void editIsShowBycorpinfoid(PageData pd)throws Exception; + public void editIsShow(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listByEquipment(Page page)throws Exception; + + List listbyTypeLocation(PageData pd)throws Exception; + + public List listbyType(Page page)throws Exception; + + public PageData listbyequipmentcount(PageData pd)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public PageData findByCode(PageData video)throws Exception; + + public List listAllForMap(PageData pd)throws Exception; + + public List getPointsInfo(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java new file mode 100644 index 00000000..8b80b9d2 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/MeteorologicalinfoService.java @@ -0,0 +1,103 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.map.util.ReturnMap; + +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +public interface MeteorologicalinfoService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + public void savePosition(PageData pd)throws Exception; + public void editIsShowBycorpinfoid(PageData pd)throws Exception; + public void editIsShow(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表 + * @throws Exception + */ + public PageData listbymeteorological(PageData pd)throws Exception; + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listbyinfo(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public PageData findByCode(PageData video)throws Exception; + + public List listAllForMap(PageData pd)throws Exception; + + public List getPointsInfo(PageData pd)throws Exception; + + /**同步气象数据 + * @param list + * @throws Exception + */ + ReturnMap tongbuMeteorologicalinfo(List list) throws Exception; + + /**批量新增 + * @param list + * @throws Exception + */ + Integer saveMeteorologicalinfo(List list); + + /**修改气象数据 + * @param pageData + * @throws Exception + */ + Integer updateMeteorologicalinfo(PageData pageData); + +} + diff --git a/src/main/java/com/zcloud/service/map/PlatformelectronicService.java b/src/main/java/com/zcloud/service/map/PlatformelectronicService.java new file mode 100644 index 00000000..52281c56 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/PlatformelectronicService.java @@ -0,0 +1,65 @@ +package com.zcloud.service.map; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformelectronicService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + + Integer countAllForMap(PageData pd)throws Exception; + + + List countAllByArea(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java new file mode 100644 index 00000000..f4090294 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java @@ -0,0 +1,195 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; +import com.zcloud.mapper.datasource.map.BiMapMapper; +import com.zcloud.mapper.datasource.map.GateVideoMapper; +import com.zcloud.mapper.dsno2.keyProjects.VideoManagerMapper; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +import com.zcloud.service.map.AbsFireSourcesHandel; +import com.zcloud.service.map.AssemblyBeanFactory; +import com.zcloud.service.map.BiMapService; +import com.zcloud.service.map.GateMachineService; +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 GateVideoMapper gateVideoMapper; + @Resource + private VideoManagerMapper videoManagerMapper; + + + @Resource + private CorpInfoMapper corpInfoMapper; + + + /** + * @Description: 人记录 + * @Author: dearLin + * @Date: 2023/9/18/018 10:18 + * @Param: [com.zcloud.entity.Page] [page] + * @Return: java.util.List + */ + @Override + public List getDoorWayPeopleRecords(Page page) { + return biMapMapper.getPeopleRecordslistPage(page); + } + + /** + * @Description: 车记录 + * @Author: dearLin + * @Date: 2023/9/18/018 10:18 + * @Param: [com.zcloud.entity.Page] [page] + * @Return: java.util.List + */ + @Override + public List getDoorWayCarRecords(Page page) { + return biMapMapper.getCarRecordslistPage(page); + } + + @Override + public PageData getRiskIdentificationCount(PageData pageData) { + return biMapMapper.getRiskIdentificationCount(pageData); + // bus_riskunit + // bus_identificationparts + } + + + public PageData listbymeteorological(PageData pd) throws Exception { + return biMapMapper.listbymeteorological(pd); + } + + @Override + public List getCorpinfoIds(PageData pd) { + String area = pd.getString("AREA"); + if (StringUtils.isNotBlank(area)) { + String[] ArrayDATA_IDS = area.split(","); + return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + } + String gangkou = pd.getString("GANGKOU"); + if (StringUtils.equals("00003", gangkou)) { + String[] ArrayDATA_IDS = new String[]{"1", "2"}; + return biMapMapper.getCorpinfoIds(ArrayDATA_IDS); + } + return new ArrayList<>(); + } + + @Override + public PageData getPersonPositioningCount(PageData pageData) { + return biMapMapper.getPersonPositioningCount(pageData); + } + + @Override + public List getRiskIndex(PageData pageData) { + return biMapMapper.getRiskIndex(pageData); + } + + @Override + public List inAndoutPeoCarToday(PageData pageData) { + return biMapMapper.inAndoutPeoCarToday(pageData); + } + + /** + * @Description: 不一定用 + * @Author: dearLin + * @Date: 2023/9/20/020 16:42 + * @Param: [com.zcloud.entity.PageData] [pageData] + * @Return: java.util.LinkedList + */ + @Override + public LinkedList getFireControl(PageData pageData) throws Exception { +// GANGKOU 00003 秦皇岛岗 +// AREA 区域 +// CORPINFO_ID 区域 + + String area = pageData.getString("AREA"); + List corpinfoIds = null; + if (StringUtils.isNotBlank(area)) { + String[] ArrayDATA_IDS = area.split(","); + corpinfoIds = corpInfoMapper.getCorpinfoIds(ArrayDATA_IDS); + } else { + String gangkou = pageData.getString("GANGKOU"); + if (StringUtils.equals("00003", gangkou)) { + String[] ArrayDATA_IDS = new String[]{"1", "2"}; + corpinfoIds = corpInfoMapper.getCorpinfoIds(ArrayDATA_IDS); + } + } + if (corpinfoIds != null && corpinfoIds.size() > 0) { + if (Tools.isEmpty(pageData.getString("CORPINFO_ID"))) { + pageData.put("list", corpinfoIds); + } + } + String fireresourcesType = pageData.getString("TYPE"); + // 目前没有消防点位 + AbsFireSourcesHandel invokeStrategy = AssemblyBeanFactory.getInvokeStrategy(fireresourcesType); + if (invokeStrategy != null) { + return invokeStrategy.assemblyDataHandel(pageData); + } + + return new LinkedList<>(); + } + + + @Override + public LinkedList getFireRescueTeam(PageData pageData) { + return fireResourcesMapper.getRescueTeamDataList(pageData); + } + + @Override + public PageData getGatesInAndOutNumById(PageData pageData) { + PageData value = new PageData(); + // 基础信息 + if ("CAMERA".equals(pageData.getString("TYPE"))) { + pageData.put("GATEVIDEO_ID",pageData.getString("GATE_AREA_ID")); + pageData.put("GATE_AREA_ID",null); + PageData gateMachineInfo = gateMachineService.getGateMachineInfoById(pageData); + value.put("info", gateMachineInfo); + value.putAll(gateVideoMapper.findById(pageData)); + return value; + } + PageData gateMachineInfo = gateMachineService.getGateMachineInfoById(pageData); + if(Tools.isEmpty(gateMachineInfo)){ + return value; + } + value.put("info", gateMachineInfo); + gateMachineInfo.put("array",gateMachineInfo.getString("EQUIPMENTID").split(",")); + // 进出信息 + if ("CAR".equals(pageData.getString("TYPE"))) { + // 车进出 + // todo 车辆进出。现在需要配置闸机的id。 +// List recordList = gateMachineService.getCarRecordCountByEId(gateMachineInfo); + // 不配闸机的替代方案 用于展示 按照公司id去查，真是需要配置闸机的id + List recordList = gateMachineService.getCarRecordCountByCorpId(gateMachineInfo); + value.put("varList", recordList); + + } else { + // 人进出 + List recordList = gateMachineService.getPersonRecordCountByEId(gateMachineInfo); + value.put("varList", recordList); + } + return value; + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java new file mode 100644 index 00000000..8fa61b1a --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java @@ -0,0 +1,156 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.BiTongjiMapper; +import com.zcloud.service.map.BiTongjiService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Transactional //开启事物 +public class BiTongjiServiceImpl implements BiTongjiService { + @Resource + private BiTongjiMapper biTongjiMapper; + + /** + * 地图下方的统计 安全环保检查情况统计 + * 近8年数据 + * 港股公司和分公司 + */ + @Override + public List getCountInsByCorpSource(PageData pd) { + return biTongjiMapper.getCountInsByCorpSource(pd); + } + + @Override + public List getCorpinfoAllByOrder(PageData pd) { + return biTongjiMapper.getCorpinfoAllByOrder(pd); + } + + @Override + public Integer getCorpUser(PageData pd) { + return biTongjiMapper.getCorpUser(pd); + } + + @Override + public Integer getSupeUser(PageData pd) { + return biTongjiMapper.getSupeUser(pd); + } + @Override + public List getCorpUserCountTop10(PageData pd) { + return biTongjiMapper.getCorpUserCountTop10(pd); + } + @Override + public List getCorpDeptCount(PageData pd) { + return biTongjiMapper.getCorpDeptCount(pd); + } + + /** + * 分公司使用情况的前十部门数的分公司 + * + * @param pd + * @return + */ + @Override + public List getCorpinfoAllByDeptCountOrder(PageData pd) { + return biTongjiMapper.getCorpinfoAllByDeptCountOrder(pd); + } + + @Override + public Integer getInsCountBySuper(PageData pd) { + return biTongjiMapper.getInsCountBySuper(pd); + } + + @Override + public Integer getHiddenCountBySuper(PageData pd) { + return biTongjiMapper.getHiddenCountBySuper(pd); + } + + @Override + public List getSuperInsCountBySubjec(PageData pd) { + return biTongjiMapper.getSuperInsCountBySubjec(pd); + } + + @Override + public List getSuperInsTop(PageData pd) { + return biTongjiMapper.getSuperInsTop(pd); + } + + @Override + public List getHiddenCountBySubjec(PageData pd) { + return biTongjiMapper.getHiddenCountBySubjec(pd); + } + + @Override + public List getHiddenCountByHiddenLevel(PageData pd) { + return biTongjiMapper.getHiddenCountByHiddenLevel(pd); + } + + @Override + public List getHighriskworkCount(PageData pd) { + return biTongjiMapper.getHighriskworkCount(pd); + } + + @Override + public Integer getHiddenCountBySpecial(PageData pd) { + return biTongjiMapper.getHiddenCountBySpecial(pd); + } + + @Override + public List getHiddenCountByCorpInfoHandle(PageData pd) { + return biTongjiMapper.getHiddenCountByCorpInfoHandle(pd); + } + + @Override + public List mainStatisticsByCorpinfo(PageData pd) { + return biTongjiMapper.mainStatisticsByCorpinfo(pd); + } + + @Override + public List mainInsByCorpinfo(PageData pd) { + return biTongjiMapper.mainInsByCorpinfo(pd); + } + + @Override + public List getHiddenBySource(PageData pd) { + return biTongjiMapper.getHiddenBySource(pd); + } + + @Override + public List getInsCountPageBySuper(PageData pd) { + return biTongjiMapper.getInsCountPageBySuper(pd); + } + + @Override + public List getHiddenCountPageBySuper(PageData pd) { + return biTongjiMapper.getHiddenCountPageBySuper(pd); + } + + @Override + public List getCorpUser2(PageData pd) { + return biTongjiMapper.getCorpUser2(pd); + } + + @Override + public List getSupeUser2(PageData pd) { + return biTongjiMapper.getSupeUser2(pd); + } + @Override + public List listAllCorp(PageData pd) { + return biTongjiMapper.listAllCorp(pd); + } + + @Override + public List getHiddenCountByHiddenType(PageData pageData) { + return biTongjiMapper.getHiddenCountByHiddenType(pageData); + } + + @Override + public PageData getHiddenCountByHeinrich(PageData pd) { + return biTongjiMapper.getHiddenCountByHeinrich(pd); + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java new file mode 100644 index 00000000..41b9b2f5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/CorpDepartmentServiceImpl.java @@ -0,0 +1,267 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; +import com.zcloud.mapper.datasource.system.DepartmentMapper; +import com.zcloud.service.map.CorpDepartmentService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明： 组织机构 + * 创建人：FH Q313596790 + * 官网： + */ +@Service(value="corpDepartmentService") +@Transactional //开启事物 +public class CorpDepartmentServiceImpl implements CorpDepartmentService { + + @Autowired + private DepartmentMapper departmentMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + departmentMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + departmentMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + departmentMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return (List)departmentMapper.datalistPage(page); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return (PageData)departmentMapper.findById(pd); + } + /**通过名称获取数据 + * @param pd + * @throws Exception + */ + public PageData findByName(PageData pd)throws Exception{ + List dept = departmentMapper.findByName(pd); + if(dept != null && dept.size() > 0) { + return dept.get(0); + } else { + return null; + } + + } + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception{ + return (PageData)departmentMapper.findByBianma(pd); + } + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception { + return (List)departmentMapper.listSubDepartmentByParentId(parentId); + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID())); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId,String url) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl(url+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID(),url)); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId,List zdepartmentPdList) throws Exception { + List[] arrayDep = this.listAllbyPd(parentId,zdepartmentPdList); + List departmentPdList = arrayDep[1]; + for(PageData pd : departmentPdList){ + this.listAllDepartmentToSelect(pd.getString("id"),arrayDep[0]); + } + return arrayDep[0]; + } + + /**下拉ztree用 + * @param parentId + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List[] listAllbyPd(String parentId,List zdepartmentPdList) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + List departmentPdList = new ArrayList(); + for(Department depar : departmentList){ + PageData pd = new PageData(); + pd.put("id", depar.getDEPARTMENT_ID()); + pd.put("parentId", depar.getPARENT_ID()); + pd.put("name", depar.getNAME()); + pd.put("icon", "../../../assets/images/user.gif"); + departmentPdList.add(pd); + zdepartmentPdList.add(pd); + } + List[] arrayDep = new List[2]; + arrayDep[0] = zdepartmentPdList; + arrayDep[1] = departmentPdList; + return arrayDep; + } + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式， ('a','b','c')) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception { + DEPARTMENT_ID = Tools.notEmpty(DEPARTMENT_ID)?DEPARTMENT_ID:"0"; + List zdepartmentPdList = new ArrayList(); + zdepartmentPdList = this.listAllDepartmentToSelect(DEPARTMENT_ID,zdepartmentPdList); + StringBuffer sb = new StringBuffer(); + sb.append(""); + for(PageData dpd : zdepartmentPdList){ + sb.append(dpd.getString("id")); + sb.append(","); + } + sb.append("'fh'"); + return sb.toString(); + } + + /**通过条件获取全部 + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return (List)departmentMapper.listAll(pd); + } + + /**通过企业主部门 + * @param pd + * @throws Exception + */ + public PageData findByCorpId(PageData pd)throws Exception{ + return departmentMapper.findByCorpId(pd); + } + /**列表 关联 部门级别名称 + * @param page + * @throws Exception + */ + @Override + public List listForLevelName(Page page) throws Exception { + // TODO Auto-generated method stub + return departmentMapper.forLevelNamedatalistPage(page); + } + + @Override + public List listTreeCorpDept(PageData pd) throws Exception { + return departmentMapper.listTreeCorpDept(pd); + } + + @Override + public List listTreeManageAndCorp(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp(pd); + } + @Override + public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); + } + @Override + public List listTreeManageAndCorp1(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp1(pd); + } + @Override + public List listTreeManageAndCorp2(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorp2(pd); + } + @Override + public List listTreeManageAndCorpHasOrder(PageData pd) throws Exception { + return departmentMapper.listTreeManageAndCorpHasOrder(pd); + } + + + @Override + public List listDept(PageData pd) throws Exception { + return departmentMapper.listDept(pd); + } + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listTreeCorp(String parentId) throws Exception { + List departmentList = this.listSubDepartmentByParentId(parentId); + for(Department depar : departmentList){ + depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID()); + depar.setSubDepartment(this.listTreeCorp(depar.getDEPARTMENT_ID())); + depar.setTarget("treeFrame"); + depar.setIcon("../../../assets/images/user.gif"); + } + return departmentList; + } + + public List getSonIdsByParid(PageData pd) throws Exception { + return departmentMapper.getSonIdsByParid(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java new file mode 100644 index 00000000..34b1d2c4 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/DataDockingLogServiceImpl.java @@ -0,0 +1,83 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.DataDockingLogMapper; +import com.zcloud.service.map.DataDockingLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：曹妃甸数据对接日志 + * 作者：luoxiaobao + * 时间：2023-09-11 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class DataDockingLogServiceImpl implements DataDockingLogService { + + @Autowired + private DataDockingLogMapper datadockinglogMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + datadockinglogMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + datadockinglogMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + datadockinglogMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return datadockinglogMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return datadockinglogMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return datadockinglogMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + datadockinglogMapper.deleteAll(ArrayDATA_IDS); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/FireResourcesServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/FireResourcesServiceImpl.java new file mode 100644 index 00000000..d9357cd0 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/FireResourcesServiceImpl.java @@ -0,0 +1,136 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.FireResourcesMapper; +import com.zcloud.service.bus.ImgFilesService; +import com.zcloud.service.map.FireResourcesService; +import com.zcloud.util.Tools; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; + +@Service +public class FireResourcesServiceImpl implements FireResourcesService { + @Resource + public FireResourcesMapper fireResourcesMapper; + @Resource + private ImgFilesService imgFilesService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PageData pd, MultipartFile[] files) throws Exception{ + if (files != null && files.length > 0) { + imgFilesService.uploadPicture(files, "xfbf01".equals(pd.getString("FIRERESOURCES_TYPE")) ? "117" : "116", pd.getString("FIRERESOURCES_ID")); + } + String deleteIds = pd.getString("DELETE_IDS"); + if (Tools.notEmpty(deleteIds)) { + String[] split = deleteIds.split(","); + imgFilesService.deleteAll(split); + } + fireResourcesMapper.save(pd); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(PageData pd) { + fireResourcesMapper.delete(pd); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void edit(PageData pd, MultipartFile[] files) throws Exception{ + if (files != null && files.length > 0) { + imgFilesService.uploadPicture(files, "xfbf01".equals(pd.getString("FIRERESOURCES_TYPE")) ? "117" : "116", pd.getString("FIRERESOURCES_ID")); + } + String deleteIds = pd.getString("DELETE_IDS"); + if (Tools.notEmpty(deleteIds)) { + String[] split = deleteIds.split(","); + imgFilesService.deleteAll(split); + } + fireResourcesMapper.edit(pd); + } + + @Override + public List datalistPage(Page page) { + return fireResourcesMapper.datalistPage(page); + } + + @Override + public List listAll(PageData pd) { + return fireResourcesMapper.listAll(pd); + } + + @Override + public PageData findById(PageData pd) { + return fireResourcesMapper.findById(pd); + } + + @Override + public LinkedList getControlRoomDataList(PageData pageData) { + return fireResourcesMapper.getControlRoomDataList(pageData); + } + + @Override + public PageData getDataById(PageData pddata) { + return fireResourcesMapper.getDataById(pddata); + } + + @Override + public List getCheckRecordByPid(PageData pageData) { + return fireResourcesMapper.getCheckRecordByPid(pageData); + } + + @Override + public PageData getPointInfoADeviceByPid(PageData pageData) { + PageData resData = new PageData(); + PageData pointInfo = fireResourcesMapper.findPointById(pageData); + // 只取最新的信息 + List checkImages = fireResourcesMapper.getPointCheckPhotoById(pageData); + if (checkImages != null && checkImages.size() > 0) { + checkImages.forEach(item -> { + String[] checkImagesItems = item.getString("FILEPATHLIST").split("@@"); + item.put("FILEPATH_LIST", checkImagesItems); + }); + } + List deviceListByPointId = fireResourcesMapper.listAll4H5(pageData); + if (deviceListByPointId.size() > 0) { + deviceListByPointId.forEach(item -> { + String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@"); + item.put("FIRE_CHECK_STANDARD_ITEM", fireCheckStandardItems); + }); + } + resData.put("deviceList", deviceListByPointId); + resData.put("checkImages", checkImages); + resData.put("pointInfo", pointInfo); + return resData; + } + + @Override + public List getPointQualifiedPhotos(PageData pageData) { + if (pageData.getString("ISLOG").equals("1")) { + // 记录 EQUIPMENT_POINT_ID + return fireResourcesMapper.getPointQualifiedPhotosByEpid(pageData); + } + return fireResourcesMapper.getPointQualifiedPhotos(pageData); + } + + @Override + public List goRecordDeviceByPid(PageData pd) { + List list = fireResourcesMapper.goRecordDeviceByPid(pd); + list.forEach(item -> { + String[] fireCheckStandardItems = item.getString("FIRE_CHECK_STANDARD_ITEM").split("@@"); + item.put("fireDeviceTypeList", fireCheckStandardItems); + }); + return list; + } + + @Override + public List devicelistPage(Page page) { + return fireResourcesMapper.devicelistPage(page); + } +} diff --git a/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java new file mode 100644 index 00000000..f864422c --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java @@ -0,0 +1,234 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.GateAreaMapper; +import com.zcloud.mapper.datasource.map.GateMachineMapper; +import com.zcloud.mapper.datasource.map.GateVideoMapper; +import com.zcloud.service.keyProjects.VideoManagerService; +import com.zcloud.service.map.GateMachineService; +import com.zcloud.util.InitPageDataUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Service +public class GateMachineServiceImpl implements GateMachineService { + + + @Resource + private GateMachineMapper gateMachineMapper; + @Resource + private GateAreaMapper gateAreaMapper; + + @Resource + private GateVideoMapper gateVideoMapper; + + @Resource + private InitPageDataUtil initPageDataUtil; + + + @Override + public ArrayList getDatalistpage(Page page) { + return gateMachineMapper.getDatalistPage(page); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void edit(PageData pd) { + initPageDataUtil.initEdit(pd); + gateMachineMapper.edit(pd); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void removeByIds(PageData pageData) { + String[] dataIds = pageData.getString("DATA_IDS").split(","); + initPageDataUtil.initEdit(pageData); + if (dataIds.length > 0) { + pageData.put("item", dataIds); + gateMachineMapper.removeByIds(pageData); + } + } + + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PageData pageData) { + initPageDataUtil.initSave(pageData, "GATE_MACHINE_ID"); + gateMachineMapper.save(pageData); + } + + @Override + public PageData getOnlineGateMachine(PageData pageData) { + List gateMachineList = gateMachineMapper.getOnlineGateMachine(pageData); + PageData value = new PageData(); + gateMachineList.forEach(item -> { + value.put(item.getString("TYPE"), item.getString("COUNT")); + }); + return value; + } + + @Resource + private VideoManagerService videoManagerService; + + @Override + public List getGatePosition(PageData pageData) { + // todo 需求变更，现在闸机变成了区域 + if (pageData.getString("TYPE").equals("PERSON")) { + pageData.put("GATE_AREA_TYPE", 0); + // 人闸机定位 + } + + if (pageData.getString("TYPE").equals("CAR")) { + // 车闸机定位 + pageData.put("GATE_AREA_TYPE", 1); + } + if (pageData.getString("TYPE").equals("CAMERA")) { + // 摄像头定位 + return gateVideoMapper.getCameraPosition(pageData); + } + + return gateAreaMapper.getGatePosition(pageData); + } + + @Override + public PageData getGateMachineInfoById(PageData pageData) { + return gateMachineMapper.getGateMachineInfoById(pageData); + } + + @Override + + public List getPersonRecordCountByEId(PageData gateMachineInfo) { + return gateMachineMapper.getPersonRecordCountByEId(gateMachineInfo); + } + + @Override + public List getTodayInOutCount(PageData pd) { + List todayInOutCount = gateMachineMapper.getTodayInOutCount(pd); + // 当日进出 闸机数 + // 0 海域消防泵房南 1 大庆路与消防南路 2 一期停泊泊位 3 107 4 105 5 南北入口 6 + int[] counts = {0, 0, 0, 0, 0, 0}; + PageData pageData = new PageData(); + pageData.put("todayInOutCountList", todayInOutCount); + for (PageData item : todayInOutCount) { + // 海域消防泵房南入口 + if ("65270348-1df7-494a-b2e5-32f6b19d040b".equals(item.getString("EQUIPMENTID"))) { + counts[0] += Integer.parseInt(item.getString("COUNT")); + } + if ("44d9a3be-a778-4988-bb7d-04d8d87c53c3".equals(item.getString("EQUIPMENTID"))) { + counts[0] -= Integer.parseInt(item.getString("COUNT")); + } + // 大庆路与消防南路出口 + if ("189a90f0-5022-4df3-b2ac-1e276ce3585e".equals(item.getString("EQUIPMENTID"))) { + counts[1] -= Integer.parseInt(item.getString("COUNT")); + } + if ("9cfcbc32-9466-4b44-a0cd-533a87e8a839".equals(item.getString("EQUIPMENTID"))) { + counts[1] += Integer.parseInt(item.getString("COUNT")); + } + // 一期泊位出口 + if ("466988ac-d58c-4d9e-8065-74d9a8ad1ec9".equals(item.getString("EQUIPMENTID"))) { + counts[2] -= Integer.parseInt(item.getString("COUNT")); + } + if ("f2293484-667e-4e4b-bbeb-831938c541e0".equals(item.getString("EQUIPMENTID"))) { + counts[2] += Integer.parseInt(item.getString("COUNT")); + } + // 107出口 + if ("89e68dc2-8951-41e5-80ed-0e3ded220e1e".equals(item.getString("EQUIPMENTID"))) { + counts[3] -= Integer.parseInt(item.getString("COUNT")); + } + if ("cdf76fde-f2c5-4981-83a6-eb696ab2a76b".equals(item.getString("EQUIPMENTID"))) { + counts[3] += Integer.parseInt(item.getString("COUNT")); + } + // 105出口 + if ("2ccf4d42-114c-4427-9f25-c1895de0ce48".equals(item.getString("EQUIPMENTID"))) { + counts[4] -= Integer.parseInt(item.getString("COUNT")); + } + if ("7de29a72-8937-4b40-94b9-00afaee13034".equals(item.getString("EQUIPMENTID"))) { + counts[4] += Integer.parseInt(item.getString("COUNT")); + } + // 南入口 + if ("bfc2d476-ab57-4f1c-9186-8dd3d3f76d2a".equals(item.getString("EQUIPMENTID"))) { + counts[5] += Integer.parseInt(item.getString("COUNT")); + } + if ("96943c10-be7c-4798-9271-473176c1f047".equals(item.getString("EQUIPMENTID"))) { + counts[5] -= Integer.parseInt(item.getString("COUNT")); + } + // 北入口 + if ("9652687e-b679-4be0-bd2a-b110b44e06d1".equals(item.getString("EQUIPMENTID"))) { + counts[5] += Integer.parseInt(item.getString("COUNT")); + } + if ("059fd7c8-8ec9-4444-8123-3b6a08b8a1dd".equals(item.getString("EQUIPMENTID"))) { + counts[5] -= Integer.parseInt(item.getString("COUNT")); + } +// AND f.EQUIPMENTID NOT IN ( '96943c10-be7c-4798-9271-473176c1f047', '059fd7c8-8ec9-4444-8123-3b6a08b8a1dd' ) +// 96943c10-be7c-4798-9271-473176c1f047 60 南出口 +// 059fd7c8-8ec9-4444-8123-3b6a08b8a1dd 128 北出口 + } + List dataArrayList = new ArrayList<>(); + for (int i = 0; i < counts.length; i++) { + PageData value = new PageData(); + if (i == 0) { + value.put("title", "海域消防泵房南闸机"); + value.put("count", counts[0]); + } + if (i == 1) { + value.put("title", "大庆路与消防南路闸机"); + value.put("count", counts[1]); + } + if (i == 2) { + value.put("title", "一期停泊泊位闸机"); + value.put("count", counts[2]); + } + if (i == 3) { + value.put("title", "107闸机"); + value.put("count", counts[3]); + } + if (i == 4) { + value.put("title", "105闸机"); + value.put("count", counts[4]); + } + if (i == 5) { + value.put("title", "其他区域"); + value.put("count", counts[5] + -counts[4] + -counts[3] + -counts[2] + -counts[1] + -counts[0] + ); + } + value.put("company", "人"); + dataArrayList.add(value); + } + return dataArrayList; + } + + @Override + public List getCarRecordCountByEId(PageData gateMachineInfo) { + return gateMachineMapper.getCarRecordCountByEId(gateMachineInfo); + } + + @Override + public List getCarRecordCountByCorpId(PageData gateMachineInfo) { + return gateMachineMapper.getCarRecordCountByCorpId(gateMachineInfo); + } + + /** + * 一公司人员进出记录的详情 + * @param page + * @return + */ + public List getPersonRecordListAllByEId(Page page) { + return gateMachineMapper.getPersonRecordListAllByIdlistPage(page); + } + +} diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java new file mode 100644 index 00000000..f3008652 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapEightCfdServiceImpl.java @@ -0,0 +1,129 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.service.highriskwork.HotworkAcceptUserCfdService; +import com.zcloud.service.highriskwork.HotworkCfdService; +import com.zcloud.service.highriskwork.HotworkGasCfdService; +import com.zcloud.service.map.MapEightCfdService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：实时地图八项工作 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MapEightCfdServiceImpl implements MapEightCfdService { + @Autowired + private MapEightMapper mapEightMapper; + @Autowired + private HotworkCfdService hotworkCfdService; + @Autowired + private HotworkGasCfdService hotworkGasCfdService; + @Autowired + private HotworkAcceptUserCfdService hotworkacceptuserCfdService; + + @Override + public List listAll(PageData pd) { + return mapEightMapper.listAll(pd); + } + + @Override + public List listAllMeasures(PageData pd) { + return mapEightMapper.listAllMeasures(pd); + } + + @Override + public Map getByIdOrder(PageData pd) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + //动火作业√ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = hotworkCfdService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("measuresList", hotworkCfdService.listAllMeasures(pd)); + map.put("gasList", hotworkGasCfdService.listAll(pd)); + map.put("imgList", hotworkacceptuserCfdService.findByIds(pd)); + map.put("imgList1", hotworkacceptuserCfdService.findById(pd)); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + //用电作业√ +// pd.put("ELECTRICITY_ID",idStr); +// pd = electricityService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", electricityService.listAllMeasures(pd)); +// map.put("imgList",electricityacceptuserService.findByIds(pd)); +// map.put("imgList1",electricityacceptuserService.findById(pd)); +// map.put("gasList", electricityGasService.listAll(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + //盲板作业√ +// pd.put("BLINDBOARD_ID",idStr); +// pd = blindboardService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", blindboardService.listAllMeasures(pd)); +// map.put("imgList",blindboardacceptuserService.findByIds(pd)); +// map.put("imgList1",blindboardacceptuserService.findById(pd)); +// map.put("boardList", blindBoardInfoService.listAll(pd)); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + //高空作业√ +// pd.put("HIGHWORK_ID",idStr); +// pd = highworkService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", highworkService.listAllMeasures(pd)); +// map.put("imgList",highworkacceptuserService.findByIds(pd)); +// map.put("imgList1",highworkacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + //有限空间√ +// pd.put("CONFINEDSPACE_ID",idStr); +// pd = confinedspaceService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", confinedspaceService.listAllMeasures(pd)); +// map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); +// map.put("imgList1",confinedspaceacceptuserService.findById(pd)); +// map.put("gasList", confinedspaceGasService.listAll(pd)); +// map.put("gas", confinedspacegaswhService.findById(pd)); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + //吊装作业√ +// pd.put("HOISTING_ID",idStr); +// pd = hoistingService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", hoistingService.listAllMeasures(pd)); +// map.put("imgList",hoistingacceptuserService.findByIds(pd)); +// map.put("imgList1",hoistingacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + //破土作业√ +// pd.put("BREAKGROUND_ID",idStr); +// pd = breakgroundService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", breakgroundService.listAllMeasures(pd)); +// map.put("imgList",breakgroundacceptuserService.findByIds(pd)); +// map.put("imgList1",breakgroundacceptuserService.findById(pd)); + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + //断路作业√ +// pd.put("CUTROAD_ID",idStr); +// pd = cutroadService.findById(pd); //根据ID读取 +// map.put("pd", pd); +// map.put("measuresList", cutroadService.listAllMeasures(pd)); +// map.put("imgList",cutroadacceptuserService.findByIds(pd)); +// map.put("imgList1",cutroadacceptuserService.findById(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java new file mode 100644 index 00000000..bd1316c3 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -0,0 +1,586 @@ +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.service.map.MapEightService; +import com.zcloud.util.Tools; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 说明：实时地图八项工作 + * 作者：luoxiaobao + * 时间：2022-09-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MapEightServiceImpl implements MapEightService { + + @Autowired + private MapEightMapper mapEightMapper; + + @Override + public List getCorpinfoIds(PageData pd) { + String area = pd.getString("AREA"); + if(StringUtils.isNotBlank(area)){ + String[] ArrayDATA_IDS = area.split(","); + return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); + } + String gangkou = pd.getString("GANGKOU"); + if(StringUtils.equals("00003",gangkou)){ + String[] ArrayDATA_IDS = new String[]{"1","2"}; + return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS); + } + return new ArrayList<>(); + } + + @Override + public Object getEcharts(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + calendar.add(Calendar.DAY_OF_MONTH, -4); + String dateStr = sdf.format(calendar.getTime()); + List> list = mapEightMapper.getEcharts(pd); + List clickDate = new ArrayList<>(); + List dhzyCount = new ArrayList<>(); + List dbzyCount = new ArrayList<>(); + List yxgjzyCount = new ArrayList<>(); + List gczyCount = new ArrayList<>(); + List dzzyCount = new ArrayList<>(); + List lsydCount = new ArrayList<>(); + //用于排序，并整理数据 + for(int i = 0;i<5;i++){ + for(Map map :list){ + if(StringUtils.equals(dateStr,map.get("clickDate").toString())){ + clickDate.add(map.get("clickDate").toString()); + dhzyCount.add(map.get("dhzyCount").toString()); + dbzyCount.add(map.get("dbzyCount").toString()); + yxgjzyCount.add(map.get("yxgjzyCount").toString()); + gczyCount.add(map.get("gczyCount").toString()); + dzzyCount.add(map.get("dzzyCount").toString()); + lsydCount.add(map.get("lsydCount").toString()); + } + } + calendar.add(Calendar.DAY_OF_MONTH, +1); + dateStr = sdf.format(calendar.getTime()); + } + List name = new ArrayList<>(); + List> date = new ArrayList<>(); + name.add("动火作业"); + date.add(dhzyCount); + name.add("盲板作业"); + date.add(dbzyCount); + name.add("有限空间作业"); + date.add(yxgjzyCount); + name.add("高处作业"); + date.add(gczyCount); + name.add("吊装作业"); + date.add(dzzyCount); + name.add("临时用电"); + date.add(lsydCount); + returnMap.put("clickDate",clickDate); + returnMap.put("name",name); + returnMap.put("date",date); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public PageData statisticsHighRiskWorkByState(PageData pd) throws Exception { + return mapEightMapper.statisticsHighRiskWorkByState(pd); + } + + @Override + public List listHighRiskWork(Page page) throws Exception { + return mapEightMapper.realTimeHighRiskWorklistPage(page); + } + + @Override + public List listAllHighRiskWorkLocation(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ +// r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd); + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd); + } + return r; + } + + + + @Override + public List listAll(PageData pd) { + return mapEightMapper.listAll(pd); + } + + @Override + public List listAllMeasures(PageData pd) { + return mapEightMapper.listAllMeasures(pd); + } + + + + @Override + public Map getById(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = mapEightMapper.findByIdHOTWORK(pd); + pd = dianhuo(pd); + List list = mapEightMapper.getList(pd); + //这里封装前台要的参数 + pd = shenpi(pd,list); + map.put("measuresList", mapEightMapper.listAllMeasuresHOTWORK(pd)); + map.put("gasList", mapEightMapper.listAllHOTWORK(pd)); + List safetymethodrecordList = mapEightMapper.listAllcuoshiHOTWORK(pd);//其它安全措施明细集合 + map.put("safetymethodrecordList", safetymethodrecordList); + List delayedList = mapEightMapper.listAlldelayed(pd); + map.put("delayedList", delayedList); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + pd.put("ELECTRICITY_ID",idStr); + pd = mapEightMapper.findByIdELECTRICITY(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITY(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + pd.put("BLINDBOARD_ID",idStr); + pd = mapEightMapper.findByIdBLINDBOARD(pd); + PageData Info = mapEightMapper.findByIdJWD(pd); + pd.put("TYPE",105);//盲板位置图 + pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); + List ImgList = mapEightMapper.listAllBLINDBOARD(pd); + map.put("Info",Info);//获取经纬度 + map.put("ImgList",ImgList); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + pd.put("HIGHWORK_ID",idStr); + pd = mapEightMapper.findByIdHIGHWORK(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORK(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACE(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACE(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACE(pd)); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + pd.put("HOISTING_ID",idStr); + pd = mapEightMapper.findByIdHOISTING(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHOISTING(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + @Override + public Object getEchartsOrder(PageData pd) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + + //根据条件增加参数或减少参数 都没有 直接返回空 + 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"); + calendar.add(Calendar.DAY_OF_MONTH, -4); + String dateStr = sdf.format(calendar.getTime()); + List> list = mapEightMapper.getEchartsOrder(pd); + List clickDate = new ArrayList<>(); + List dhzyCount = new ArrayList<>(); + List dbzyCount = new ArrayList<>(); + List yxgjzyCount = new ArrayList<>(); + List gczyCount = new ArrayList<>(); + List dzzyCount = new ArrayList<>(); + List lsydCount = new ArrayList<>(); + List dtzyCount = new ArrayList<>(); + List dlzyCount = new ArrayList<>(); + //用于排序，并整理数据 + for(int i = 0;i<5;i++){ + for(Map map :list){ + if(StringUtils.equals(dateStr,map.get("clickDate").toString())){ + clickDate.add(map.get("clickDate").toString()); + dhzyCount.add(map.get("dhzyCount").toString()); + dbzyCount.add(map.get("dbzyCount").toString()); + yxgjzyCount.add(map.get("yxgjzyCount").toString()); + gczyCount.add(map.get("gczyCount").toString()); + dzzyCount.add(map.get("dzzyCount").toString()); + lsydCount.add(map.get("lsydCount").toString()); + dtzyCount.add(map.get("dtzyCount").toString()); + dlzyCount.add(map.get("dlzyCount").toString()); + } + } + calendar.add(Calendar.DAY_OF_MONTH, +1); + dateStr = sdf.format(calendar.getTime()); + } + List name = new ArrayList<>(); + List> date = new ArrayList<>(); + name.add("动火作业"); + date.add(dhzyCount); + name.add("盲板作业"); + date.add(dbzyCount); + name.add("有限空间作业"); + date.add(yxgjzyCount); + name.add("高处作业"); + date.add(gczyCount); + name.add("吊装作业"); + date.add(dzzyCount); + name.add("临时用电"); + date.add(lsydCount); + name.add("动土作业"); + date.add(dtzyCount); + name.add("断路作业"); + date.add(dlzyCount); + returnMap.put("clickDate",clickDate); + returnMap.put("name",name); + returnMap.put("date",date); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public PageData statisticsHighRiskWorkByStateOrder(PageData pd) throws Exception { + //根据条件增加参数或减少参数 都没有 直接返回空 + 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); + } + + @Override + public List listHighRiskWorkOrder(Page page) throws Exception { + return mapEightMapper.realTimeHighRiskWorklistPageOrder(page); + } + + @Override + public List listAllHighRiskWorkLocationOrder(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"HOTWORK")){ + r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd); + //临时用电 + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd); + //盲板 + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd); + // 高处 + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd); + //有限空间 + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd); + //吊装 + }else if(StringUtils.equals(typeStr,"HOISTING")){ + r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd); + //动土 + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + r = mapEightMapper.getBREAKGROUNDHighRiskWorkLocationOrder(pd); + //断路 + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + r = mapEightMapper.getCUTROADHighRiskWorkLocationOrder(pd); + } + return r; + } + + @Override + public Map getByIdOrder(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + String idStr = pd.getString("id"); + List pageDataList = new ArrayList<>(); + if(StringUtils.equals(typeStr,"HOTWORK")){ + pd.put("HOTWORKAPPLICATION_ID",idStr); + pd = mapEightMapper.findByIdHOTWORK(pd); + pd = dianhuo(pd); + List list = mapEightMapper.getList(pd); + //这里封装前台要的参数 + pd = shenpi(pd,list); + map.put("measuresList", mapEightMapper.listAllMeasuresHOTWORK(pd)); + map.put("gasList", mapEightMapper.listAllHOTWORK(pd)); + }else if(StringUtils.equals(typeStr,"ELECTRICITY")){ + pd.put("ELECTRICITY_ID",idStr); + pd = mapEightMapper.findByIdELECTRICITYOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresELECTRICITYOrder(pd)); + map.put("gasList", mapEightMapper.listAllGasELECTRICTITYOrder(pd)); + map.put("imgList1",mapEightMapper.findByELECTRICTITYAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByELECTRICTITYAcceptuserIds(pd)); + }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ + pd.put("BLINDBOARD_ID",idStr); + pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + PageData Info = mapEightMapper.findByIdJWDOrder(pd); + pd.put("TYPE",105);//盲板位置图 + pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); + List ImgList = mapEightMapper.listAllBLINDBOARD(pd); + map.put("Info",Info);//获取经纬度 + map.put("ImgList",ImgList); + map.put("imgList1",mapEightMapper.findByBLINDBOARDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBLINDBOARDAcceptuserIds(pd)); + }else if(StringUtils.equals(typeStr,"HIGHWORK")){ + pd.put("HIGHWORK_ID",idStr); + pd = mapEightMapper.findByIdHIGHWORKOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHIGHWORKOrder(pd)); + map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); + }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ + //没有有限空间作业 + //pd.put("CONFINEDSPACE_ID",idStr); + //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); + pd = new PageData(); + map.put("measuresList", null); + map.put("gasList", null); + }else if(StringUtils.equals(typeStr,"HOISTING")){ + pd.put("HOISTING_ID",idStr); + pd = mapEightMapper.findByIdHOISTINGOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresHOISTINGOrder(pd)); + map.put("imgList1",mapEightMapper.findByHOISTINGAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByHOISTINGAcceptuserIds(pd)); + }else if(StringUtils.equals(typeStr,"BREAKGROUND")){ + pd.put("BREAKGROUND_ID",idStr); + pd = mapEightMapper.findByIdBREAKGROUNDOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresBREAKGROUNDOrder(pd)); + map.put("imgList1",mapEightMapper.findByBREAKGROUNDAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByBREAKGROUNDAcceptuserIds(pd)); + }else if(StringUtils.equals(typeStr,"CUTROAD")){ + pd.put("CUTROAD_ID",idStr); + pd = mapEightMapper.findByIdCUTROADOrder(pd); + map.put("measuresList", mapEightMapper.listAllMeasuresCUTROADOrder(pd)); + map.put("imgList1",mapEightMapper.findByCUTROADAcceptuserId(pd)); + map.put("imgList",mapEightMapper.findByCUTROADAcceptuserIds(pd)); + } + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + private PageData shenpi(PageData pd,List list){ + List specialUserList = new ArrayList<>(); + for (PageData userPageData : list){ + String type = userPageData.get("STATE").toString(); + if("0".equals(type)){ // 申请办理人 + pd.put("APPLY_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("APPLY_USER_NAME",userPageData.getString("userName")); + pd.put("APPLY_USER_ID",userPageData.getString("USER_ID")); + }else if("1".equals(type)){ // 动火单位确认人 + pd.put("HOT_WORK_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_USER_ID",userPageData.getString("USER_ID")); + pd.put("HOT_WORK_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_USER_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_USER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_USER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("2".equals(type)){ // 项目发包单位 + pd.put("PROJECT_UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("PROJECT_UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName")); + pd.put("PROJECT_UNIT_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("PROJECT_UNIT_LEADER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("PROJECT_UNIT_LEADER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("3".equals(type)){ // 现场管辖单位负责人 + pd.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("UNIT_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("UNIT_LEADER_NAME",userPageData.getString("userName")); + pd.put("UNIT_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("UNIT_LEADER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("UNIT_LEADER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("4".equals(type)){ //动火许可签发单位负责人 + pd.put("ISSUING_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("ISSUING_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("ISSUING_USER_ID",userPageData.getString("USER_ID")); + pd.put("ISSUING_USER_NAME",userPageData.getString("userName")); + pd.put("ISSUING_USER_PHONE",userPageData.getString("userPhone")); + pd.put("ISSUING_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("ISSUING_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("5".equals(type)){ // 安全总监审批 + pd.put("SAFETY_DIRECTOR_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("SAFETY_DIRECTOR_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("SAFETY_DIRECTOR_USER_ID",userPageData.getString("USER_ID")); + pd.put("SAFETY_DIRECTOR_USER_NAME",userPageData.getString("userName")); + pd.put("SAFETY_DIRECTOR_PHONE",userPageData.getString("userPhone")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("6".equals(type)){ // 现场负责人接收 + pd.put("SITE_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("SITE_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("SITE_LEADER_ID",userPageData.getString("USER_ID")); + pd.put("SITE_LEADER_NAME",userPageData.getString("userName")); + pd.put("SITE_LEADER_PHONE",userPageData.getString("userPhone")); + pd.put("SITE_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SITE_DIRECTOR_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("7".equals(type)){ // 动火前 + pd.put("HOT_WORK_PERSON_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_PERSON_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_PERSON_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_PERSON_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_PERSON_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_PERSON_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("8".equals(type)){ // 现在负责人 + pd.put("PERSON_CONFIRM_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("PERSON_CONFIRM_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("PERSON_CONFIRM_USER_NAME",userPageData.getString("userName")); + pd.put("PERSON_CONFIRM_PHONE",userPageData.getString("userPhone")); + pd.put("PERSON_CONFIRM_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("PERSON_CONFIRM_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("9".equals(type)){ // 动火后 + pd.put("HOT_WORK_AFTER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("HOT_WORK_AFTER_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("HOT_WORK_AFTER_USER_NAME",userPageData.getString("userName")); + pd.put("HOT_WORK_AFTER_PHONE",userPageData.getString("userPhone")); + pd.put("HOT_WORK_AFTER_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("HOT_WORK_AFTER_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("10".equals(type)){ // 延时监火 + pd.put("TIME_LAPSE_FIREMAN_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("TIME_LAPSE_FIREMAN_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("TIME_LAPSE_FIREMAN_NAME",userPageData.getString("userName")); + pd.put("TIME_LAPSE_FIREMAN_PHONE",userPageData.getString("userPhone")); + pd.put("TIME_LAPSE_FIREMAN_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("TIME_LAPSE_FIREMAN_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + } + else if("21".equals(type)){ // 动火操作人 + String userName = userPageData.getString("userName2") +","; + String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); + pd.put("HOT_WORK_OPERATOR_NAME",oldName + userName); + }else if("22".equals(type)){ // 动火操作人 + pd.put("SUPERVISOR_OF_HOT_WORK_UNIT",userPageData.getString("USER_ID")); + String userName = userPageData.getString("userName2") +","; + String oldName = Tools.isEmpty(pd.get("HOT_WORK_OPERATOR_NAME"))?"":pd.get("HOT_WORK_OPERATOR_NAME").toString(); + pd.put("SUPERVISOR_OF_HOT_WORK_UNIT_NAME",oldName + userName); + }else if("24".equals(type)){ // 需要气体检测 + pd.put("GAS_TESTING_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("GAS_TESTING_DEPARTMENT_NAME",userPageData.getString("deptName")); + pd.put("GAS_TESTING_USER_ID",userPageData.getString("USER_ID")); + pd.put("GAS_TESTING_USER_NAME",userPageData.getString("userName")); + pd.put("GAS_TESTING_USER_PHONE",userPageData.getString("userPhone")); + pd.put("GAS_TESTING_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("GAS_TESTING_PRINCIPAL_TIME",userPageData.getString("OPERATTIME")); + }else if("30".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectCompetent_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectCompetent_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectCompetent_USER_NAME",userPageData.getString("userName")); + pd.put("projectCompetent_USER_ID",userPageData.getString("USER_ID")); + pd.put("projectCompetent_PHONE",userPageData.getString("userPhone")); + pd.put("projectCompetent_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectCompetent_TYPE",userPageData.getString("TYPE")); + // APP回显使用 + + pd.put("CHARGECONFIRM_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("CHARGECONFIRM_DEPT_NAME",userPageData.getString("deptName")); + pd.put("CHARGECONFIRM_USER_ID",userPageData.getString("USER_ID")); + pd.put("CHARGECONFIRM_USER_NAME",userPageData.getString("userName")); + pd.put("CHARGECONFIRM_USER_PHONE",userPageData.getString("userPhone")); + }else if("31".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectSupervisor_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectSupervisor_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectSupervisor_USER_NAME",userPageData.getString("userName")); + pd.put("projectSupervisor_PHONE",userPageData.getString("userPhone")); + pd.put("projectCompetent_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectSupervisor_TYPE",userPageData.getString("TYPE")); + }else if("32".equals(type)){ // 特级动火 动火负责人确认 + pd.put("projectPreliminarily_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("projectPreliminarily_DEPT_NAME",userPageData.getString("deptName")); + pd.put("projectPreliminarily_USER_NAME",userPageData.getString("userName")); + pd.put("projectPreliminarily_PHONE",userPageData.getString("userPhone")); + pd.put("projectPreliminarily_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("projectPreliminarily_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("projectPreliminarily_TYPE",userPageData.getString("TYPE")); + }else if("33".equals(type)){ // 特级动火 动火负责人确认 + pd.put("inspectorGeneral_DEPT_ID",userPageData.getString("DEPARTMENT_ID")); + pd.put("inspectorGeneral_DEPT_NAME",userPageData.getString("deptName")); + pd.put("inspectorGeneral_USER_NAME",userPageData.getString("userName")); + pd.put("inspectorGeneral_PHONE",userPageData.getString("userPhone")); + pd.put("inspectorGeneral_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("inspectorGeneral_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("inspectorGeneral_TYPE",userPageData.getString("TYPE")); + }else if("34".equals(type)){ //分公司主要负责人 + pd.put("OFFICE_RESPOMSIBLE_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("OFFICE_RESPOMSIBLE_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("OFFICE_RESPOMSIBLE_PHONE",userPageData.getString("userPhone")); + pd.put("OFFICE_RESPOMSIBLE_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("OFFICE_RESPOMSIBLE_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("OFFICE_RESPOMSIBLE_TYPE",userPageData.getString("TYPE")); + }else if("35".equals(type)){ // 特级动火 安全监督部初审 + pd.put("SUPERVISION_DEPARTMENT_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SUPERVISION_DEPARTMENT_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SUPERVISION_DEPARTMENT_PHONE",userPageData.getString("userPhone")); + pd.put("SUPERVISION_DEPARTMENT_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SUPERVISION_DEPARTMENT_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SUPERVISION_DEPARTMENT_TYPE",userPageData.getString("TYPE")); + }else if("36".equals(type)){ // 特级动火 安委会办公室审批 + pd.put("SECURITY_COMMITTEE_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SECURITY_COMMITTEE_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SECURITY_COMMITTEE_PHONE",userPageData.getString("userPhone")); + pd.put("SECURITY_COMMITTEE_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SECURITY_COMMITTEE_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SECURITY_COMMITTEE_TYPE",userPageData.getString("TYPE")); + }else if("37".equals(type)){ // 特级动火 安全总监签批 + pd.put("SAFETY_DIRECTOR_DEPT_NAME",userPageData.getString("REGULATORY_DEPT_NAME")); + pd.put("SAFETY_DIRECTOR_USER_NAME",userPageData.getString("REGULATORY_USER_NAME")); + pd.put("SAFETY_DIRECTOR_PHONE",userPageData.getString("userPhone")); + pd.put("SAFETY_DIRECTOR_PRINCIPAL",userPageData.getString("AUTOGRAPH")); + pd.put("SAFETY_DIRECTOR_OPERATTIME",userPageData.getString("OPERATTIME")); + pd.put("SAFETY_DIRECTOR_TYPE",userPageData.getString("TYPE")); + } + } + pd.put("specialUserList", specialUserList); + return pd; + } + + private PageData dianhuo(PageData pd){ + if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){ + String zidian = pd.getString("HOT_WORK_METHOD_ID"); + List shuzu = Arrays.asList(zidian.split(",")); + List wenzi = mapEightMapper.getListDongHuo(shuzu); + String pinjie = String.join(",",wenzi); + pd.put("HOT_WORK_METHOD_NAME",pinjie); + } + return pd; + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java new file mode 100644 index 00000000..75900222 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java @@ -0,0 +1,144 @@ +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.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"; + //根据条件增加参数或减少参数 都没有 直接返回空 + if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){ + List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); + if(ArrayDATA_IDS.size()==0){ + returnMap.put("result", errInfo); + return returnMap; + }else { + pd.put("ids",ArrayDATA_IDS); + pd.remove("CORPINFO_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"; + //根据条件增加参数或减少参数 都没有 直接返回空 + if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { + List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); + if (ArrayDATA_IDS.size() == 0) { + returnMap.put("result", errInfo); + return returnMap; + } + ArrayDATA_IDS.add("1"); + pd.put("ids", ArrayDATA_IDS); + pd.remove("CORPINFO_ID"); + } + String typeStr = pd.getString("TYPE"); + List r = new ArrayList<>(); + //重点工程 + if(StringUtils.equals(typeStr,"PROJECT")){ + r = keyProjectMapper.getProjectLocation(pd); + //视频 + }else if(StringUtils.equals(typeStr,"VIDEO")){ + r = keyProjectMapper.getVideoLocation(pd); + } + returnMap.put("varList", r); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public Object getById(PageData pd) throws Exception { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + String typeStr = pd.getString("TYPE"); + //重点工程 + if(StringUtils.equals(typeStr,"PROJECT")){ + pd = keyProjectMapper.getProjectById(pd); + PageData selectPageData = new PageData(); + + selectPageData.put("CORPINFO_ID",pd.get("PUNISH_THE_PERSON")); + List deptList = corpDepartmentService.listTreeManageAndCorpForPcPunishThePerson(selectPageData); //根据ID读取 + + + String userStr = pd.getString("PUNISH_THE_PERSON"); + if (!Tools.isEmpty(userStr)) { + String[] split = userStr.split(","); + selectPageData.put("ids",split); + List pageData = usersService.selectUserListByUserIds(selectPageData); + returnMap.put("punishThePerson", pageData); + } + PageData pd3 = new PageData(); + pd3.put("TYPE", 300); + pd3.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); + List file9 = imgfilesService.listAll(pd3); + returnMap.put("file9", file9); + //视频 + }else if(StringUtils.equals(typeStr,"VIDEO")){ + pd = keyProjectMapper.getVideoById(pd); + } + returnMap.put("pd", pd); + returnMap.put("result", errInfo); + return returnMap; + } + + @Override + public Object list(Page page) { + Map returnMap = new HashMap<>(); + String errInfo = "success"; + List varList = keyProjectMapper.datalistPage(page); + returnMap.put("varList", varList); + returnMap.put("result", errInfo); + return returnMap; + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java new file mode 100644 index 00000000..69447cf5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalServiceImpl.java @@ -0,0 +1,154 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalMapper; +import com.zcloud.service.map.MeteorologicalService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MeteorologicalServiceImpl implements MeteorologicalService { + + @Autowired + private MeteorologicalMapper meteorologicalMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + meteorologicalMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + meteorologicalMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + meteorologicalMapper.edit(pd); + } + public void savePosition(PageData pd)throws Exception{ + meteorologicalMapper.savePosition(pd); + } + public void editIsShowBycorpinfoid(PageData pd)throws Exception{ + meteorologicalMapper.editIsShowBycorpinfoid(pd); + } + public void editIsShow(PageData pd)throws Exception{ + meteorologicalMapper.editIsShow(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return meteorologicalMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception{ + return meteorologicalMapper.listBo(pd); + } + /**列表 + * @param page + * @throws Exception + */ + public List listByEquipment(Page page)throws Exception{ + return meteorologicalMapper.listByEquipmentdatalistPage(page); + } + + public List listbyType(Page page)throws Exception{ + return meteorologicalMapper.listbyType(page); + } + + @Override + public List listbyTypeLocation(PageData pd) throws Exception { + List r = new ArrayList<>(); + String typeStr = pd.getString("TYPE"); + //动火 + if(StringUtils.equals(typeStr,"293187ddfd984c9ab3fd716aef58da0e")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + //风向站 + }else if(StringUtils.equals(typeStr,"561347f0cff641dba8b2b22c0f443348")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + //温度站 + }else if(StringUtils.equals(typeStr,"2da29f00852a4653ba3e760b9de57412")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + // 风速站 + }else if(StringUtils.equals(typeStr,"732fe73933b845c6b1e2aee06a38ed31")){ + r = meteorologicalMapper.listbyTypeLocation(pd); + // 湿度站 + } + return r; + } + + + public PageData listbyequipmentcount(PageData pd)throws Exception{ + return meteorologicalMapper.listbyequipmentcount(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return meteorologicalMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return meteorologicalMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + meteorologicalMapper.deleteAll(ArrayDATA_IDS); + } + + /**通过CODE获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCode(PageData pd)throws Exception{ + return meteorologicalMapper.findByCode(pd); + } + + public List listAllForMap(PageData pd)throws Exception{ + return meteorologicalMapper.listAllForMap(pd); + } + + public List getPointsInfo(PageData pd)throws Exception{ + return meteorologicalMapper.getPointsInfo(pd); + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java new file mode 100644 index 00000000..42c149a5 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java @@ -0,0 +1,222 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.MeteorologicalinfoMapper; +import com.zcloud.service.map.DataDockingLogService; +import com.zcloud.service.map.MeteorologicalinfoService; +import com.zcloud.service.map.util.ReturnMap; +import com.zcloud.util.DateUtil; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * 说明：视频管理 + * 作者：luoxiaobao + * 时间：2021-05-10 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService { + + @Autowired + private MeteorologicalinfoMapper meteorologicalinfoMapper; + + @Autowired + private DataDockingLogService dataDockingLogService; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + meteorologicalinfoMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + meteorologicalinfoMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + meteorologicalinfoMapper.edit(pd); + } + public void savePosition(PageData pd)throws Exception{ + meteorologicalinfoMapper.savePosition(pd); + } + public void editIsShowBycorpinfoid(PageData pd)throws Exception{ + meteorologicalinfoMapper.editIsShowBycorpinfoid(pd); + } + public void editIsShow(PageData pd)throws Exception{ + meteorologicalinfoMapper.editIsShow(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return meteorologicalinfoMapper.datalistPage(page); + } + + /**列表 + * @throws Exception + */ + public PageData listbymeteorological(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listbymeteorological(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listBo(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listBo(pd); + } + /**列表 + * @param page + * @throws Exception + */ + public List listbyinfo(Page page)throws Exception{ + return meteorologicalinfoMapper.listbyinfodatalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return meteorologicalinfoMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + meteorologicalinfoMapper.deleteAll(ArrayDATA_IDS); + } + + /**通过CODE获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCode(PageData pd)throws Exception{ + return meteorologicalinfoMapper.findByCode(pd); + } + + public List listAllForMap(PageData pd)throws Exception{ + return meteorologicalinfoMapper.listAllForMap(pd); + } + + public List getPointsInfo(PageData pd)throws Exception{ + return meteorologicalinfoMapper.getPointsInfo(pd); + } + + @Override + public ReturnMap tongbuMeteorologicalinfo(List list) throws Exception { + PageData info = new PageData(); + list.forEach(weather ->{ + if(weather.get("variableName").equals("风速")){ + info.put("WINDSPEED", weather.get("value").toString()); + }else if(weather.get("variableName").equals("风向")){ + info.put("WINDDIRECTION", weather.get("value").toString()); + }else if(weather.get("variableName").equals("迎风角度")){ + info.put("WINDDIRECTION", weather.get("value").toString()); + }else if(weather.get("variableName").equals("雨量")){ + info.put("RAINFALL", weather.get("value").toString()); + } + info.put("CODE",weather.get("cusdeviceNo").toString()); + info.put("OPERATTIME",DateUtil.date2Str(new Date(Long.parseLong(weather.get("time").toString() + "000")))); + }); + if(info.get("WINDSPEED") == null && info.get("WINDDIRECTION") == null && info.get("RAINFALL") == null){ //都没有值 不保存 + return ReturnMap.error(200,"操作成功"); + } + List tenSList = meteorologicalinfoMapper.tensList(info); //10秒内相同设备的数据 + if(tenSList.size()>0){ + PageData old = tenSList.get(0); + old.putAll(info); + edit(old); + }else{ + info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID()); + save(info); + } + System.out.println("---------------------保存对接数据------------------"); + System.out.println(info); + return ReturnMap.error(200,"操作成功"); + } + + /** + * 保存新增数据对接日志 + * @param saveMeteorologicalinfoCount + * @throws Exception + */ + public void saveMeteorologicalinfoDataDocking(Integer saveMeteorologicalinfoCount) throws Exception { + PageData savePd = new PageData(); + savePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID()); + savePd.put("DOCKING_TYPE",0); + savePd.put("DOCKING_MODULE","气象信息"); + savePd.put("NUMBER",saveMeteorologicalinfoCount); + savePd.put("DOCKING_TIME", DateUtil.date2Str(new Date())); + dataDockingLogService.save(savePd); + } + + /** + * 保存修改数据对接日志 + * @param updateMeteorologicalinfoCount + * @throws Exception + */ + public void updateMeteorologicalinfoDataDocking(Integer updateMeteorologicalinfoCount) throws Exception { + PageData updatePd = new PageData(); + updatePd.put("BUS_DATA_DOCKING_ID", UuidUtil.get32UUID()); + updatePd.put("DOCKING_TYPE",1); + updatePd.put("DOCKING_MODULE","气象信息"); + updatePd.put("NUMBER",updateMeteorologicalinfoCount); + updatePd.put("DOCKING_TIME", DateUtil.date2Str(new Date())); + dataDockingLogService.save(updatePd); + } + + /** + * 根据用户IDS 获取气象信息 + * @param MeteorologicalinfoIds 气象ids + * @return + */ + public List getMeteorologicalinfoListByIds (List MeteorologicalinfoIds) { + PageData pd = new PageData(); + pd.put("MeteorologicalinfoIds",MeteorologicalinfoIds); + return meteorologicalinfoMapper.getMeteorologicalinfoListByIds(pd); + } + + @Override + public Integer saveMeteorologicalinfo(List list) { + if (list.size() < 1) return 0; + return meteorologicalinfoMapper.insertAll(list); + } + + @Override + public Integer updateMeteorologicalinfo(PageData pageData) { + return meteorologicalinfoMapper.updateMeteorologicalinfo(pageData); + } +} + diff --git a/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java new file mode 100644 index 00000000..1843ad16 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/impl/PlatformelectronicServiceImpl.java @@ -0,0 +1,93 @@ +package com.zcloud.service.map.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.map.PlatformelectronicMapper; +import com.zcloud.service.map.PlatformelectronicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class PlatformelectronicServiceImpl implements PlatformelectronicService { + + @Autowired + private PlatformelectronicMapper platformelectronicMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + platformelectronicMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + platformelectronicMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + platformelectronicMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return platformelectronicMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return platformelectronicMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return platformelectronicMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + platformelectronicMapper.deleteAll(ArrayDATA_IDS); + } + + @Override + public Integer countAllForMap(PageData pd) throws Exception { + return platformelectronicMapper.countAllForMap(pd); + } + + @Override + public List countAllByArea(PageData pd) { + return platformelectronicMapper.countAllByArea(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java b/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java new file mode 100644 index 00000000..2e4555e4 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/CodeMessageEnum.java @@ -0,0 +1,199 @@ +package com.zcloud.service.map.util; + +import com.zcloud.service.map.BaseResultInterface; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public enum CodeMessageEnum implements BaseResultInterface { + + /** ********* 0000成功 *************** */ + SUCCESS("0000", "成功!"), + SUCCESS_LOGIN("0001", "用户登录成功"), + SUCCESS_LOGOUT("0002", "用户退出成功"), + + /* 默认失败 */ + COMMON_FAIL("999", "失败"), + + /** ********* 1xxx系统错误 *************** */ + SERVER_BUSY("1001", "服务器正忙，请稍后再试!"), + INTERNAL_SERVER_ERROR("1002", "服务器内部错误"), + NOT_FOUND("1003", "未找到该资源!"), + REQUEST_METHOD_ERROR("1004", "接口请求方法异常"), + SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"), + NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"), + INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"), + PARSE_TOKEN_EXCEPTION("1008", "解析token异常"), + TOKEN_NOT_EXIST("1009", "token不存在"), + TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"), + TOKEN_EXPIRE("1011", "token过期，请重新登录"), + IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"), + NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"), + UPLOAD_FILE_ERROR("1014", "文件上传失败"), + FILE_NOT_EXIST("1015", "文件不存在"), + FILE_HAS_DELETED("1016", "文件已被删除"), + DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."), + TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"), + CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"), + DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"), + CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"), + DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."), + CREATE_DATABASE_ERROR("1023", "创建数据库失败"), + CREATE_TABLE_ERROR("1024", "创建表失败"), + UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"), + DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"), + QUERY_ROLE_ERROR("1027", "查询角色失败"), + UPDATE_GROUP_ERROR("1028", "更新接口组失败"), + DELETE_GROUP_ERROR("1029", "删除接口组失败"), + SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"), + + /** + * ******2xxx参数错误 ********************* + */ + BODY_NOT_MATCH("2001", "请求的数据格式不符"), + SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"), + REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"), + NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"), + NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"), + NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"), + NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"), + NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"), + SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"), + TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"), + FILE_PICTURE_IS_NULL("2011", "附件不存在"), + FILE_PICTURE_DELETE("2012", "删除附件失败"), + DIC_BIANMA_REPEAT("2013", "字典编码重复"), + + + + + + /** *********** 3xxx用户错误 ******************* */ + USER_NOT_LOGIN("3001", "用户未登录"), + USER_ACCOUNT_EXPIRED("3002", "账号已过期"), + USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"), + USER_CREDENTIALS_EXPIRED("3004", "密码过期"), + USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"), + USER_ACCOUNT_LOCKED("3006", "账号被锁定"), + USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"), + USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"), + USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"), + USER_NO_PERMISSION("3010", "当前账号没有此权限"), + USERNAME_NOT_BLANK("3011", "用户不能为空"), + USER_LOGIN_ERROR("3012", "用户登录失败"), + USER_LOGOUT_ERROR("3013", "用户退出失败"), + USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"), + USER_ACCESS_DENIED("3015", "权限认证失败"), + USERNAME_EXIST_ERROR("3016", "用户名重名"), + + ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"), + + /** ********** 4xxx业务错误 *********************** */ + ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"), + APP_KEY_EXIST("4002", "应用key已存在"), + APP_NOT_EXIST("4003", "应用不存在"), + APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"), + APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"), + APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"), + APP_PAGE_TYPE_ERROR("4007", "页面类型有误"), + APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"), + CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"), + DELETE_PAGE_ERROR("4010", "删除页面失败"), + CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"), + APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"), + DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"), + DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"), + DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"), + MODEL_NOT_EXIST("4016", "当前模型不存在"), + MODEL_HAS_DELETED("4017", "当前模型已删除"), + MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"), + DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"), + DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"), + DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"), + DEPT_USER_EXIST("4022", "部门下存在用户"), + NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"), + MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"), + MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"), + MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"), + FORM_NOT_EXIST("4027", "模型表单不存在"), + READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"), + MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"), + NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"), + APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"), + DELETE_COLUMN_ERROR("4032", "删除当前失败"), + INSERT_DATA_ERROR("4033", "新建数据失败"), + EDIT_DATA_ERROR("4034", "编辑数据失败"), + DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"), + NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"), + PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"), + AMIS_PAGE_ERROR("4038", "分页参数异常"), + QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"), + REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"), + STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"), + APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"), + APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"), + APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"), + NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"), + NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"), + CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"), + CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"), + APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"), + UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"), + DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"), + INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"), + DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"), + CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"), + CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"), + NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"), + JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"), + NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"), + NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"), + FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."), + APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"), + APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"), + TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"), + TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"), + TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"), + TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"), + CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"), + NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"), + APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"), + DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在") + ; + + CodeMessageEnum(String code, String message) { + this.code = code; + this.message = message; + } + + /** 返回到前端的code值 */ + private String code; + + /** 返回到前端的code对应的message值 */ + private String message; + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } + +// public static CodeVo getJsonObjectByCode(String code) { +// CodeVo codeVo = new CodeVo(); +// if (Tools.isEmpty(code)) { +// return codeVo; +// } +// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) { +// if (enumObj.getCode().equals(code)) { +// return new CodeVo(code, enumObj.message); +// } +// } +// return codeVo; +// } +} diff --git a/src/main/java/com/zcloud/service/map/util/HKPostUtil.java b/src/main/java/com/zcloud/service/map/util/HKPostUtil.java new file mode 100644 index 00000000..413fe903 --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/HKPostUtil.java @@ -0,0 +1,190 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hikvision.artemis.sdk.Client; +import com.hikvision.artemis.sdk.Request; +import com.hikvision.artemis.sdk.Response; +import com.hikvision.artemis.sdk.constant.Constants; +import com.hikvision.artemis.sdk.enums.Method; +import com.zcloud.entity.PageData; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/09/12 10:16 + */ +public class HKPostUtil { + // 代理API网关nginx服务器ip端口 +// private static final String host = "192.168.211.185:443"; +// // 秘钥appkey +// private static final String appKey = "21830372"; +// // 秘钥appSecret +// private static final String appSecret = "vBZ89ltwQjHhFHLfg61V"; + private static final String host = "192.168.150.80:5443"; + // 秘钥appkey + private static final String appKey = "25448524"; + // 秘钥appSecret + private static final String appSecret = "DoHeB3gR2dxgaEvANqNr"; + /** + * 能力开放平台的网站路径 + * TODO 路径不用修改，就是/artemis + */ + private static final String ARTEMIS_PATH = "/artemis"; + + /** + * 通用海康接口 + * 调用POST请求类型(application/json)接口* + * @return + */ + public static Map publicHkInterface(JSONObject jsonBody, String url){ + final String getCamsApi = ARTEMIS_PATH +url; + Map path = new HashMap(2); + path.put("https://", getCamsApi); + // post请求application/json类型参数 + String result = doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null); + JSONObject parseObject = JSONArray.parseObject(result); + return parseObject; + } + + /** + * 获取监控点预览取流URL + * @param id 设备编号 + * @return + */ + public static Map camerasPreviewURLs(String id,String type){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("cameraIndexCode", id); + jsonBody.put("netZoneCode", "1"); + jsonBody.put("transmode", 1); + jsonBody.put("streamType", 0); + jsonBody.put("protocol",type); + jsonBody.put("expireTime", -1); + jsonBody.put("expand","transcode=1&streamform=rtp"); + Map returnMap=publicHkInterface(jsonBody,"/api/video/v1/cameras/previewURLs"); + return returnMap; + } + + /** + * 获取所有区域数 + * @return + */ + public static Map getAllArea(){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("parentIndexCode", "root000000"); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + jsonBody.put("cascadeFlag",0); + Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/regions/subRegions"); + return returnMap; + } + + /** + * 获取区域内摄像头数 + * @return + */ + public static Map getAreaCamera(String indexCode){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("regionIndexCode", indexCode); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + Map returnMap=publicHkInterface(jsonBody,"/api/irds/v2/resource/subResources"); + return returnMap; + } + + /** + * API名称： + * 查询监控点列表v2 + * 分组： + * 视频资源接口 + * 提供方名称： + * 资源目录服务 + * qps： + * 描述：根据条件查询目录下有权限的监控点列表 + * @return + */ + public static Map cameraSearch(PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if(pd.get("name")!=null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + jsonBody.put("resourceType", "camera"); + Map returnMap=publicHkInterface(jsonBody,"/api/irds/v2/deviceResource/resources"); + return returnMap; + } + + /** + * 订阅事件 + * @param ids 事件编号 131588 + * @return + */ + public static Map subscribeEvent(String[] ids){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("eventTypes", ids); + jsonBody.put("eventDest", "1"); + Map returnMap=publicHkInterface(jsonBody,"/api/eventService/v1/eventSubscriptionByEventTypes"); + return returnMap; + } + + public static String doPostStringArtemis(Map path, String body, Map querys, String accept, String contentType, Map header) { + String httpSchema = (String)path.keySet().toArray()[0]; + if (httpSchema != null && !StringUtils.isEmpty(httpSchema)) { + String responseStr = null; + + try { + Map headers = new HashMap(); + if (StringUtils.isNotBlank(accept)) { + headers.put("Accept", accept); + } else { + headers.put("Accept", "*/*"); + } + + if (StringUtils.isNotBlank(contentType)) { + headers.put("Content-Type", contentType); + } else { + headers.put("Content-Type", "application/text;charset=UTF-8"); + } + + if (header != null) { + headers.putAll(header); + } + + Request request = new Request(Method.POST_STRING, httpSchema + host, (String)path.get(httpSchema), appKey, appSecret, Constants.DEFAULT_TIMEOUT); + request.setHeaders(headers); + request.setQuerys(querys); + request.setStringBody(body); + Response response = Client.execute(request); + responseStr = getResponseResult(response); + } catch (Exception var11) { + var11.printStackTrace(); + } + return responseStr; + } else { + throw new RuntimeException("http和https参数错误httpSchema: " + httpSchema); + } + } + + private static String getResponseResult(Response response) { + String responseStr = null; + int statusCode = response.getStatusCode(); + if (!String.valueOf(statusCode).startsWith("2") && !String.valueOf(statusCode).startsWith("3")) { + String msg = response.getErrorMessage(); + responseStr = response.getBody(); + System.out.println("the Artemis Request is Failed,statusCode:" + statusCode + " errorMsg:" + msg); + } else { + responseStr = response.getBody(); + System.out.println("the Artemis Request is Success,statusCode:" + statusCode + " SuccessMsg:" + response.getBody()); + } + + return responseStr; + } + +} diff --git a/src/main/java/com/zcloud/service/map/util/HKUtil.java b/src/main/java/com/zcloud/service/map/util/HKUtil.java new file mode 100644 index 00000000..be0d9c9f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/HKUtil.java @@ -0,0 +1,86 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hikvision.artemis.sdk.ArtemisHttpUtil; +import com.hikvision.artemis.sdk.config.ArtemisConfig; +import com.zcloud.entity.PageData; + +import java.util.HashMap; +import java.util.Map; + +/** + * 海康工具类 + */ +public class HKUtil { + static { + // 代理API网关nginx服务器ip端口 + ArtemisConfig.host = "192.168.150.80:5443"; + // 秘钥appkey + ArtemisConfig.appKey = "25448524"; + // 秘钥appSecret + ArtemisConfig.appSecret = "DoHeB3gR2dxgaEvANqNr"; + } + /** + * 能力开放平台的网站路径 + * TODO 路径不用修改，就是/artemis + */ + private static final String ARTEMIS_PATH = "/artemis"; + /** + * 通用海康接口 + * 调用POST请求类型(application/json)接口* + * @return + */ + public static Map publicHkInterface(JSONObject jsonBody,String url){ + final String getCamsApi = ARTEMIS_PATH +url; + Map path = new HashMap(2); + path.put("https://", getCamsApi); + // post请求application/json类型参数 + String result =ArtemisHttpUtil.doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null); + JSONObject parseObject = JSONArray.parseObject(result); + return parseObject; + } + + + /** + * 获取监控点预览取流URL + * @param id 设备编号 + * @return + */ + public static Map camerasPreviewURLs(String id,String type){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("indexCode", id); + jsonBody.put("netZoneCode", "1"); + jsonBody.put("transmode", 1); + jsonBody.put("streamType", 0); + jsonBody.put("protocol",type); + jsonBody.put("expireTime", -1); + jsonBody.put("expand","transcode=1&streamform=rtp"); + Map returnMap=publicHkInterface(jsonBody,"/api/vnsc/mls/v1/preview/openApi/getPreviewParam"); + /*/api/video/v1/cameras/previewURLs*/ + return returnMap; + } + + /** + * API名称： + * 查询监控点列表v2 + * 分组： + * 视频资源接口 + * 提供方名称： + * 资源目录服务 + * qps： + * 描述：根据条件查询目录下有权限的监控点列表 + * @return + */ + public static Map cameraSearch(PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if(pd.get("name")!=null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + Map returnMap=publicHkInterface(jsonBody,"/api/resource/v2/camera/search"); + return returnMap; + } +} diff --git a/src/main/java/com/zcloud/service/map/util/ReturnMap.java b/src/main/java/com/zcloud/service/map/util/ReturnMap.java new file mode 100644 index 00000000..a4cd6b4e --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/ReturnMap.java @@ -0,0 +1,145 @@ +package com.zcloud.service.map.util; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + +import org.apache.http.HttpStatus; + +import java.util.HashMap; +import java.util.Map; + +/** + * @description: R类 + **/ +public class ReturnMap extends HashMap { + /** + * 序列ID + */ + private static final long serialVersionUID = 1L; + + /** + * R的无参构造, 初始化信息 + */ + public ReturnMap() { + put("code", 0); + put("msg", "success"); + put("result", "success"); + } + + /** + * error1: 返回默认error + * + * @return 返回默认error + */ + public static ReturnMap error() { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常, 请联系管理员"); + } + + /** + * error2 + * + * @param msg 错误信息 + * @return 返回自定义信息的error + */ + public static ReturnMap error(String msg) { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); + } + + public static ReturnMap error(CodeMessageEnum codeMessageEnum, String uri) { + return error(codeMessageEnum.getCode(), codeMessageEnum.getMessage(), uri); + } + + /** + * 原先R的code和msg被覆盖 + * + * @param code 错误码 + * @param msg 错误信息 + * @return 自定义的错误码和错误信息 + */ + public static ReturnMap error(int code, String msg) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + return r; + } + + public static ReturnMap error(String code, String msg) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + return r; + } + + public static ReturnMap error(String code, String msg, String uri) { + ReturnMap r = new ReturnMap(); + r.put("code", code); + r.put("result", "error"); + r.put("msg", msg); + r.put("uri", uri); + return r; + } + + /** + * ok1 + * 加入了msg + * + * @param msg + * @return + */ + public static ReturnMap ok(String msg) { + ReturnMap r = new ReturnMap(); + r.put("msg", msg); + return r; + } + + /** + * ok2: 加入了map + * + * @param map + * @return + */ + public static ReturnMap ok(Map map) { + ReturnMap r = new ReturnMap(); + r.putAll(map); + return r; + } + + /** + * ok3: 直接返回"0", "success" + * + * @return + */ + public static ReturnMap ok() { + return new ReturnMap(); + } + + /** + * 放入自定义的key和value, 然后返回 + * + * @param key + * @param value + * @return + */ + @Override + public ReturnMap put(String key, Object value) { + super.put(key, value); + return this; + } + + /** + * 得到这个对象的code + * + * @return + */ + public Integer getCode() { + return (Integer) this.get("code"); + } +} + + + diff --git a/src/main/java/com/zcloud/service/map/util/WeatherUtil.java b/src/main/java/com/zcloud/service/map/util/WeatherUtil.java new file mode 100644 index 00000000..a623d28f --- /dev/null +++ b/src/main/java/com/zcloud/service/map/util/WeatherUtil.java @@ -0,0 +1,78 @@ +package com.zcloud.service.map.util; + +import com.alibaba.fastjson.JSON; +import com.zcloud.entity.PageData; +import com.zcloud.util.UuidUtil; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/09/08 11:32 + */ +@Component +public class WeatherUtil { + private static final String WEATHER_PATH = "http://yunlink.027010.cn/OpenAPI/GetAllReal"; + private static final String sn="01803353066"; + private static final String pwd="353066"; + + public static Map getWeatherInfo() throws IOException { + CloseableHttpClient client = null; + CloseableHttpResponse response = null; + HttpPost httpPost = new HttpPost(buildUrl(WEATHER_PATH,sn,pwd)); + + client = HttpClients.createDefault(); + response = client.execute(httpPost); + HttpEntity entity = response.getEntity(); + String result = EntityUtils.toString(entity); + return JSON.parseObject(result, HashMap.class);//返回结果转换为map + } + + private static String buildUrl(String uri,String sn,String pwd) { + StringBuilder urlBuilder = new StringBuilder(uri+"?"); + try { + urlBuilder.append("sn=").append(URLEncoder.encode(sn, "UTF-8")); + urlBuilder.append("&pwd=").append(URLEncoder.encode(pwd, "UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return urlBuilder.toString(); + } + + public static void main(String[] args) throws IOException { + Map map = getWeatherInfo(); + List> datas = (List>)map.get("Datas"); + datas.forEach(item -> { + List> weathers = (List>)item.get("Weathers"); + if(weathers.size()>0){ + PageData info = new PageData(); + info.put("METEOROLOGICALINFO_ID", UuidUtil.get32UUID()); + info.put("OPERATTIME", item.get("DateTime")); + info.put("CODE", item.get("ID")); + weathers.forEach(weather ->{ + if(weather.get("Index").equals(3)){ + info.put("TEMPERATURE", weather.get("Value").toString()); + } + if(weather.get("Index").equals(6)){ + info.put("WINDSPEED", weather.get("Value").toString()); + } + if(weather.get("Index").equals(7)){ + info.put("WINDDIRECTION", weather.get("Value").toString()); + } + }); + } + }); + } +} diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 05efcfd7..93001988 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -354,4 +354,10 @@ public interface UsersService { PageData getUserInfo(PageData pd); List getRegUserInfo(PageData pd); + + PageData countAllByArea(PageData pd) throws Exception; + + PageData getPersonByCardNo(PageData pd) throws Exception; + + PageData findByCardNo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 1559789b..c432b75a 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -478,4 +478,17 @@ public class UsersServiceImpl implements UsersService { public List getRegUserInfo(PageData pd) { return usersMapper.getUsersInfo(pd); } + + public PageData countAllByArea(PageData pd) throws Exception{ + return usersMapper.countAllByArea(pd); + } + + @Override + public PageData getPersonByCardNo(PageData pd) throws Exception{ + return usersMapper.getPersonByCardNo(pd); + } + + public PageData findByCardNo(PageData pd)throws Exception{ + return usersMapper.findByCardNo(pd); + } } diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 80f20580..b7f82567 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -61,4 +61,6 @@ public class Const { public static final String topic_eightWork="eightWork"; public static final String topic_info="info"; + public static final String USER_CITY_CODE = "SESSION_USER_CITY_CODE"; + public static final String USER_CITY_NAME = "SESSION_USER_CITY_NAME"; } diff --git a/src/main/java/com/zcloud/util/Jurisdiction.java b/src/main/java/com/zcloud/util/Jurisdiction.java index 038022c9..85064bbd 100644 --- a/src/main/java/com/zcloud/util/Jurisdiction.java +++ b/src/main/java/com/zcloud/util/Jurisdiction.java @@ -105,4 +105,11 @@ public class Jurisdiction { } return pd; } + + /** USER_CITY_CODE + * @return + */ + public static String getUserCityCode(){ + return getSession().getAttribute(Const.USER_CITY_CODE).toString(); + } } diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 5b4bef11..860f3659 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -435,6 +435,235 @@ (select count(1) from bus_units r where r.CORPINFO_ID = #{CORPINFO_ID} and r.ISDELETE = 0) as units_num, (select count(1) from BUS_SPECIALEQUIPMENT r where r.CORPINFO_ID = #{CORPINFO_ID} and r.ISDELETE = 0) as equipment_num + + + + diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index dc50c415..08c0fcfe 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -2937,7 +2937,17 @@ group by f.HIDDEN_ID order by f.CREATTIME desc,f.STATE + 0 asc - + + INSERT INTO bus_hidden_emis( HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR, CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE, diff --git a/src/main/resources/mybatis/datasource/map/BiMapMapper.xml b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml new file mode 100644 index 00000000..e3eff438 --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/BiMapMapper.xml @@ -0,0 +1,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml b/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml new file mode 100644 index 00000000..e9cc8c8f --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/BiTongjiMapper.xml @@ -0,0 +1,573 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml b/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml new file mode 100644 index 00000000..ea5038e9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/GateAreaMapper.xml @@ -0,0 +1,104 @@ + + + + mk_gate_area + + + f.GATE_AREA_ID, + f.GATE_AREA_NAME, + f.GATE_AREA_TYPE, + f.LATITUDE, + f.LONGITUDE, + f.CORPINFO_ID, + f.ISDELETE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME + + + INSERT INTO + ( + GATE_AREA_ID, + GATE_AREA_NAME, + GATE_AREA_TYPE, + LATITUDE, + LONGITUDE, + CORPINFO_ID, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME + ) + VALUES ( + #{GATE_AREA_ID}, + #{GATE_AREA_NAME}, + #{GATE_AREA_TYPE}, + #{LATITUDE}, + #{LONGITUDE}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME} + ) + + + + + update + + set + GATE_AREA_NAME = #{GATE_AREA_NAME}, + GATE_AREA_TYPE = #{GATE_AREA_TYPE}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + GATE_AREA_ID = #{GATE_AREA_ID} + + + update mk_gate_area + set ISDELETE = 1 + where GATE_AREA_ID in + + #{item} + + + diff --git a/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml b/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml new file mode 100644 index 00000000..6aa1edae --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/GateMachineMapper.xml @@ -0,0 +1,333 @@ + + + + mk_gate_machine + + + f + . + GATE_MACHINE_ID + , + f.GATE_MACHINE_TYPE, + f.EQUIPMENTID, + f.GATE_MACHINE_MODEL, + f.GATE_MACHINE_NAME, + f.STATE, + f.DESCR, + f.LATITUDE, + f.LONGITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.REMAKE + + + INSERT INTO mk_gate_machine + ( + GATE_MACHINE_ID, + GATE_AREA_ID, + GATE_MACHINE_NAME, + GATE_MACHINE_TYPE, + EQUIPMENTID, + GATE_MACHINE_MODEL, + STATE, + DESCR, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{GATE_MACHINE_ID}, + #{GATE_AREA_ID}, + #{GATE_MACHINE_NAME}, + #{GATE_MACHINE_TYPE}, + #{EQUIPMENTID}, + #{GATE_MACHINE_MODEL}, + #{STATE}, + #{DESCR}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + + + + + + + + + + update + + set + GATE_MACHINE_TYPE = #{GATE_MACHINE_TYPE}, + GATE_MACHINE_MODEL = #{GATE_MACHINE_MODEL}, + GATE_MACHINE_NAME = #{GATE_MACHINE_NAME}, + STATE = #{STATE}, + DESCR = #{DESCR}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + REMAKE = #{REMAKE} + where + GATE_MACHINE_ID = #{GATE_MACHINE_ID} + + + + update mk_gate_machine + set ISDELETE = 1 + where GATE_MACHINE_ID in + + #{item} + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml b/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml new file mode 100644 index 00000000..e716feaa --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/GateVideoMapper.xml @@ -0,0 +1,263 @@ + + + + + + + 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, + LONGITUDE + + + + + #{GATE_AREA_ID}, + #{VIDEONAME}, + #{OPDATE}, + #{OPUSER}, + #{ISDELETE}, + #{CODE}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{GATEVIDEO_ID}, + #{LATITUDE}, + #{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/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml new file mode 100644 index 00000000..4d0f9ebc --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -0,0 +1,3707 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml new file mode 100644 index 00000000..d1b0af87 --- /dev/null +++ b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index fc23d5e8..21c16631 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -592,4 +592,39 @@ where DEPARTMENT_ID = #{DEPARTMENT_ID} order by DEP_ORDER asc, NAME + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 42cf2520..514370b1 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1346,4 +1346,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ISASSESS = #{ISASSESS} + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml b/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml new file mode 100644 index 00000000..bc12068c --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/DataDockingLogMapper.xml @@ -0,0 +1,127 @@ + + + + + + + BUS_DATA_DOCKING_LOG + + + + + SYS_DICTIONARIES + + + + + f.DOCKING_MODULE, + f.DOCKING_TYPE, + f.DOCKING_TIME, + f.NUMBER, + f.BUS_DATA_DOCKING_ID + + + + + DOCKING_MODULE, + DOCKING_TYPE, + DOCKING_TIME, + NUMBER, + BUS_DATA_DOCKING_ID + + + + + #{DOCKING_MODULE}, + #{DOCKING_TYPE}, + #{DOCKING_TIME}, + #{NUMBER}, + #{BUS_DATA_DOCKING_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_DATA_DOCKING_ID = #{BUS_DATA_DOCKING_ID} + + + + + update + + set + DOCKING_MODULE = #{DOCKING_MODULE}, + DOCKING_TYPE = #{DOCKING_TYPE}, + DOCKING_TIME = #{DOCKING_TIME}, + NUMBER = #{NUMBER}, + BUS_DATA_DOCKING_ID = BUS_DATA_DOCKING_ID + where + BUS_DATA_DOCKING_ID = #{BUS_DATA_DOCKING_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_DATA_DOCKING_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml new file mode 100644 index 00000000..5d8a5afe --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml @@ -0,0 +1,472 @@ + + + + + + + bus_fireresources + + + + + FIRERESOURCES_ID, + FIRERESOURCES_NAME, + FIRERESOURCES_TYPE, + LONGTITUDE, + LATITUDE, + DESCR, + CREATIME, + OPERATIME, + ISDELETE, + CORPINFO_ID, + STATE + + + + + #{FIRERESOURCES_ID}, + #{FIRERESOURCES_NAME}, + #{FIRERESOURCES_TYPE}, + #{LONGTITUDE}, + #{LATITUDE}, + #{DESCR}, + #{CREATIME}, + #{OPERATIME}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{STATE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set ISDELETE = '1' + where + FIRERESOURCES_ID = #{FIRERESOURCES_ID} + + + + + update + + set + FIRERESOURCES_NAME = #{FIRERESOURCES_NAME}, + FIRERESOURCES_TYPE = #{FIRERESOURCES_TYPE}, + LONGTITUDE = #{LONGTITUDE}, + LATITUDE = #{LATITUDE}, + DESCR = #{DESCR}, + OPERATIME = #{OPERATIME}, + ISDELETE = #{ISDELETE}, + CORPINFO_ID = #{CORPINFO_ID}, + STATE = #{STATE} + where + FIRERESOURCES_ID = #{FIRERESOURCES_ID} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml new file mode 100644 index 00000000..ad4c1e9e --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml @@ -0,0 +1,521 @@ + + + + + + + BUS_METEOROLOGICAL + + + + + SYS_DICTIONARIES + + + + + f.OUTSOURCED_ID, + f.CORPINFO_ID, + f.EQUIPMENTNAME, + f.EQUIPMENTTYPE, + f.OPDATE, + f.OPUSER, + f.ISDELETE, + f.CODE, + f.PLATFORMMETEOROLOGICAL_ID, + f.METEOROLOGICAL_ID, + f.LATITUDE, + f.LONGITUDE, + f.TYPE + + + + + OUTSOURCED_ID, + CORPINFO_ID, + EQUIPMENTNAME, + EQUIPMENTTYPE, + OPDATE, + OPUSER, + ISDELETE, + CODE, + PLATFORMMETEOROLOGICAL_ID, + METEOROLOGICAL_ID, + LATITUDE, + LONGITUDE, + TYPE + + + + + #{OUTSOURCED_ID}, + #{CORPINFO_ID}, + #{EQUIPMENTNAME}, + #{EQUIPMENTTYPE}, + #{OPDATE}, + #{OPUSER}, + #{ISDELETE}, + #{CODE}, + #{PLATFORMMETEOROLOGICAL_ID}, + #{METEOROLOGICAL_ID}, + #{LATITUDE}, + #{LONGITUDE}, + #{TYPE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + update + + set + + OUTSOURCED_ID = #{OUTSOURCED_ID}, + + + EQUIPMENTNAME = #{EQUIPMENTNAME}, + + + EQUIPMENTTYPE = #{EQUIPMENTTYPE}, + + + CODE = #{CODE}, + + + TYPE = #{TYPE}, + + METEOROLOGICAL_ID = METEOROLOGICAL_ID + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + update + + set CODE= #{CODE} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + update + + set CODE= #{CODE} + where + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID} + + + + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICAL_ID in + + #{item} + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml new file mode 100644 index 00000000..3a2e2c88 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml @@ -0,0 +1,514 @@ + + + + + + + BUS_METEOROLOGICALINFO + + + + + SYS_DICTIONARIES + + + + + f.CORPINFO_ID, + f.TEMPERATURE, + f.HUMIDITY, + f.WINDDIRECTION, + f.WINDSPEED, + f.ISDELETE, + f.OPERATTIME, + f.METEOROLOGICAL_ID, + f.METEOROLOGICALINFO_ID, + f.OPERATOR, + f.CODE + + + + + CORPINFO_ID, + TEMPERATURE, + HUMIDITY, + WINDDIRECTION, + WINDSPEED, + ISDELETE, + OPERATTIME, + METEOROLOGICAL_ID, + METEOROLOGICALINFO_ID, + OPERATOR, + CODE + + + + + #{CORPINFO_ID}, + #{TEMPERATURE}, + #{HUMIDITY}, + #{WINDDIRECTION}, + #{WINDSPEED}, + #{ISDELETE}, + #{OPERATTIME}, + #{METEOROLOGICAL_ID}, + #{METEOROLOGICALINFO_ID}, + #{OPERATOR}, + #{CODE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + update + + set + + TEMPERATURE = #{TEMPERATURE}, + + + HUMIDITY = #{HUMIDITY}, + + + WINDDIRECTION = #{WINDDIRECTION}, + + + WINDSPEED = #{WINDSPEED}, + + METEOROLOGICALINFO_ID = METEOROLOGICALINFO_ID + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + update + + set CODE= #{CODE} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + + + update + + set CODE= #{CODE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + METEOROLOGICALINFO_ID in + + #{item} + + + + + + + + + + + + + insert into ( + METEOROLOGICALINFO_ID, + METEOROLOGICAL_ID, + CORPINFO_ID, + TEMPERATURE, + HUMIDITY, + WINDDIRECTION, + WINDSPEED, + OPERATTIME, + OPERATOR, + ISDELETE + ) values + + ( + #{data.METEOROLOGICALINFO_ID}, + #{data.METEOROLOGICAL_ID}, + #{data.CORPINFO_ID}, + #{data.TEMPERATURE}, + #{data.HUMIDITY}, + #{data.WINDDIRECTION}, + #{data.WINDSPEED}, + #{data.OPERATTIME}, + #{data.OPERATOR}, + #{data.ISDELETE} + ) + + + + + update + + set + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID}, + METEOROLOGICAL_ID = #{METEOROLOGICAL_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TEMPERATURE = #{TEMPERATURE}, + HUMIDITY = #{HUMIDITY}, + WINDDIRECTION = #{WINDDIRECTION}, + WINDSPEED = #{WINDSPEED}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ISDELETE = #{ISDELETE} + where + METEOROLOGICALINFO_ID = #{METEOROLOGICALINFO_ID} + + + + + diff --git a/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml new file mode 100644 index 00000000..7ae920a0 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml @@ -0,0 +1,243 @@ + + + + + + + BUS_PLATFORMELECTRONIC + + + + + SYS_DICTIONARIES + + + + + f.INDEXCODE, + f.REGIONINDEXCODE, + f.EXTERNALINDEXCODE, + f.NAME, + f.LONGITUDE, + f.LATITUDE, + f.CAMERATYPE, + f.CASCADECODE, + f.DECODETAG, + f.RESOURCETYPE, + f.CREATETIME, + f.UPDATETIME, + f.SORT, + f.DISORDER, + f.RECORDLOCATION, + f.CASCADETYPE, + f.REGIONNAME, + f.REGIONPATH, + f.REGIONPATHNAME, + f.PLATFORMELECTRONIC_ID, + f.FANGQU_IDS, + f.SUOSHUQUYU, + f.CORPINFO_ID + + + + + INDEXCODE, + REGIONINDEXCODE, + EXTERNALINDEXCODE, + NAME, + LONGITUDE, + LATITUDE, + CAMERATYPE, + CASCADECODE, + DECODETAG, + RESOURCETYPE, + CREATETIME, + UPDATETIME, + SORT, + DISORDER, + RECORDLOCATION, + CASCADETYPE, + REGIONNAME, + REGIONPATH, + REGIONPATHNAME, + PLATFORMELECTRONIC_ID, + FANGQU_IDS, + SUOSHUQUYU, + CORPINFO_ID + + + + + #{INDEXCODE}, + #{REGIONINDEXCODE}, + #{EXTERNALINDEXCODE}, + #{NAME}, + #{LONGITUDE}, + #{LATITUDE}, + #{CAMERATYPE}, + #{CASCADECODE}, + #{DECODETAG}, + #{RESOURCETYPE}, + #{CREATETIME}, + #{UPDATETIME}, + #{SORT}, + #{DISORDER}, + #{RECORDLOCATION}, + #{CASCADETYPE}, + #{REGIONNAME}, + #{REGIONPATH}, + #{REGIONPATHNAME}, + #{PLATFORMELECTRONIC_ID}, + #{FANGQU_IDS}, + #{SUOSHUQUYU}, + #{CORPINFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PLATFORMELECTRONIC_ID = #{PLATFORMELECTRONIC_ID} + + + + + update + + set + INDEXCODE = #{INDEXCODE}, + REGIONINDEXCODE = #{REGIONINDEXCODE}, + EXTERNALINDEXCODE = #{EXTERNALINDEXCODE}, + NAME = #{NAME}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CAMERATYPE = #{CAMERATYPE}, + CASCADECODE = #{CASCADECODE}, + DECODETAG = #{DECODETAG}, + RESOURCETYPE = #{RESOURCETYPE}, + CREATETIME = #{CREATETIME}, + UPDATETIME = #{UPDATETIME}, + SORT = #{SORT}, + DISORDER = #{DISORDER}, + RECORDLOCATION = #{RECORDLOCATION}, + CASCADETYPE = #{CASCADETYPE}, + REGIONNAME = #{REGIONNAME}, + REGIONPATH = #{REGIONPATH}, + REGIONPATHNAME = #{REGIONPATHNAME}, + FANGQU_IDS = #{FANGQU_IDS}, + SUOSHUQUYU = #{SUOSHUQUYU}, + CORPINFO_ID = #{CORPINFO_ID} + where + PLATFORMELECTRONIC_ID = #{PLATFORMELECTRONIC_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PLATFORMELECTRONIC_ID in + + #{item} + + + + + + + From bfb899e560e1b4707458eba9795ea910ac0ead3c Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 9 Jan 2024 16:12:50 +0800 Subject: [PATCH 05/38] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20=E7=89=B9?= =?UTF-8?q?=E7=BA=A7=E5=8A=A8=E7=81=AB=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/HotWorkApplicationUserMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml index 9ba0ada9..72c799a9 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml @@ -148,9 +148,9 @@ left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID left join oa_department dept1 on dept1.DEPARTMENT_ID = f.USER_ID - left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' - left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID - left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept1 on redept1.DEPARTMENT_ID = f.USER_ID + LEFT JOIN vi_user_all reuser ON reuser.USER_ID = f.USER_ID AND reuser.USERNAME != 'admin' + LEFT JOIN vi_department_all redept ON redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID + LEFT JOIN vi_department_all redept1 ON redept1.DEPARTMENT_ID = f.USER_ID where f.ISDELETE = '0' and(f.FOREIGN_KEY in From e14165e4cc56c49c0b63a158302079520b17b9b5 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 9 Jan 2024 16:40:03 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/HotWorkApplicationMapper.xml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index 29bb52a9..a87579fb 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -169,7 +169,29 @@ diff --git a/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml similarity index 99% rename from src/main/resources/mybatis/datasource/bus/MapEightMapper.xml rename to src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index f2241220..6572b52b 100644 --- a/src/main/resources/mybatis/datasource/bus/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -1,6 +1,6 @@ - + SELECT - 'VIDEO' TYPE, + 'camera' TYPE, v.VIDEOMANAGER_ID id, v.LONGITUDE, v.LATITUDE, From 57bd46e78484aed71b2e85d61ce0f5e2301e574d Mon Sep 17 00:00:00 2001 From: liulixin Date: Mon, 15 Jan 2024 17:44:16 +0800 Subject: [PATCH 17/38] =?UTF-8?q?CORPINFO=5FID=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java | 2 ++ src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java index 4dbf8ae1..c2c14e9a 100644 --- a/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Map; import com.zcloud.mapper.datasource.bus.IdentificationPartsMapper; import com.zcloud.mapper.datasource.bus.RiskPointMapper; +import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -118,6 +119,7 @@ public class RiskUnitServiceImpl implements RiskUnitService{ Map map = new HashMap(); String errInfo = "success"; //获取风险单元数、辨识部位数和风险因素数 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); List riskUnit = riskunitMapper.listAll(pd); List identificationParts = identificationPartsMapper.listAll(pd); List riskPoint = riskPointMapper.listAll(pd); diff --git a/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml b/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml index cfbd707a..ea3fb06e 100644 --- a/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml @@ -297,6 +297,9 @@ left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_identificationparts id on id.IDENTIFICATIONPARTS_ID = f.IDENTIFICATION_ID where f.ISDELETE = '0' + + and f.CORPINFO_ID = #{CORPINFO_ID} + and f.IDENTIFICATION_ID=#{CHECK_IDENTIFICATION_ID} From 163f532db94722f3bab7011d0a49ad4f0dcef37f Mon Sep 17 00:00:00 2001 From: liulixin Date: Tue, 16 Jan 2024 12:00:35 +0800 Subject: [PATCH 18/38] =?UTF-8?q?CORPINFO=5FID=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/czksmap/CzksMapEightController.java | 4 +--- .../controller/map/MapKeyProjectController.java | 2 ++ .../impl/PlatformvideomanagementServiceImpl.java | 1 + .../datasource/czksbimap/CzksMapEightMapper.xml | 14 +++++++------- .../fireresources/CzksFireResourcesMapper.xml | 3 +++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java index a6957fe7..380055cf 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -11,7 +11,6 @@ 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; @@ -22,7 +21,7 @@ import java.util.Map; * 官网：www.zcloudchina.com */ @Controller -@RequestMapping("/czks/Eight") +@RequestMapping("/czks/map/Eight") public class CzksMapEightController extends BaseController { @Autowired @@ -57,7 +56,6 @@ public class CzksMapEightController extends BaseController { PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); map.put("pd", data); - //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java index 7b3f5160..6051ea30 100644 --- a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java +++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java @@ -5,6 +5,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.map.MapEightService; import com.zcloud.service.map.MapKetProjectService; +import com.zcloud.util.Jurisdiction; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -73,6 +74,7 @@ public class MapKeyProjectController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); //根据条件增加参数或减少参数 都没有 直接返回空 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); if (ArrayDATA_IDS.size() == 0) { diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java index b7c41272..80a0511f 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java @@ -98,6 +98,7 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme @Override public List listAllForMap(PageData pd) { + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); return platformvideomanagementMapper.listAllForMap(pd); } diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index 6572b52b..ff526cc1 100644 --- a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -2421,7 +2421,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '5' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2444,7 +2444,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/blindboard.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_blindboard f + FROM gf_blindboard f left join bus_blindboardinfo bb on bb.BLINDBOARD_ID = f.BLINDBOARD_ID WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '6' @@ -2470,7 +2470,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/highwork.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2494,7 +2494,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/confinedspace.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '7' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2518,7 +2518,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_hoisting f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2542,7 +2542,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_breakground f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_breakground f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2566,7 +2566,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_cutroad f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_cutroad f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml index 272fc837..93d7a71a 100644 --- a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml @@ -407,6 +407,9 @@ AND fcs.ISDELETE = 0 where frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID} and fp.FIRE_POINT_ID = #{FIRE_POINT_ID} + + and d.CORPINFO_ID = #{pd.CORPINFO_ID} + GROUP BY frd.FIRE_RECORD_ID, fd.FIRE_DEVICE_ID From aa617724f184f7e6448dbbb186ce7a05a539f5ff Mon Sep 17 00:00:00 2001 From: liulixin Date: Tue, 16 Jan 2024 15:10:34 +0800 Subject: [PATCH 19/38] =?UTF-8?q?=E6=89=BF=E8=AF=BA=E4=B9=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/bus/CorpPromiseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java b/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java index 6804d04c..5e2a9df1 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpPromiseController.java @@ -293,7 +293,7 @@ public class CorpPromiseController extends BaseController { corpPromiseDetailsService.save(promise); corpPromiseDetails.add(promise); } - dockData.put("corpPromiseDetails",JSON.toJSONString(corpPromiseDetails)); + dockData.put("corpPromiseDetailsSave", JSON.toJSONString(corpPromiseDetails)); } corpPromisePeopleService.deletePromiseId(pd); //先删除承诺人数据，再新增 dockData.put("baseData",JSON.toJSONString(pd)); From 1d87206d40b7789df9a0d641f91a998cde277091 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 17 Jan 2024 13:54:06 +0800 Subject: [PATCH 20/38] =?UTF-8?q?=E6=B8=AF=E8=82=A1=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czksmap/ApiCzksMapController.java | 173 +++++ .../PlatformvideomanagementController.java | 590 +++++++++++++++++- .../java/com/zcloud/util/CzksPerLocUtil.java | 5 +- .../java/com/zcloud/util/HttpRequestUtil.java | 96 ++- src/main/java/com/zcloud/util/ReturnMap.java | 5 +- .../util/examUntil/BaseResultInterface.java | 18 + .../zcloud/util/examUntil/BizException.java | 84 +++ .../util/examUntil/CodeMessageEnum.java | 197 ++++++ .../zcloud/util/examUntil/ErrorOperation.java | 14 + .../examUntil/GlobalExceptionHandler.java | 94 +++ .../util/examUntil/HttpContextUtils.java | 54 ++ src/main/java/com/zcloud/util/hk/HKUtil.java | 5 +- 12 files changed, 1320 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java create mode 100644 src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java create mode 100644 src/main/java/com/zcloud/util/examUntil/BizException.java create mode 100644 src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java create mode 100644 src/main/java/com/zcloud/util/examUntil/ErrorOperation.java create mode 100644 src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java create mode 100644 src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java diff --git a/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java new file mode 100644 index 00000000..84c0618a --- /dev/null +++ b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java @@ -0,0 +1,173 @@ +package com.zcloud.controller.czksmap; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.HttpRequestUtil; +import com.zcloud.util.ReturnMap; +import com.zcloud.util.examUntil.ErrorOperation; +import com.zcloud.util.hk.HKUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * 说明：沧州矿石地图,摄像头同步数据 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/api/czks/map") +@ErrorOperation +public class ApiCzksMapController extends BaseController { + @Autowired + private UsersService usersService; + @Autowired + private DepartmentService departmentService; + + + /** + * @Description: 今日进出港数据 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "carInOutToday") + @ResponseBody + public ReturnMap carInOutToday() throws Exception { + ReturnMap returnMap = new ReturnMap(); + HashMap hashMap = new HashMap<>(); + hashMap.put("oreIn", "3252"); + hashMap.put("oreOut", "2356"); + hashMap.put("groceryIn", "200"); + hashMap.put("groceryOut", "125"); + hashMap.put("oreInAll", "33252"); + hashMap.put("oreOutAll", "32356"); + hashMap.put("groceryInAll", "2200"); + hashMap.put("groceryOutAll", "1125"); + returnMap.put("czksCarToday", hashMap); + return returnMap; + } + + /** + * @Description: 定位在线人员数 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "allPersonList") + @ResponseBody + public ReturnMap getOlinePersonCount() throws Exception { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", 1); + request.put("pageSize", 10); + request.put("online", "true"); + // 人员定位在线 + ReturnMap online = HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + pageData.put("CORPINFO_ID", "f8da1790b1034058ae2efefd69af3284"); + // 系统人员数 + int userCount = usersService.getUserCount(pageData); + // 系统部门数 + int departCount = departmentService.getDepartmentCount(pageData); + online.put("userCount", userCount); + online.put("departCount", departCount); + return online; + } + + /** + * @Description: 定位基础信息 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getCzksBasicLocationInfoData") + @ResponseBody + public ReturnMap getCzksBasicLocationInfoData() { + return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", ""); + } + + /** + * @Description: 定位标签状态 + * @Author: dearLin + * @Date: 2024/1/15/015 17:28 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/personStaffList") + @ResponseBody + public ReturnMap getCzksPersonStaffListPage() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("pageNum", pageData.getString("pageNum")); + request.put("pageSize", pageData.getString("pageSize")); + // 普通员工 + if ("1".equals(pageData.getString("type"))) { + return HttpRequestUtil.getPeopleApi("/person/staff/listPage", request.toString()); + } else { + // 相关方 员工 + return HttpRequestUtil.getPeopleApi("/person/allPerson/listPage", request.toString()); + } + } + + /** + * @Description: 人员定位告警数据 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getAlarmData") + @ResponseBody + public Object getAlarmData() { + return HttpRequestUtil.getPeopleApi("/statistics/alarmStatistics/todayAlarm", ""); + } + + /** + * @Description: 摄像头列表 + * @Author: dearLin + * @Date: 2024/1/17/017 13:44 + * @Param: [] [] + * @Return: java.lang.Object + */ + @RequestMapping(value="/platformList") + @ResponseBody + public Object platformList() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKUtil.cameraSearch(pd); + if(ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } + map.put("result", "success"); + return map; + } + + + /** + * @Description: 解析摄像头播放地址 + * @Author: dearLin + * @Date: 2024/1/15/015 17:22 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getCameraHlsPath") + @ResponseBody + public ReturnMap getCameraHlsPath() { + PageData pageData = this.getPageData(); + JSONObject request = new JSONObject(); + request.put("INDEXCODE", pageData.getString("INDEXCODE")); + return HttpRequestUtil.getCameraHlsPathApi("/platformvideomanagement/getHlsPath", request.toString()); + } +} diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 0910ae20..956b0961 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -33,6 +35,7 @@ public class PlatformvideomanagementController extends BaseController { @RequestMapping(value="/savePosition") @ResponseBody + @DockAnnotation public Object savePosition() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -46,10 +49,12 @@ public class PlatformvideomanagementController extends BaseController { } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @RequestMapping(value="/delLocation") @ResponseBody + @DockAnnotation public Object delLocation() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -57,6 +62,8 @@ public class PlatformvideomanagementController extends BaseController { pd = this.getPageData(); platformvideomanagementService.delLocation(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + return map; } /**新增 @@ -65,15 +72,16 @@ public class PlatformvideomanagementController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + PageData pd = this.getPageData(); pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //主键 platformvideomanagementService.save(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -117,10 +125,580 @@ public class PlatformvideomanagementController extends BaseController { public Object platformList() throws Exception{ Map map = new HashMap(); PageData pd =this.getPageData(); - map = HKUtil.cameraSearch(pd); - if(ObjectUtils.isEmpty(map)){ - map = new HashMap(); - } + +// map = HKUtil.cameraSearch(pd); +// if(ObjectUtils.isEmpty(map)){ +// map = new HashMap(); +// } + String result = " [\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"13097300002160000004\",\n" + + "\t\t\t\t\"regionPath\": \"@root000000@9e4f2218-ac70-4473-bebe-a1c5dbacbf2f@34030000002001000001@13097300002160000000@13097300002160000004@\",\n" + + "\t\t\t\t\"cascadeType\": 1,\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/矿石作业区/矿石平台/矿石港务码头监控/堆取料机\",\n" + + "\t\t\t\t\"cascadeCode\": \"13097300002000052168\",\n" + + "\t\t\t\t\"latitude\": \"0.000000\",\n" + + "\t\t\t\t\"regionName\": \"堆取料机\",\n" + + "\t\t\t\t\"indexCode\": \"13097300001320000328\",\n" + + "\t\t\t\t\"updateTime\": \"2024-01-16T05:00:06.000+08:00\",\n" + + "\t\t\t\t\"sort\": -10005989,\n" + + "\t\t\t\t\"recordLocation\": \"0_1\",\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"disOrder\": -10005989,\n" + + "\t\t\t\t\"createTime\": \"2023-05-17T15:24:22.000+08:00\",\n" + + "\t\t\t\t\"name\": \"高压室二\",\n" + + "\t\t\t\t\"decodeTag\": \"ga_h264\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13097300001320000328\",\n" + + "\t\t\t\t\"longitude\": \"0.000000\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"13097300002160000004\",\n" + + "\t\t\t\t\"regionPath\": \"@root000000@9e4f2218-ac70-4473-bebe-a1c5dbacbf2f@34030000002001000001@13097300002160000000@13097300002160000004@\",\n" + + "\t\t\t\t\"cascadeType\": 1,\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/矿石作业区/矿石平台/矿石港务码头监控/堆取料机\",\n" + + "\t\t\t\t\"cascadeCode\": \"13097300002000052168\",\n" + + "\t\t\t\t\"latitude\": \"0.000000\",\n" + + "\t\t\t\t\"regionName\": \"堆取料机\",\n" + + "\t\t\t\t\"indexCode\": \"13097300001320000329\",\n" + + "\t\t\t\t\"updateTime\": \"2024-01-16T05:00:05.000+08:00\",\n" + + "\t\t\t\t\"sort\": -10006115,\n" + + "\t\t\t\t\"recordLocation\": \"0_1\",\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"disOrder\": -10006115,\n" + + "\t\t\t\t\"createTime\": \"2023-05-17T15:24:23.000+08:00\",\n" + + "\t\t\t\t\"name\": \"高压室一\",\n" + + "\t\t\t\t\"decodeTag\": \"ga_h264\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13097300001320000329\",\n" + + "\t\t\t\t\"longitude\": \"0.000000\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"4b85c88181cd4741b124d4b456bc7d14\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6768,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"5405983799d345d69a6289885d7bd365\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.978+08:00\",\n" + + "\t\t\t\t\"sort\": 6768,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"4c363eaefd36472297c44a239bf96003\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.438+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅洗消间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000838\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"e326096d6d3d4b8aab925ca05d897d46\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6767,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"8c6c6329869742f8a107e059704f3d8e\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.979+08:00\",\n" + + "\t\t\t\t\"sort\": 6767,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"8b8232c02a694704a761c7f3e81dbf0e\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:55.678+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅南侧楼梯\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000826\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"35dced7d3467425ea833eb4320b37490\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6766,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"5679d668c31f495984570370333d9b77\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.980+08:00\",\n" + + "\t\t\t\t\"sort\": 6766,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"9e8c625a9a064bfb831a8140c5aeebe3\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.789+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅南侧入口\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000846\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"0ff25bed693e444ba9540ef08c108902\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6735,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"f25ae4ce23404cc0a4aa9e53fd1731f1\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.981+08:00\",\n" + + "\t\t\t\t\"sort\": 6735,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"b0d6560cd494436cb9e03c36377fea2d\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:47.978+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅北侧楼梯\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000832\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"72560dd84bed4dae81a9ffa6186bc1ca\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6734,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"7bfda70b752b42a7a18760cd6b6a4458\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.982+08:00\",\n" + + "\t\t\t\t\"sort\": 6734,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"8cb5c82f17024819979aa8da9d79d3d0\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:55.259+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅北侧入口\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000833\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"2c12810d5a1144fa83caa36970fcdd0b\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6733,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"3b6a0aa63c11471097c80e892931a4f2\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.983+08:00\",\n" + + "\t\t\t\t\"sort\": 6733,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"a43bad8e99984d8ab07b079975cb7ad9\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:47.235+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东南角\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000835\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"6671cdcc8e494b998b4a080eafd0c721\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6732,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"ac2f62430dc44729862edfdb7bf607a4\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.984+08:00\",\n" + + "\t\t\t\t\"sort\": 6732,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"4556469b457f4f90a2543e1dfe0f921a\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:50.854+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东北角\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000822\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"58dc6742e9c644cca184ec4c5030d791\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6731,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"a1b8b2388ebe4bdc8e0d5f90e29e0646\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.985+08:00\",\n" + + "\t\t\t\t\"sort\": 6731,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"e4da9e19b5134f458b7cafaa4a15e8a0\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.044+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂餐厅东侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000824\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"277b614fe37c40c79bf6f86222d3bddb\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6730,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"3d38235515af45b48b7cbcc1bc5d0028\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.986+08:00\",\n" + + "\t\t\t\t\"sort\": 6730,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"3c2d71bf2be045b6a8dfe4872f0d5c03\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.713+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂菜类粗加工间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000840\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"7bf6563bdc4a442a972633749cff4047\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6729,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"ef013768f7fb4e67b9b10f22d260695c\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.987+08:00\",\n" + + "\t\t\t\t\"sort\": 6729,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"74dea9993b1e4abf93534f3d9717b666\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:49.676+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂肉类海产品粗加工间\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000845\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"43a9b45c9664411e941003219dca1ead\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6728,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"61808f1d2fd6468caeb8326ddc3e2d6a\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.988+08:00\",\n" + + "\t\t\t\t\"sort\": 6728,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"dfbd0eeec8094d919c262d65848f9cd8\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:52.089+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂管理室\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000828\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"3c275a198d4c4bf5979dbae1bf9cbf0d\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6727,\n" + + "\t\t\t\t\"capability\": \"@event_vss@io@vss@record@ptz@remote_vss@net@maintenance@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"e8215420e6364bf182625fc372d11022\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.989+08:00\",\n" + + "\t\t\t\t\"sort\": 6727,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"2be64a34f89c4f3da3318bc7f5045cc6\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:48.926+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂监控机房\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000830\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"749e994d28c2474ba7d0bdf31535a956\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6726,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"d3c72e6747854832bc254cffd6cbabe4\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.990+08:00\",\n" + + "\t\t\t\t\"sort\": 6726,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"0cb8471dfe534beaaabae444b6c0cd62\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:58.376+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂清真厨房\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000849\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"f40b9801a09e4922bad2c3f916ee232f\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6725,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"d366a48139f84550867ae0cd31fde575\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.991+08:00\",\n" + + "\t\t\t\t\"sort\": 6725,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"d8131b366f0a464da807126f135bde07\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:57.419+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂室外气瓶室\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000827\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"85cde34633634b28bbef88ea323a6d30\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6724,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"f02324c0af874e06a4a09fd2e7b2fdc3\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.992+08:00\",\n" + + "\t\t\t\t\"sort\": 6724,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"c135a232f8a94848b1398f16758a1029\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:54.602+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂备餐区南侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000825\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"b313b0c0feca4fbea76b77f6ff510430\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6723,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"bfa53c5c696a4c4788e8264490c54626\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.993+08:00\",\n" + + "\t\t\t\t\"sort\": 6723,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"65996e9f1245416c9a38ff77a225b12b\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:56.371+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂备餐区北侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000836\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"7678102b59f543d8872c048e089837e3\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6722,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"b0435c02f51e4d38af98014162fc1998\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.994+08:00\",\n" + + "\t\t\t\t\"sort\": 6722,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"5398df57b1df4bd6917e26ae37404a59\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:58.736+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂售饭区南侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000834\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t},\n" + + "\t\t\t{\n" + + "\t\t\t\t\"regionIndexCode\": \"c8cb2047-e430-43a3-8f37-8348e6463055\",\n" + + "\t\t\t\t\"dacIndexCode\": \"--\",\n" + + "\t\t\t\t\"regionPathName\": \"沧州矿石港务有限公司/杂货作业区/综合业务调度楼\",\n" + + "\t\t\t\t\"latitude\": \"\",\n" + + "\t\t\t\t\"regionName\": \"综合业务调度楼\",\n" + + "\t\t\t\t\"indexCode\": \"60d63ac1107642889d11b568f3d62d80\",\n" + + "\t\t\t\t\"channelType\": \"analog\",\n" + + "\t\t\t\t\"recordLocation\": \"0\",\n" + + "\t\t\t\t\"disOrder\": 6721,\n" + + "\t\t\t\t\"capability\": \"@event_face_detect_alarm@event_audio@io@event_gis@event_rule@gis@event_ias@event_vss@record@vss@event_io@net@maintenance@event_device@status@\",\n" + + "\t\t\t\t\"parentIndexCode\": \"e4683b93615b4adf9b171b1316dc28b2\",\n" + + "\t\t\t\t\"longitude\": \"\",\n" + + "\t\t\t\t\"chanNum\": 1,\n" + + "\t\t\t\t\"regionPath\": \"@root000000@8b975d79-ef3f-4543-89a9-8c7bb314bd74@c8cb2047-e430-43a3-8f37-8348e6463055@\",\n" + + "\t\t\t\t\"cascadeType\": 0,\n" + + "\t\t\t\t\"installLocation\": \"\",\n" + + "\t\t\t\t\"updateTime\": \"2023-09-29T11:09:06.995+08:00\",\n" + + "\t\t\t\t\"sort\": 6721,\n" + + "\t\t\t\t\"cameraType\": 0,\n" + + "\t\t\t\t\"treatyType\": \"hiksdk_net\",\n" + + "\t\t\t\t\"cameraRelateTalk\": \"95355f0b298c4e8a9d32bd2b834e7521\",\n" + + "\t\t\t\t\"transType\": 1,\n" + + "\t\t\t\t\"createTime\": \"2023-07-20T12:51:57.071+08:00\",\n" + + "\t\t\t\t\"name\": \"食堂售饭区北侧\",\n" + + "\t\t\t\t\"decodeTag\": \"hikvision\",\n" + + "\t\t\t\t\"externalIndexCode\": \"13098301581314000831\",\n" + + "\t\t\t\t\"resourceType\": \"camera\"\n" + + "\t\t\t}\n" + + "\t\t]"; + HashMap data = new HashMap<>(); + data.put("list", JSON.parseArray(result,PageData.class)); + map.put("data", data); map.put("result", "success"); return map; } diff --git a/src/main/java/com/zcloud/util/CzksPerLocUtil.java b/src/main/java/com/zcloud/util/CzksPerLocUtil.java index 7341d147..70494bd4 100644 --- a/src/main/java/com/zcloud/util/CzksPerLocUtil.java +++ b/src/main/java/com/zcloud/util/CzksPerLocUtil.java @@ -13,9 +13,9 @@ public class CzksPerLocUtil { // @Value("${perLoc.url}") // 线上地址 - // public static String perLocUrl = "http://172.16.130.86/gateway-service"; + public static String perLocUrl = "http://172.16.130.86/gateway-service"; // 线上外网映射 - public static String perLocUrl = "http://221.195.199.13:7811/gateway-service"; +// public static String perLocUrl = "http://221.195.199.13:7811/gateway-service"; // @Value("${perLoc.userName}") // private String userName; // @Value("${perLoc.pwd}") @@ -26,6 +26,7 @@ public class CzksPerLocUtil { private static String code = "1"; // token private static String perLocToken = ""; + public static String CameraHlsUrl = "http://221.195.199.13:7811"; public static String getToken(){ diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index d61e99a1..bef4572a 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -6,10 +6,7 @@ import org.springframework.lang.Nullable; import javax.servlet.http.HttpServletRequest; import java.io.*; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; +import java.net.*; import java.util.HashMap; /** @@ -206,6 +203,7 @@ public class HttpRequestUtil { InputStream is = null; BufferedReader br = null; try { + CookieHandler.setDefault(new CookieManager(null, CookiePolicy.ACCEPT_ALL)); //创建连接对象 URL url = new URL(httpUrl); //创建连接 @@ -395,6 +393,96 @@ public class HttpRequestUtil { //设置通用的请求属性 // 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; + } + public static ReturnMap getCameraHlsPathApi(String httpUrl, String param) { + StringBuffer result = new StringBuffer(); + //连接 + HttpURLConnection connection = null; + OutputStream os = null; + InputStream is = null; + BufferedReader br = null; + try { + //创建连接对象 + URL url = new URL(CzksPerLocUtil.CameraHlsUrl + httpUrl); + //创建连接 + connection = (HttpURLConnection) url.openConnection(); + //设置请求方法 + connection.setRequestMethod("POST"); + //设置连接超时时间 + connection.setConnectTimeout(15000); + //设置读取超时时间 + connection.setReadTimeout(15000); + //DoOutput设置是否向httpUrlConnection输出，DoInput设置是否从httpUrlConnection读入，此外发送post请求必须设置这两个 + //设置是否可读取 + connection.setDoOutput(true); + connection.setDoInput(true); + //设置通用的请求属性 +// connection.setRequestProperty("accept", "*/*"); +// connection.setRequestProperty("connection", "Keep-Alive"); // connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); // 必须添加token diff --git a/src/main/java/com/zcloud/util/ReturnMap.java b/src/main/java/com/zcloud/util/ReturnMap.java index 78268d59..5079a642 100644 --- a/src/main/java/com/zcloud/util/ReturnMap.java +++ b/src/main/java/com/zcloud/util/ReturnMap.java @@ -1,6 +1,7 @@ package com.zcloud.util; +import com.zcloud.util.examUntil.CodeMessageEnum; import org.apache.http.HttpStatus; import java.util.HashMap; import java.util.Map; @@ -42,7 +43,9 @@ public class ReturnMap extends HashMap { return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); } - + public static ReturnMap error(CodeMessageEnum codeMessageEnum, String url) { + return error(codeMessageEnum.getCode(),codeMessageEnum.getMessage(), url); + } /** * 原先R的code和msg被覆盖 * diff --git a/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java b/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java new file mode 100644 index 00000000..5b28ac67 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java @@ -0,0 +1,18 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +/** + * @desc 对象返回到前端以及异常抛出的接口类 + */ +public interface BaseResultInterface { + + + String getCode(); + + + String getMessage(); +} diff --git a/src/main/java/com/zcloud/util/examUntil/BizException.java b/src/main/java/com/zcloud/util/examUntil/BizException.java new file mode 100644 index 00000000..795390b9 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/BizException.java @@ -0,0 +1,84 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + +public class BizException extends RuntimeException implements BaseResultInterface { + + private static final long serialVersionUID = 1L; + + + /** + * 错误码 + */ + private String code; + + /** + * 错误信息 + */ + private String message; + + public BizException() { + super(); + } + + public BizException(CodeMessageEnum codeMessageEnum) { + super(codeMessageEnum.getCode(),new Throwable()); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage(); + } + + public BizException(CodeMessageEnum codeMessageEnum, Throwable cause) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage(); + } + public BizException (CodeMessageEnum codeMessageEnum, Throwable cause,String details) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = codeMessageEnum.getMessage() + details; + } + public BizException(CodeMessageEnum codeMessageEnum, String message, Throwable cause) { + super(codeMessageEnum.getCode(), cause); + this.code = codeMessageEnum.getCode(); + this.message = message; + } + + public BizException(String message) { + super(message); + this.message = message; + } + + public BizException(String code, String message) { + super(code); + this.code = code; + this.message = message; + } + + public BizException(String code, String message, Throwable cause) { + super(code, cause); + this.code = code; + this.message = message; + } + + @Override + public Throwable fillInStackTrace() { + return this; + } + + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } +} + + diff --git a/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java b/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java new file mode 100644 index 00000000..2ac51a53 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java @@ -0,0 +1,197 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public enum CodeMessageEnum implements BaseResultInterface { + + /** ********* 0000成功 *************** */ + SUCCESS("0000", "成功!"), + SUCCESS_LOGIN("0001", "用户登录成功"), + SUCCESS_LOGOUT("0002", "用户退出成功"), + + /* 默认失败 */ + COMMON_FAIL("999", "失败"), + + /** ********* 1xxx系统错误 *************** */ + SERVER_BUSY("1001", "服务器正忙，请稍后再试!"), + INTERNAL_SERVER_ERROR("1002", "服务器内部错误"), + NOT_FOUND("1003", "未找到该资源!"), + REQUEST_METHOD_ERROR("1004", "接口请求方法异常"), + SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"), + NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"), + INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"), + PARSE_TOKEN_EXCEPTION("1008", "解析token异常"), + TOKEN_NOT_EXIST("1009", "token不存在"), + TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"), + TOKEN_EXPIRE("1011", "token过期，请重新登录"), + IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"), + NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"), + UPLOAD_FILE_ERROR("1014", "文件上传失败"), + FILE_NOT_EXIST("1015", "文件不存在"), + FILE_HAS_DELETED("1016", "文件已被删除"), + DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."), + TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"), + CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"), + DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"), + CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"), + DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."), + CREATE_DATABASE_ERROR("1023", "创建数据库失败"), + CREATE_TABLE_ERROR("1024", "创建表失败"), + UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"), + DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"), + QUERY_ROLE_ERROR("1027", "查询角色失败"), + UPDATE_GROUP_ERROR("1028", "更新接口组失败"), + DELETE_GROUP_ERROR("1029", "删除接口组失败"), + SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"), + + /** + * ******2xxx参数错误 ********************* + */ + BODY_NOT_MATCH("2001", "请求的数据格式不符"), + SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"), + REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"), + NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"), + NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"), + NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"), + NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"), + NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"), + SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"), + TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"), + FILE_PICTURE_IS_NULL("2011", "附件不存在"), + FILE_PICTURE_DELETE("2012", "删除附件失败"), + DIC_BIANMA_REPEAT("2013", "字典编码重复"), + + + + + + /** *********** 3xxx用户错误 ******************* */ + USER_NOT_LOGIN("3001", "用户未登录"), + USER_ACCOUNT_EXPIRED("3002", "账号已过期"), + USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"), + USER_CREDENTIALS_EXPIRED("3004", "密码过期"), + USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"), + USER_ACCOUNT_LOCKED("3006", "账号被锁定"), + USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"), + USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"), + USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"), + USER_NO_PERMISSION("3010", "当前账号没有此权限"), + USERNAME_NOT_BLANK("3011", "用户不能为空"), + USER_LOGIN_ERROR("3012", "用户登录失败"), + USER_LOGOUT_ERROR("3013", "用户退出失败"), + USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"), + USER_ACCESS_DENIED("3015", "权限认证失败"), + USERNAME_EXIST_ERROR("3016", "用户名重名"), + + ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"), + + /** ********** 4xxx业务错误 *********************** */ + ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"), + APP_KEY_EXIST("4002", "应用key已存在"), + APP_NOT_EXIST("4003", "应用不存在"), + APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"), + APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"), + APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"), + APP_PAGE_TYPE_ERROR("4007", "页面类型有误"), + APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"), + CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"), + DELETE_PAGE_ERROR("4010", "删除页面失败"), + CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"), + APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"), + DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"), + DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"), + DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"), + MODEL_NOT_EXIST("4016", "当前模型不存在"), + MODEL_HAS_DELETED("4017", "当前模型已删除"), + MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"), + DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"), + DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"), + DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"), + DEPT_USER_EXIST("4022", "部门下存在用户"), + NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"), + MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"), + MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"), + MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"), + FORM_NOT_EXIST("4027", "模型表单不存在"), + READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"), + MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"), + NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"), + APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"), + DELETE_COLUMN_ERROR("4032", "删除当前失败"), + INSERT_DATA_ERROR("4033", "新建数据失败"), + EDIT_DATA_ERROR("4034", "编辑数据失败"), + DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"), + NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"), + PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"), + AMIS_PAGE_ERROR("4038", "分页参数异常"), + QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"), + REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"), + STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"), + APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"), + APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"), + APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"), + NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"), + NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"), + CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"), + CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"), + APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"), + UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"), + DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"), + INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"), + DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"), + CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"), + CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"), + NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"), + JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"), + NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"), + NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"), + FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."), + APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"), + APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"), + TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"), + TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"), + TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"), + TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"), + CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"), + NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"), + APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"), + DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在") + ; + + CodeMessageEnum(String code, String message) { + this.code = code; + this.message = message; + } + + /** 返回到前端的code值 */ + private String code; + + /** 返回到前端的code对应的message值 */ + private String message; + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } + +// public static CodeVo getJsonObjectByCode(String code) { +// CodeVo codeVo = new CodeVo(); +// if (Tools.isEmpty(code)) { +// return codeVo; +// } +// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) { +// if (enumObj.getCode().equals(code)) { +// return new CodeVo(code, enumObj.message); +// } +// } +// return codeVo; +// } +} diff --git a/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java b/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java new file mode 100644 index 00000000..6489d786 --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/ErrorOperation.java @@ -0,0 +1,14 @@ +package com.zcloud.util.examUntil; + +import java.lang.annotation.*; + +/** + * @Description: 异常拦截接口 + * @Author: dearLin + * @Date: 2023/3/8 + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ErrorOperation { +} diff --git a/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java b/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java new file mode 100644 index 00000000..138f443f --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java @@ -0,0 +1,94 @@ +package com.zcloud.util.examUntil; + +/** + * 说明：TODO + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ + + +import com.zcloud.util.ReturnMap; +import org.mybatis.spring.MyBatisSystemException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; + +import static com.zcloud.util.examUntil.CodeMessageEnum.SERVER_BUSY; + + +/** + * 全局异常 + */ +@RestControllerAdvice(annotations = {ErrorOperation.class}) +//@Slf4j +public class GlobalExceptionHandler { + + /** + * 业务异常类 + * + */ + @ExceptionHandler(value = BizException.class) + @ResponseBody + public ReturnMap bizExceptionHandler(HttpServletRequest req, BizException e) { + e.printStackTrace(); +// log.error("发生业务异常: {}, 请求接口: {}", e.getMessage(), req.getRequestURI()); + return ReturnMap.error("2001" ,e.getMessage(), req.getRequestURI()); + } + + + /** + * 空指针异常 + * + * @param e 异常信息 + * @param req 请求 + */ + @ExceptionHandler(value = NullPointerException.class) + @ResponseBody + public ReturnMap exceptionHandler(HttpServletRequest req, NullPointerException e) { + e.printStackTrace(); +// log.error("空指针异常信息: {}, 请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + /** + * 接口请求方法异常 + * + */ + @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class) + @ResponseBody + public ReturnMap methodNotSupportedExceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("请求方法异常信息: {}，请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + /** + * SQL 语法错误异常 + */ + @ExceptionHandler(value = MyBatisSystemException.class) + @ResponseBody + public ReturnMap sqlSyntaxErrorExceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("MyBatis系统异常信息: {}，请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } + + + + /** + * 其他异常信息 + * + * @param req + * @param e + */ + @ExceptionHandler(value = Exception.class) + @ResponseBody + public ReturnMap exceptionHandler(HttpServletRequest req, Exception e) { + e.printStackTrace(); +// log.error("未知异常: {}, 请求接口: {}", e, req.getRequestURI()); + return ReturnMap.error(SERVER_BUSY, req.getRequestURI()); + } +} diff --git a/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java b/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java new file mode 100644 index 00000000..fcae61ef --- /dev/null +++ b/src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java @@ -0,0 +1,54 @@ +package com.zcloud.util.examUntil; + +import org.apache.commons.lang.StringUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +/** + * 说明：获取请求参数工具类 + * 作者：wangxuan + * 官网：www.zcloudchina.com + */ +public class HttpContextUtils { + public static HttpServletRequest getHttpServletRequest() { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if(requestAttributes == null){ + return null; + } + + return ((ServletRequestAttributes) requestAttributes).getRequest(); + } + + public static Map getParameterMap(HttpServletRequest request) { + Enumeration parameters = request.getParameterNames(); + + Map params = new HashMap<>(); + while (parameters.hasMoreElements()) { + String parameter = parameters.nextElement(); + String value = request.getParameter(parameter); + if (StringUtils.isNotBlank(value)) { + params.put(parameter, value); + } + } + + return params; + } + + public static String getDomain(){ + HttpServletRequest request = getHttpServletRequest(); + StringBuffer url = request.getRequestURL(); + return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString(); + } + + public static String getOrigin(){ + HttpServletRequest request = getHttpServletRequest(); + return request.getHeader(HttpHeaders.ORIGIN); + } +} diff --git a/src/main/java/com/zcloud/util/hk/HKUtil.java b/src/main/java/com/zcloud/util/hk/HKUtil.java index 2a3c53a7..68c76148 100644 --- a/src/main/java/com/zcloud/util/hk/HKUtil.java +++ b/src/main/java/com/zcloud/util/hk/HKUtil.java @@ -14,8 +14,9 @@ import java.util.Map; */ public class HKUtil { static { - // 代理API网关nginx服务器ip端口 - ArtemisConfig.host = "172.17.100.1:443"; + // 代理API网关nginx服务器ip端口 线上 + ArtemisConfig.host = "172.17.100.1:443"; +// ArtemisConfig.host = "221.195.199.13:7811"; // 秘钥appkey ArtemisConfig.appKey = "29806794"; // 秘钥appSecret From 95d325c6a533614c9abcbd846942ac554299c3c9 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 17 Jan 2024 16:01:16 +0800 Subject: [PATCH 21/38] =?UTF-8?q?=E6=B8=AF=E8=82=A1=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E6=B2=A7=E5=B7=9E=E7=9F=BF=E7=9F=B3=E5=9C=B0=E5=9B=BE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/czksmap/ApiCzksMapController.java | 12 ++++++++++++ src/main/java/com/zcloud/util/CzksPerLocUtil.java | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java index 84c0618a..de091519 100644 --- a/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java +++ b/src/main/java/com/zcloud/controller/czksmap/ApiCzksMapController.java @@ -170,4 +170,16 @@ public class ApiCzksMapController extends BaseController { request.put("INDEXCODE", pageData.getString("INDEXCODE")); return HttpRequestUtil.getCameraHlsPathApi("/platformvideomanagement/getHlsPath", request.toString()); } + @RequestMapping(value="/getHlsPath") + @ResponseBody + public Object getHlsPath() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); + if(ObjectUtils.isEmpty(map)){ + map = new HashMap(); + } + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/util/CzksPerLocUtil.java b/src/main/java/com/zcloud/util/CzksPerLocUtil.java index 70494bd4..0414b2a1 100644 --- a/src/main/java/com/zcloud/util/CzksPerLocUtil.java +++ b/src/main/java/com/zcloud/util/CzksPerLocUtil.java @@ -13,9 +13,9 @@ public class CzksPerLocUtil { // @Value("${perLoc.url}") // 线上地址 - public static String perLocUrl = "http://172.16.130.86/gateway-service"; +// public static String perLocUrl = "http://172.16.130.86/gateway-service"; // 线上外网映射 -// public static String perLocUrl = "http://221.195.199.13:7811/gateway-service"; + public static String perLocUrl = "http://221.195.199.13:7811/gateway-service"; // @Value("${perLoc.userName}") // private String userName; // @Value("${perLoc.pwd}") From aa5a53137d98f4f2fa23c499d3a43b9877b87013 Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 14:29:45 +0800 Subject: [PATCH 22/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/filemanager/MfolderController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 9ecbef59..b7c354a9 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -138,7 +138,8 @@ public class MfolderController extends BaseController { @RequestParam(value = "PARENT_ID", required = false) String PARENT_ID, @RequestParam(value = "REMARKS", required = false) String REMARKS, @RequestParam(value = "SHARE", required = false) String SHARE) throws Exception { - Map map = new HashMap(); + Map map = new HashMap<>(); + ArrayList pictureList = new ArrayList<>(); String errInfo = "success"; PageData pd = new PageData(); if (files != null && files.length > 0) { @@ -155,8 +156,6 @@ public class MfolderController extends BaseController { MultipartFile file = files[i]; String ffile = DateUtil.getDays(), fileName = ""; if (null != file && !file.isEmpty()) { -// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 -// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 Long size = file.getSize()/1024; fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); @@ -173,18 +172,20 @@ public class MfolderController extends BaseController { pd.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间 pd.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名 pd.put("MASTER", Jurisdiction.getUsername()); // 用户名 -// pd.put("FILESIZE", FileUtil.getFilesize(Const.FILEURL + Const.FILEPATHFILE -// + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName)); // 文件大小 pd.put("REMARKS", REMARKS); // 备注 pd.put("SHARE", SHARE); // 是否共享 pd.put("MFOLDER_ID", this.get32UUID()); // 主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ + "@@" + +fileName); mfolderService.save(pd); // 存入数据库表 } else { errInfo = "fail"; } } } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); // 返回结果 return map; From 8883f58af705d3144453f7e6484129b6d85c00b5 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 14:36:21 +0800 Subject: [PATCH 23/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/Const.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 3cd7334f..2121cf7b 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -47,8 +47,8 @@ public class Const { public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码 public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址 - public static final String HTTPFILEURL = "https://skqhdg.porthebei.com:9004/file/"; //文件服务器地址 -// public static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/"; + // TODO 体系文件下载地址 + public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址 public final static String APPID = "wx9199de454d31b016"; public final static String SECRET = "183cdcac380e1f98f00c793491e27d88"; public static final String XCX_MCH_ID = "1607757714"; From 5678f4451dc1be3e986e81597fadc910ffabafff Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 15:11:33 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=8E=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/czksmap/CzksMapEightController.java | 8 +++++++- src/main/resources/application-dev.properties | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java index 380055cf..7b42cd69 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -51,7 +51,7 @@ public class CzksMapEightController extends BaseController { public Object findFormCount() throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = this.getPageData(); + PageData pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); @@ -99,6 +99,12 @@ public class CzksMapEightController extends BaseController { } else { varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); } + // 处理一下 name 的问题 + if (varList != null) { + varList.forEach(item -> { + item.put("MAP_POINT_NAME", item.getString("NAME")); + }); + } map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a1e4e247..b22d959d 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -92,10 +92,10 @@ mq.group.docking=scheduled_tasks_docking perLoc.url=http://172.16.130.86/gateway-service perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ -corp.default.pic-path=https://qgqy.qhdsafety.com/ -corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://wwag.qhdsafety.com/file/ +corp.default.back-end-path=https://wwag.qhdsafety.com/file/ -http.file.url=https://qgqy.qhdsafety.com/file/ +http.file.url=https://wwag.qhdsafety.com/file/ #???????????? baseimgpath =https://wwag.qhdsafety.com/file/ cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd From 77830f3e8379df863fbb5c316c9bb90a740cb045 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 15:21:11 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E6=91=84=E5=83=8F=E5=A4=B4=EF=BC=8C=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/czksmap/CzksObtainDisplayDataController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java index ec858b3d..7f9b4cdd 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; import com.zcloud.service.bus.RiskUnitService; import com.zcloud.service.keyProjects.PlatformvideomanagementService; +import com.zcloud.util.ReturnMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,7 +30,9 @@ public class CzksObtainDisplayDataController extends BaseController { @ResponseBody public Object listAllCameraForMap() throws Exception{ PageData pd = this.getPageData(); - return platformvideomanagementService.listAllForMap(pd); + ReturnMap returnMap = new ReturnMap(); + returnMap.put("data", platformvideomanagementService.listAllForMap(pd)); + return returnMap; } From 9986f6e3ea84845542c76f6fb0ffa17e4eb4de72 Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 15:50:02 +0800 Subject: [PATCH 26/38] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/firemanager/FireCheckListMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml index 9cd9898c..8cc7722d 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml @@ -64,15 +64,14 @@ cl.FIRE_CHECK_STANDARD_NAME, cl.FIRE_CHECK_TYPE AS FIRE_CHECK_TYPE_ID, IFNULL( FINISHED, 0 ) FINISHED, - d.`NAME` AS DEPARTMENTNAME, + od.`NAME` AS DEPARTMENTNAME, su.`NAME` AS USERNAME, cl.STATE, sys_dictionaries.`NAME` AS FIRE_CHECK_TYPE, cl.FIRE_CHECK_ID, ifnull(tt.CHECK_NUM,0) CHECK_NUM FROM - bus_fire_checklist AS cl - left JOIN oa_department AS d ON cl.DEPARTMENT_ID = d.DEPARTMENT_ID + bus_fire_checklist as cl LEFT JOIN ( SELECT FIRE_CHECK_ID, @@ -86,6 +85,8 @@ AND CORPINFO_ID = #{pd.CORPINFO_ID} GROUP BY FIRE_CHECK_ID,PERIODSTART,PERIODEND ) AS t ON cl.FIRE_CHECK_ID = t.FIRE_CHECK_ID LEFT JOIN sys_user AS su ON cl.USER_ID = su.USER_ID + left join oa_department od + on od.DEPARTMENT_ID = su.DEPARTMENT_ID LEFT JOIN sys_dictionaries ON cl.FIRE_CHECK_TYPE = sys_dictionaries.BIANMA LEFT JOIN (SELECT FIRE_CHECK_ID, count(1) CHECK_NUM from bus_fire_record GROUP BY FIRE_CHECK_ID ) tt on cl.FIRE_CHECK_ID = tt.FIRE_CHECK_ID where cl.ISDELETE = 0 and cl.STATE != 2 From 456e48a8ba626d19b78ba8f7c86f4e373e9a9fbf Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 17:00:57 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E5=85=83=E5=88=A0=E9=99=A4=E7=9A=84ids=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/controller/bus/RiskUnitController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index 0b08078b..c59c9485 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -294,6 +294,7 @@ public class RiskUnitController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; From 4962d4be11fc416e36b2e88461c8cdd4ec39bd65 Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 17:06:44 +0800 Subject: [PATCH 28/38] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E5=85=83=E5=88=A0=E9=99=A4=E7=9A=84ids=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/bus/IdentificationPartsController.java | 1 + src/main/java/com/zcloud/controller/bus/RiskPointController.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index 634740a1..1e3c78c7 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -301,6 +301,7 @@ public class IdentificationPartsController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointController.java b/src/main/java/com/zcloud/controller/bus/RiskPointController.java index 99f19e9f..4b1fb35a 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointController.java @@ -427,6 +427,7 @@ public class RiskPointController extends BaseController { }else{ errInfo = "fail"; } + pd.put("DATA_IDS",DATA_IDS); map.put("result", errInfo); //返回结果 map.put("dockData",JSON.toJSONString(pd)); return map; From 095be8743dbf24ed27e7647b7f2f35f6b5b9de2d Mon Sep 17 00:00:00 2001 From: liulixin Date: Thu, 18 Jan 2024 18:00:04 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/filemanager/MfolderController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index b7c354a9..5e12c8c9 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -140,6 +140,7 @@ public class MfolderController extends BaseController { @RequestParam(value = "SHARE", required = false) String SHARE) throws Exception { Map map = new HashMap<>(); ArrayList pictureList = new ArrayList<>(); + List mfolderServiceList = new ArrayList(); String errInfo = "success"; PageData pd = new PageData(); if (files != null && files.length > 0) { @@ -179,13 +180,15 @@ public class MfolderController extends BaseController { pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ "@@" +fileName); + mfolderServiceList.add(pd); mfolderService.save(pd); // 存入数据库表 } else { errInfo = "fail"; } } } - map.put("sendPicturesList", JSON.toJSONString(pictureList)); + map.put("sendPicturesList", JSON.toJSONString(mfolderServiceList)); + map.put("mfolderServiceList", JSON.toJSONString(pictureList)); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); // 返回结果 return map; From 3d79dc0c923645d667c863a2390e1119b0d14f94 Mon Sep 17 00:00:00 2001 From: liulixin Date: Fri, 19 Jan 2024 08:46:40 +0800 Subject: [PATCH 30/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/filemanager/MfolderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 5e12c8c9..ceab14b1 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -187,7 +187,7 @@ public class MfolderController extends BaseController { } } } - map.put("sendPicturesList", JSON.toJSONString(mfolderServiceList)); + pd.put("sendPicturesList", JSON.toJSONString(mfolderServiceList)); map.put("mfolderServiceList", JSON.toJSONString(pictureList)); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); // 返回结果 From 8ddd4b1c63d377829b38708ba17ced64c71c5e3e Mon Sep 17 00:00:00 2001 From: liulixin Date: Fri, 19 Jan 2024 08:48:17 +0800 Subject: [PATCH 31/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/filemanager/MfolderController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index ceab14b1..7932ce9a 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -189,6 +189,7 @@ public class MfolderController extends BaseController { } pd.put("sendPicturesList", JSON.toJSONString(mfolderServiceList)); map.put("mfolderServiceList", JSON.toJSONString(pictureList)); + pd.put("mfolderServiceList",pictureList); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); // 返回结果 return map; From d92c164b15f20b1b567f15ed389b4c9a59c6cec3 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Fri, 19 Jan 2024 08:53:29 +0800 Subject: [PATCH 32/38] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=8A=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datasource/map/MapEightMapper.java | 33 +++ .../service/map/impl/MapEightServiceImpl.java | 15 +- .../mybatis/datasource/map/MapEightMapper.xml | 200 ++++++++++++++++++ 3 files changed, 241 insertions(+), 7 deletions(-) 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..5ecc79ab 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java @@ -397,5 +397,38 @@ public interface MapEightMapper { List findByHOISTINGAcceptuserId(PageData pd); List findByHOISTINGAcceptuserIds(PageData pd); + + /**有限空间作业查询 + * @param pd + * @throws Exception + */ + PageData findByIdCONFINEDSPACEOrder(PageData pd); + + /**有限空间作业措施查询 + * @param pd + * @throws Exception + */ + List listAllMeasuresCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List listAllCONFINEDSPACEOrder(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptuser(PageData pd); + + /** + * 有限空间 + * @param pd + * @return + */ + List findByIdCONFINEDSPACEAcceptusers(PageData pd); } 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..0ae2e2a0 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java @@ -352,7 +352,7 @@ public class MapEightServiceImpl implements MapEightService { }else if(StringUtils.equals(typeStr,"BLINDBOARD")){ pd.put("BLINDBOARD_ID",idStr); pd = mapEightMapper.findByIdBLINDBOARDOrder(pd); - map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); + map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd)); PageData Info = mapEightMapper.findByIdJWDOrder(pd); pd.put("TYPE",105);//盲板位置图 pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID")); @@ -368,12 +368,12 @@ public class MapEightServiceImpl implements MapEightService { map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd)); map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd)); }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){ - //没有有限空间作业 - //pd.put("CONFINEDSPACE_ID",idStr); - //pd = mapEightMapper.findByIdCONFINEDSPACE(pd); - pd = new PageData(); - map.put("measuresList", null); - map.put("gasList", null); + pd.put("CONFINEDSPACE_ID",idStr); + pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd); //根据ID读取 + map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd)); + map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd)); + map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd)); + map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd)); }else if(StringUtils.equals(typeStr,"HOISTING")){ pd.put("HOISTING_ID",idStr); pd = mapEightMapper.findByIdHOISTINGOrder(pd); @@ -398,6 +398,7 @@ public class MapEightServiceImpl implements MapEightService { return map; } + private PageData shenpi(PageData pd,List list){ List specialUserList = new ArrayList<>(); for (PageData userPageData : list){ diff --git a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml index fa54615a..2274ec23 100644 --- a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -2835,6 +2835,7 @@ left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID where f.BLINDBOARD_ID = #{BLINDBOARD_ID} + GROUP BY f.BLINDBOARD_ID @@ -3704,4 +3705,203 @@ f.HOISTING_ID = #{HOISTING_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID} order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc + + + + + + From 19a797640db8a053fed89ae32b582863d390f5ce Mon Sep 17 00:00:00 2001 From: liulixin Date: Fri, 19 Jan 2024 09:27:10 +0800 Subject: [PATCH 33/38] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filemanager/MfolderController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 7932ce9a..636b664d 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -157,6 +157,7 @@ public class MfolderController extends BaseController { MultipartFile file = files[i]; String ffile = DateUtil.getDays(), fileName = ""; if (null != file && !file.isEmpty()) { + String MFOLDER_ID = this.get32UUID(); Long size = file.getSize()/1024; fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); @@ -175,12 +176,27 @@ public class MfolderController extends BaseController { pd.put("MASTER", Jurisdiction.getUsername()); // 用户名 pd.put("REMARKS", REMARKS); // 备注 pd.put("SHARE", SHARE); // 是否共享 - pd.put("MFOLDER_ID", this.get32UUID()); // 主键 + pd.put("MFOLDER_ID", MFOLDER_ID); // 主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ "@@" +fileName); - mfolderServiceList.add(pd); + + PageData pageData = new PageData(); + pd.put("FILEPATH", + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); // 文件路径 + pageData.put("FILESIZE", size); + pageData.put("NAME", realName2); // 文件名 + pageData.put("PARENT_ID", PARENT_ID); // 目录ID + pageData.put("CTIME", DateUtil.date2Str(new Date())); // 创建时间 + pageData.put("UNAME", Jurisdiction.getName()); // 上传者,当前用户的姓名 + pageData.put("MASTER", Jurisdiction.getUsername()); // 用户名 + pageData.put("REMARKS", REMARKS); // 备注 + pageData.put("SHARE", SHARE); // 是否共享 + pageData.put("MFOLDER_ID", MFOLDER_ID); // 主键 + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 + mfolderServiceList.add(pageData); + mfolderService.save(pd); // 存入数据库表 } else { errInfo = "fail"; From 34f27ebfd40966dceb30842600a6b7f0c3fcc843 Mon Sep 17 00:00:00 2001 From: liulixin Date: Fri, 19 Jan 2024 15:39:45 +0800 Subject: [PATCH 34/38] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gatemachine/GateCarIOController.java | 70 ++++++++ .../gatemachine/CzksGateCarIOMapper.java | 22 +++ .../service/gatemachine/GateCarIOService.java | 22 +++ .../impl/GateCarIOServiceImpl.java | 69 ++++++++ .../gatemachine/CzksGateCarIOMapper.xml | 156 ++++++++++++++++++ 5 files changed, 339 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java create mode 100644 src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java create mode 100644 src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java new file mode 100644 index 00000000..61fafd85 --- /dev/null +++ b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java @@ -0,0 +1,70 @@ +package com.zcloud.controller.gatemachine; + +import com.zcloud.aspect.DockAnnotation; +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.gatemachine.GateCarIOService; +import com.zcloud.util.ReturnMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/gateCar") +public class GateCarIOController extends BaseController { + + @Resource + private GateCarIOService gateCarIOService; + + @RequestMapping(value = "/page") + public ReturnMap page(Page page) { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + page.setPd(pageData); + List data = gateCarIOService.getDatalistpage(page); + returnMap.put("varList", data); + returnMap.put("page", page); + return returnMap; + } + + @RequestMapping(value = "/edit") + @DockAnnotation + public ReturnMap edit() { + PageData pd = this.getPageData(); + gateCarIOService.edit(pd); + return ReturnMap.ok(); + } + + @RequestMapping(value = "/removeByIds") + @DockAnnotation + public ReturnMap removeByIds() { + PageData pageData = this.getPageData(); + gateCarIOService.removeByIds(pageData); + return ReturnMap.ok(); + } + + @RequestMapping(value = "/add") + @DockAnnotation + public ReturnMap add() { + PageData pageData = this.getPageData(); + gateCarIOService.save(pageData); + return ReturnMap.ok(); + } + + @RequestMapping(value = "/getIORecords") + public ReturnMap getIORecord(Page page) { + PageData pageData = this.getPageData(); + page.setPd(pageData); + return ReturnMap.ok().put("data", gateCarIOService.getIORecord(page)); + } + + @RequestMapping(value = "/getEQCount") + public ReturnMap getTodayEQCount() { + PageData pageData = this.getPageData(); + return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(pageData)); + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java new file mode 100644 index 00000000..c70880c1 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java @@ -0,0 +1,22 @@ +package com.zcloud.mapper.datasource.gatemachine; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CzksGateCarIOMapper { + List getDatalistPage(Page page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void saveMineral(PageData pageData); + + List getIORecord(Page page); + PageData countGroceryEnterAndQuit(PageData pageData); + PageData countMineralEnterAndQuit(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java new file mode 100644 index 00000000..7919db29 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java @@ -0,0 +1,22 @@ +package com.zcloud.service.gatemachine; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface GateCarIOService { + + + List getDatalistpage(Page page); + + List getIORecord(Page page); + + void edit(PageData pd); + + void removeByIds(PageData pageData); + + void save(PageData pageData); + + PageData getTodayEQCount(PageData pageData); +} diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java new file mode 100644 index 00000000..df32e6c8 --- /dev/null +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java @@ -0,0 +1,69 @@ +package com.zcloud.service.gatemachine.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper; +import com.zcloud.service.gatemachine.GateCarIOService; +import com.zcloud.util.InitPageDataUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * GateCarIOService IMPL + */ +@Service +public class GateCarIOServiceImpl implements GateCarIOService { + + @Resource + private CzksGateCarIOMapper czksGateCarIOMapper; + + @Resource + private InitPageDataUtil initPageDataUtil; + + @Override + public List getDatalistpage(Page page) { + return czksGateCarIOMapper.getDatalistPage(page); + } + + @Override + public List getIORecord(Page page) { + return czksGateCarIOMapper.getIORecord(page); + } + + @Override + @Transactional(rollbackFor = Throwable.class) + public void edit(PageData pd) { + initPageDataUtil.initEdit(pd); + czksGateCarIOMapper.edit(pd); + } + + @Override + @Transactional(rollbackFor = Throwable.class) + public void removeByIds(PageData pageData) { + initPageDataUtil.initEdit(pageData); + czksGateCarIOMapper.removeByIds(pageData); + } + + @Override + @Transactional(rollbackFor = Throwable.class) + public void save(PageData pageData) { + initPageDataUtil.initSave(pageData, "RECORD_ID"); + if ("".equals(pageData.get(""))) { + czksGateCarIOMapper.saveMineral(pageData); + } else { + + } + + } + + @Override + public PageData getTodayEQCount(PageData PageData) { + PageData pageData = new PageData(); + pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(PageData)); + pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(PageData)); + return pageData; + } +} diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml new file mode 100644 index 00000000..8c4865e7 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml @@ -0,0 +1,156 @@ + + + + + INSERT INTO `qa-czks-prevention`.`work_mineral_io_record` + (RECORD_ID, + TRUCK_NO, + CAR_TEAM_NAME, + LRSJ, + JGSJ, + CGSJ, + LX, + GATE_MACHINE_ID, + PASS_TYPE, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{RECORD_ID}, + #{TRUCK_NO}, + #{CAR_TEAM_NAME}, + #{LRSJ}, + #{JGSJ}, + #{CGSJ}, + #{LX}, + #{GATE_MACHINE_ID}, + #{PASS_TYPE}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + INSERT INTO `qa-czks-prevention`.`work_grocery_io_record` + (RECORD_ID, + TRUCK_NO, + CAR_TEAM_NAME, + LRSJ, + JGSJ, + CGSJ, + LX, + GATE_MACHINE_ID, + PASS_TYPE, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME) + VALUES (#{RECORD_ID}, + #{TRUCK_NO}, + #{CAR_TEAM_NAME}, + #{LRSJ}, + #{JGSJ}, + #{CGSJ}, + #{LX}, + #{GATE_MACHINE_ID}, + #{PASS_TYPE}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}) + + + + update + + `qa-czks-prevention`.`work_grocery_io_record` f + + + `qa-czks-prevention`.`work_mineral_io_record` f + + set + TRUCK_NO=#{TRUCK_NO}, + CAR_TEAM_NAME=#{CAR_TEAM_NAME}, + LRSJ=#{LRSJ}, + JGSJ=#{JGSJ}, + CGSJ=#{CGSJ}, + LX=#{LX}, + PASS_TYPE=#{PASS_TYPE}, + ISDELETE=#{ISDELETE}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME} + where 1=1 + + f.grocery_record_id=#{grocery_record_id} + + + f.mineral_record_id=#{mineral_record_id} + + + + update + + `qa-czks-prevention`.`work_grocery_io_record` f + + + `qa-czks-prevention`.`work_mineral_io_record` f + + set ISDELETE = 1 + where 1=1 + + f.grocery_record_id=#{grocery_record_id} + + + f.mineral_record_id=#{mineral_record_id} + + + + + From 63cc479f4f960622c280638f4ba7d6349a015e49 Mon Sep 17 00:00:00 2001 From: liulixin Date: Fri, 19 Jan 2024 16:56:47 +0800 Subject: [PATCH 35/38] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gatemachine/GateCarIOController.java | 10 ++--- .../gatemachine/CzksGateCarIOMapper.java | 10 +++-- .../service/gatemachine/GateCarIOService.java | 2 +- .../impl/GateCarIOServiceImpl.java | 15 ++++--- .../gatemachine/CzksGateCarIOMapper.xml | 40 ++++++++++++------- 5 files changed, 47 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java index 61fafd85..f361ee77 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java @@ -55,16 +55,14 @@ public class GateCarIOController extends BaseController { } @RequestMapping(value = "/getIORecords") - public ReturnMap getIORecord(Page page) { - PageData pageData = this.getPageData(); - page.setPd(pageData); - return ReturnMap.ok().put("data", gateCarIOService.getIORecord(page)); + public ReturnMap getIORecord() { + return ReturnMap.ok().put("data", gateCarIOService.getIORecord(this.getPageData())); } @RequestMapping(value = "/getEQCount") public ReturnMap getTodayEQCount() { - PageData pageData = this.getPageData(); - return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(pageData)); + PageData page = this.getPageData(); + return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(page)); } } diff --git a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java b/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java index c70880c1..dfcc20ca 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java @@ -16,7 +16,11 @@ public interface CzksGateCarIOMapper { void saveMineral(PageData pageData); - List getIORecord(Page page); - PageData countGroceryEnterAndQuit(PageData pageData); - PageData countMineralEnterAndQuit(PageData pageData); + List getIORecord(PageData pd); + PageData countGroceryEnterAndQuit(PageData pd); + PageData countMineralEnterAndQuit(PageData pd); + + List getGroceryIORecords(PageData page); + + List getMineralIORecords(PageData page); } diff --git a/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java index 7919db29..0b011b20 100644 --- a/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java +++ b/src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java @@ -10,7 +10,7 @@ public interface GateCarIOService { List getDatalistpage(Page page); - List getIORecord(Page page); + List getIORecord(PageData page); void edit(PageData pd); diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java index df32e6c8..51934193 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -29,8 +30,12 @@ public class GateCarIOServiceImpl implements GateCarIOService { } @Override - public List getIORecord(Page page) { - return czksGateCarIOMapper.getIORecord(page); + public List getIORecord(PageData page) { + if (page.get("areaType") != null && "1".equals(page.get("areaType").toString())) { + return czksGateCarIOMapper.getGroceryIORecords(page); + } else { + return czksGateCarIOMapper.getMineralIORecords(page); + } } @Override @@ -60,10 +65,10 @@ public class GateCarIOServiceImpl implements GateCarIOService { } @Override - public PageData getTodayEQCount(PageData PageData) { + public PageData getTodayEQCount(PageData page) { PageData pageData = new PageData(); - pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(PageData)); - pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(PageData)); + pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(page)); + pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(page)); return pageData; } } diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml index 8c4865e7..30963107 100644 --- a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml +++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml @@ -63,23 +63,33 @@ #{OPERATOR}, #{OPERATTIME}) - select * from - `qa-czks-prevention`.`work_grocery_io_record` f + where 1=1 + + and f.JGSJ = #{JGSJ} - - `qa-czks-prevention`.`work_mineral_io_record` f + + and f.LX = #{LX} - where - - f.JGSJ = #{pd.JGSJ} + + and f.TRUCK_NO like CONCAT(CONCAT('%', #{TRUCK_NO}),'%') - - and f.LX = #{pd.LX} + order by f.OPERATTIME desc + + @@ -106,10 +116,10 @@ OPERATTIME=#{OPERATTIME} where 1=1 - f.grocery_record_id=#{grocery_record_id} + and f.grocery_record_id=#{grocery_record_id} - f.mineral_record_id=#{mineral_record_id} + and f.mineral_record_id=#{mineral_record_id} @@ -123,10 +133,10 @@ set ISDELETE = 1 where 1=1 - f.grocery_record_id=#{grocery_record_id} + and f.grocery_record_id=#{grocery_record_id} - f.mineral_record_id=#{mineral_record_id} + and f.mineral_record_id=#{mineral_record_id}