录像完整性代码提交

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/server/mapper/IotServerInfoMapper.java

@@ -2,6 +2,8 @@ package com.xunmei.mediator.api.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
+import com.xunmei.system.api.domain.SysOrg;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +15,6 @@ import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
  */
 public interface IotServerInfoMapper extends BaseMapper<IotServerInfo> {
 
+
+    SysOrg selectOrgByToken(@Param("token") String token);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/server/service/IotServerInfoService.java

@@ -2,6 +2,7 @@ package com.xunmei.mediator.api.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
+import com.xunmei.system.api.domain.SysOrg;
 
 /**
  * <p>
@@ -20,4 +21,6 @@ public interface IotServerInfoService extends IService<IotServerInfo> {
     void updateByToken(IotServerInfo iotServerInfo);
 
     IotServerInfo selectByToken(String token);
+
+    SysOrg selectOrgByToken(String token);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/server/service/impl/IotServerInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.utils.uuid.UUID;
 import com.xunmei.mediator.api.server.mapper.IotServerInfoMapper;
 import com.xunmei.mediator.api.server.service.IotServerInfoService;
+import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,4 +58,16 @@ public class IotServerInfoServiceImpl extends ServiceImpl<IotServerInfoMapper, I
         qw.lambda().eq(IotServerInfo::getIotCode,token);
         return baseMapper.selectOne(qw);
     }
+
+    @Override
+    public SysOrg selectOrgByToken(String token) {
+
+
+        SysOrg sysOrg = baseMapper.selectOrgByToken(token);
+
+        if (sysOrg==null){
+            throw new RuntimeException("iot唯一编码关联的机构信息不存在!");
+        }
+        return sysOrg;
+    }
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -18,6 +18,7 @@ import com.xunmei.common.core.utils.JacksonUtils;
 import com.xunmei.mediator.api.host.service.IIotDeviceService;
 import com.xunmei.mediator.api.host.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.server.service.IotServerInfoService;
 import com.xunmei.mediator.api.video.mapper.VideoIntegrityCheckMapper;
 import com.xunmei.mediator.api.video.service.IVideoDaysCheckService;
 import com.xunmei.mediator.api.video.service.IVideoIntegrityCheckService;
@@ -76,6 +77,9 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     @Resource
     IIotDvrChannelService dvrChannelService;
 
+    @Resource
+    IotServerInfoService iotServerInfoService;
+
     @Override
     public String routerKey() {
         StringJoiner result = new StringJoiner(",");
@@ -86,6 +90,8 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     @Override
     public Object execute(WebsocketExecuteReq req) {
         VideoIntegrityCheckDto checkDto = transform(req.getData());
+        SysOrg sysOrg = iotServerInfoService.selectOrgByToken(req.getToken());
+        checkDto.setOrganizationGuid(sysOrg.getCode());
         this.saveData(checkDto,"");
         return "";
     }
@@ -105,11 +111,10 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
 
     @Override
     public VideoIntegrityCheckDto transform(Object data) {
-        VideoIntegrityCheckReq req = JSON.parseObject(JSON.toJSONString(data), VideoIntegrityCheckReq.class);
+        VideoIntegrityCheckReq req = (VideoIntegrityCheckReq)data;
         VideoIntegrityCheckDto dst = new VideoIntegrityCheckDto();
         dst.setEquipmentCode(req.getDvsCode());
         dst.setChannelCode(req.getIndex());
-        dst.setEquipmentCode(req.getDvsCode());
         dst.setRecordDate(req.getRecordDate());
         dst.setLoseSpan(req.getLoseSpan());
         dst.setCheckSpan(req.getCheckSpan());

soc-modules/soc-modules-mediator/src/main/resources/mapper/IotServerInfoMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.mediator.api.server.mapper.IotServerInfoMapper">
 
+    <select id="selectOrgByToken" resultType="com.xunmei.system.api.domain.SysOrg">
+        select o.* from iot_server_info i inner join sys_org o on o.id=i.org_id  where i.iot_code=#{token}
+    </select>
 </mapper>