设备维护: 报警主机 代码部分提交

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotDeviceInfoExtendService.java

@@ -1,6 +1,7 @@
 package com.xunmei.iot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.iot.dto.deviceInfo.EditAlarmHostDeviceDto;
 import com.xunmei.iot.dto.deviceInfo.EditDvrHostDeviceDto;
 import com.xunmei.system.api.domain.iot.IotDeviceInfoExtend;
 
@@ -11,4 +12,5 @@ public interface IotDeviceInfoExtendService extends IService<IotDeviceInfoExtend
 
 
     void updateByDeviceId(Long deviceId, EditDvrHostDeviceDto req);
+    void updateAlarmHostExtendByDeviceId(Long deviceId, EditAlarmHostDeviceDto req);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/IotDeviceInfoExtendServiceImpl.java

@@ -4,6 +4,7 @@ package com.xunmei.iot.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.iot.dto.deviceInfo.EditAlarmHostDeviceDto;
 import com.xunmei.iot.dto.deviceInfo.EditDvrHostDeviceDto;
 import com.xunmei.iot.mapper.IotDeviceInfoExtendMapper;
 import com.xunmei.system.api.domain.iot.IotDeviceInfoExtend;
@@ -30,4 +31,28 @@ public class IotDeviceInfoExtendServiceImpl extends ServiceImpl<IotDeviceInfoExt
         extend.setIotToken(req.getIotCode());
         save(extend);
     }
+
+    @Override
+    public void updateAlarmHostExtendByDeviceId(Long deviceId, EditAlarmHostDeviceDto req) {
+        LambdaQueryWrapper<IotDeviceInfoExtend> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IotDeviceInfoExtend::getDeviceId,deviceId);
+        remove(wrapper);
+
+        IotDeviceInfoExtend extend = new IotDeviceInfoExtend();
+        extend.setId(IdWorker.getId());
+        extend.setDeviceId(deviceId);
+        extend.setUserName(req.getUserName());
+        extend.setPassword(req.getPassword());
+        extend.setNetAddress(req.getServerIp());
+        extend.setPort(req.getServerPort());
+        extend.setDeleted(0);
+        extend.setIotToken(req.getIotCode());
+        extend.setListenAddress(req.getListenAddress());
+        extend.setListenPort(req.getListenPort());
+        extend.setDeviceMac(req.getDeviceMac());
+        extend.setDeviceUserCode(req.getDeviceUserCode());
+        extend.setIotAddress(req.getIotAddress());
+        extend.setHostDeviceType(req.getHostDeviceType());
+        save(extend);
+    }
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -191,7 +191,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         deviceInfo.setDeviceName(req.getDeviceName());
         deviceInfo.setDeviceType(BaseDeviceTypeEnum.Dvs.getCode());
         deviceInfo.setDeviceProduct(req.getDeviceProduct());
-        if (ObjectUtil.isEmpty(deviceInfo.getDeviceCode())){
+        if (ObjectUtil.isEmpty(deviceInfo.getDeviceCode())) {
             deviceInfo.setDeviceCode(generalDeviceCode(BaseDeviceTypeEnum.Dvs, null));
         }
         deviceInfo.setDeviceModel(req.getModels());
@@ -218,14 +218,16 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
     }
 
     private void addAlarmHostDevice(EditAlarmHostDeviceDto req, SysOrg sysOrg) {
+        //主机信息
         final IotDeviceInfo deviceInfo = new IotDeviceInfo();
+        deviceInfo.setId(IdWorker.getId());
         deviceInfo.setDeviceName(req.getDeviceName());
         deviceInfo.setDeviceType(BaseDeviceTypeEnum.AlarmHost.getCode());
         deviceInfo.setDeviceProduct(req.getDeviceProduct());
-        if (ObjectUtil.isEmpty(deviceInfo.getDeviceCode())){
+        if (ObjectUtil.isEmpty(deviceInfo.getDeviceCode())) {
             final JSONObject object = new JSONObject();
-            object.put("deviceProduct", req.getDeviceProduct()+"_");
-            deviceInfo.setDeviceCode(generalDeviceCode(BaseDeviceTypeEnum.AlarmHost,object));
+            object.put("deviceProduct", req.getDeviceProduct());
+            deviceInfo.setDeviceCode(generalDeviceCode(BaseDeviceTypeEnum.AlarmHost, object));
         }
         deviceInfo.setDeviceModel(req.getModels());
         deviceInfo.setIotToken(req.getIotCode());
@@ -236,6 +238,9 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         deviceInfo.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getName());
         deviceInfo.setOrgName(sysOrg.getShortName());
         deviceInfo.setOrgPath(sysOrg.getPath());
+        //扩展信息
+        extendService.updateAlarmHostExtendByDeviceId(deviceInfo.getId(), req);
+        //子系统 传感器
 
     }
 }