ruoyi-admin/src/main/java/com/ruoyi/DataTransmissionThread.java
@@ -5,7 +5,6 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.task.CameraAssembleUtil; import com.ruoyi.task.DataAssembleUtil; import com.ruoyi.utils.FtpUtils; import java.text.SimpleDateFormat; @@ -28,7 +27,6 @@ @Override public void run() { FtpUtils ftpUtil = new FtpUtils(RuoYiConfig.getFtpHost(),RuoYiConfig.getFtpUserName(),RuoYiConfig.getFtpPassWord()); while (true){ Date date=new Date(); String nowTime=format.format(date); @@ -46,9 +44,7 @@ //获取队列中的第一个(防止发送频繁，一次只处理一个) JSONObject obj= (JSONObject) redisCache.lGetLpopIndex(Thread.currentThread().getName()); if(Thread.currentThread().getName().equals("DataAssemble")){ DataAssembleUtil.DataTransmission(ftpUtil,obj); }else if(Thread.currentThread().getName().equals("CameraAssemble")){ if(Thread.currentThread().getName().equals("CameraAssemble")){ CameraAssembleUtil.DataTransmission(obj); } }else{ ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,15 +1,8 @@ package com.ruoyi; import com.ruoyi.task.DataAssembleUtil; import com.ruoyi.utils.CameraUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.jms.config.DefaultJmsListenerContainerFactory; import org.springframework.jms.config.JmsListenerContainerFactory; import javax.jms.ConnectionFactory; /** * 启动程序 @@ -17,34 +10,14 @@ * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class RuoYiApplication { public class RuoYiApplication { public static void main(String[] args){ // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ AI智能视频监控系统启动成功 ლ(´ڡ`ლ)ﾞ \n"); DataAssembleUtil.AssembleBDZSBJBXX();//设备信息 DataAssembleUtil.AssembleBDZSBJCSJ();//测点信息 //启动1个线程进行数据发送处理 new DataTransmissionThread("DataAssemble").start(); new DataTransmissionThread("CameraAssemble").start(); CameraUtils.startCamera(); } //需要给topic定义独立的JmsListenerContainer //发布-订阅模式的ListenerContainer @Bean public JmsListenerContainerFactory<?> jmsListenerContainerTopic(ConnectionFactory activeMQConnectionFactory) { DefaultJmsListenerContainerFactory bean = new DefaultJmsListenerContainerFactory(); bean.setPubSubDomain(true); bean.setConnectionFactory(activeMQConnectionFactory); return bean; } } ruoyi-admin/src/main/java/com/ruoyi/activeMQ/CustomerRest.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/aibrain/controller/AiCameraController.java
@@ -1,11 +1,9 @@ package com.ruoyi.aibrain.controller; import java.util.List; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletResponse; import com.ruoyi.HIKVISION.GetPicFromIPV; import com.ruoyi.utils.CameraUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -112,13 +110,7 @@ */ @PostMapping("startCamera") public AjaxResult startCamera(AiCamera aiCamera) { CameraUtils.startCamera(aiCamera.getId(),"2"); try { TimeUnit.SECONDS.sleep(2); } catch (InterruptedException e) { e.printStackTrace(); } CameraUtils.startCamera(aiCamera.getId(),"1"); return AjaxResult.success(); } @@ -127,13 +119,7 @@ */ @PostMapping("startCameraAll") public AjaxResult startCameraAll() { CameraUtils.startCameraAll("2"); try { TimeUnit.SECONDS.sleep(5); } catch (InterruptedException e) { e.printStackTrace(); } CameraUtils.startCameraAll("1"); return AjaxResult.success(); }
@@ -11,7 +11,6 @@ import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.task.CameraAssembleUtil; import com.ruoyi.task.DataAssembleUtil; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdController.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdSssjController.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxCdYcsjController.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/controller/DlShebeixxController.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixx.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCd.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdSssj.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/domain/DlShebeixxCdYcsj.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdMapper.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdSssjMapper.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxCdYcsjMapper.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/mapper/DlShebeixxMapper.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdService.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdSssjService.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxCdYcsjService.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/IDlShebeixxService.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdServiceImpl.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdSssjServiceImpl.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxCdYcsjServiceImpl.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/dl/service/impl/DlShebeixxServiceImpl.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/task/AiBrainTask.java
@@ -1,30 +1,18 @@ package com.ruoyi.task; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.activeMQ.vo.CameraControlVO; import com.ruoyi.aibrain.domain.AiAlarmInfo; import com.ruoyi.aibrain.domain.AiCamera; import com.ruoyi.aibrain.domain.Point; import com.ruoyi.aibrain.service.IAiAlarmInfoService; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.Threads; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.framework.config.ActiveManager; import com.ruoyi.framework.websocket.WebSocketUsers; import com.ruoyi.utils.Base64Util; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanCopier; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.jms.Destination; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -41,8 +29,6 @@ public class AiBrainTask { private static final Logger logger = LoggerFactory.getLogger(Threads.class); private static BeanCopier copier = BeanCopier.create(AiCamera.class, CameraControlVO.class, false); @Autowired private static ActiveManager activeManager; ruoyi-admin/src/main/java/com/ruoyi/task/DataAssembleUtil.java
File was deleted ruoyi-admin/src/main/java/com/ruoyi/task/SjcsDlTask.java
@@ -40,11 +40,6 @@ @Component("sjcsDlTask") public class SjcsDlTask { //10秒执行一次 public void indexDlTask() { DataAssembleUtil.AssembleCDSSSJ();//实时数据 DataAssembleUtil.AssembleCDYCSJ();//异常数据 } //5分钟执行一次 public void indexCameraTask() { ruoyi-admin/src/main/java/com/ruoyi/utils/CameraUtils.java
File was deleted ruoyi-admin/src/main/resources/application-druid.yml
@@ -119,15 +119,3 @@ max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms activemq: # MQ所在的服务器的地址 broker-url: tcp://192.168.1.11:61616 # 是否使用内置的MQ， true 使用； fale 不使用 in-memory: false # 是否在回滚回滚消息之前停止消息传递。这意味着当启用此命令时，消息顺序不会被保留。 non-blocking-redelivery: false # 用户名 password: admin # 密码 user: admin ruoyi-admin/src/main/resources/application-one.yml
@@ -41,7 +41,7 @@ druid: # 主库数据源 master: url: jdbc:mysql://192.168.20.18:3306/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.20.18:3306/yc_ai_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root # password: 123456 password: kem12345.. @@ -117,15 +117,3 @@ max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms activemq: # MQ所在的服务器的地址 broker-url: tcp://192.168.20.24:61616 # 是否使用内置的MQ， true 使用； fale 不使用 in-memory: false # 是否在回滚回滚消息之前停止消息传递。这意味着当启用此命令时，消息顺序不会被保留。 non-blocking-redelivery: false # 用户名 password: admin # 密码 user: admin ruoyi-admin/src/main/resources/application-two.yml
@@ -41,7 +41,7 @@ druid: # 主库数据源 master: url: jdbc:mysql://192.168.30.18:3306/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.30.18:3306/yc_ai_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root # password: 123456 password: kem12345.. @@ -117,15 +117,3 @@ max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms activemq: # MQ所在的服务器的地址 broker-url: tcp://192.168.30.24:61616 # 是否使用内置的MQ， true 使用； fale 不使用 in-memory: false # 是否在回滚回滚消息之前停止消息传递。这意味着当启用此命令时，消息顺序不会被保留。 non-blocking-redelivery: false # 用户名 password: admin # 密码 user: admin ruoyi-admin/src/main/resources/application.yml
@@ -40,7 +40,7 @@ #一矿 one #二矿 two profiles: active: one active: two # 文件上传 servlet: multipart: ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdMapper.xml
File was deleted ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdSssjMapper.xml
File was deleted ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxCdYcsjMapper.xml
File was deleted ruoyi-admin/src/main/resources/mapper/dl/DlShebeixxMapper.xml
File was deleted ruoyi-ui/src/api/dl/cd.js
File was deleted ruoyi-ui/src/api/dl/shebeixx.js
File was deleted ruoyi-ui/src/api/dl/sssj.js
File was deleted ruoyi-ui/src/api/dl/ycsj.js
File was deleted ruoyi-ui/src/views/dl/cd/index.vue
File was deleted ruoyi-ui/src/views/dl/shebeixx/index.vue
File was deleted ruoyi-ui/src/views/dl/sssj/index.vue
File was deleted ruoyi-ui/src/views/dl/ycsj/index.vue
File was deleted ruoyi-ui/src/views/newIndex.vue
@@ -285,6 +285,7 @@ methods: { videoClick(item) { this.selectCamera=item; this.selectCamera.playUrl = this.selectCamera.playUrl.replace("&width=189","&width=907").replace("&height=117","&height=505"); setTimeout(() => { this.$refs.indexSpjkSpxx1998Ref.joinSXT(item); }, 100);
