Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Sis/Dockerfile

@@ -9,13 +9,14 @@ RUN mkdir -p /smartparks/Sis/logs \
     /smartparks/Sis/temp \
     /smartparks/Sis/agent
 
-WORKDIR /ruoyi/system
+WORKDIR /ruoyi/sis
 
-ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+ENV SERVER_PORT=10002 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
 
 EXPOSE ${SERVER_PORT}
 
 ADD ./target/Sis.jar ./app.jar
+COPY ./linux64/ .
 
 SHELL ["/bin/bash", "-c"]
 

ruoyi-modules/Sis/linux64/HCNetSDK_Log_Switch.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="GB2312"?>
+<SdkLocal>
+	<SdkLog>
+        <logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
+        <logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
+        <autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
+    </SdkLog>
+	<HeartbeatCfg>
+		<Interval>120</Interval> <!-- <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>룬<EFBFBD><EBA3AC><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ120s<30><73>ȡֵ<C8A1><D6B5>ΧΪ[30, 120] С<><D0A1>30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>120s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ120s-->
+		<Count>1</Count> 	<!-- <20><><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD>ص<EFBFBD><D8B5><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ1<D6B5><31>-->
+	</HeartbeatCfg>
+</SdkLocal>

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/covert/CommonBeanCovert.java

@@ -24,4 +24,5 @@ public interface CommonBeanCovert {
 
     List<RemoteSdkChannel> sdkChannelEntity2Remote(List<DeviceInfo.DeviceChannelInfo> sdkChannels);
 
+    RemoteSisDeviceManage entities2Remote(SisDeviceManage sisDeviceManage);
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemoteDeviceServiceImpl.java

@@ -3,6 +3,7 @@ package org.dromara.sis.dubbo;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.sis.api.RemoteDeviceService;
 import org.dromara.sis.api.domain.RemoteSdkChannel;
 import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
@@ -14,6 +15,7 @@ import org.dromara.sis.sdk.hik.HikSdkConstans;
 import org.dromara.sis.service.ISisDeviceChannelService;
 import org.dromara.sis.service.ISisDeviceManageService;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -25,6 +27,8 @@ import java.util.List;
 @Slf4j
 @Component
 @RequiredArgsConstructor
+@Service
+@DubboService
 public class RemoteDeviceServiceImpl implements RemoteDeviceService {
 
     private final ISisDeviceManageService deviceManageService;
@@ -41,6 +45,12 @@ public class RemoteDeviceServiceImpl implements RemoteDeviceService {
         return deviceManageService.updateDeviceState(CommonBeanCovert.INSTANCE.Remote2Entity(item));
     }
 
+    @Override
+    public RemoteSisDeviceManage queryDeviceById(Long id) {
+        SisDeviceManage sisDeviceManage = deviceManageService.queryDeviceById(id);
+        return CommonBeanCovert.INSTANCE.entities2Remote(sisDeviceManage);
+    }
+
     @Override
     public List<RemoteSisDeviceChannel> queryDeviceChannels(String deviceIp) {
         List<SisDeviceChannel> channels = deviceChannelService.queryByDeviceIp(deviceIp);

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceChannelService.java

@@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotEmpty;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.sis.api.domain.RemoteSisDeviceChannel;
 import org.dromara.sis.domain.SisDeviceChannel;
 import org.dromara.sis.domain.bo.SisDeviceChannelBo;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
@@ -138,4 +139,5 @@ public interface ISisDeviceChannelService {
      * @return 返回通道信息
      */
     SisDeviceChannel queryChannels(@NotEmpty String deviceIp, @NotEmpty String channelNo);
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java

@@ -3,6 +3,7 @@ package org.dromara.sis.service;
 import org.dromara.common.core.domain.TreeNode;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.sis.api.domain.RemoteSisDeviceManage;
 import org.dromara.sis.domain.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
 import org.dromara.sis.domain.vo.SisDeviceManageVo;
@@ -26,6 +27,7 @@ public interface ISisDeviceManageService {
      */
     SisDeviceManageVo queryById(Long id);
 
+
     /**
      * 分页查询设备管理列表
      *
@@ -95,6 +97,9 @@ public interface ISisDeviceManageService {
      */
     List<SisDeviceManage> queryHikDevices();
 
+
+    SisDeviceManage queryDeviceById(Long id);
+
     /**
      * 更新设备状态信息
      * @param sisDeviceManage 设备信息

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java

@@ -13,6 +13,7 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.sis.api.domain.RemoteSisDeviceManage;
 import org.dromara.sis.api.enums.FactoryNoEnum;
 import org.dromara.sis.domain.SisDeviceManage;
 import org.dromara.sis.domain.bo.SisDeviceManageBo;
@@ -57,6 +58,7 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
         return deviceManageVo;
     }
 
+
     /**
      * 分页查询设备管理列表
      *
@@ -222,6 +224,12 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
         return baseMapper.selectList(lqw);
     }
 
+
+    @Override
+    public SisDeviceManage queryDeviceById(Long id) {
+        return baseMapper.selectById(id);
+    }
+
     @Override
     public Boolean updateDeviceState(SisDeviceManage sisDeviceManage) {
         LambdaUpdateWrapper<SisDeviceManage> lqw = Wrappers.lambdaUpdate();