代码提交

iot-access/access-boot/src/main/java/com/njcn/access/service/IAccessService.java

@@ -12,5 +12,5 @@ public interface IAccessService {
      * 3.装置响应则修改装置状态；3分钟未响应则生成告警信息
      * @param nDid 网关识别码
      */
-    void add(String nDid);
+    Boolean add(String nDid);
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/serviceImpl/AccessServiceImpl.java

@@ -6,8 +6,12 @@ import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.pojo.dto.AccessDto;
 import com.njcn.access.pojo.param.ReqAndResParam;
 import com.njcn.access.service.IAccessService;
+import com.njcn.algorithm.api.CsEdDataFeignClient;
 import com.njcn.algorithm.api.EquipmentFeignClient;
+import com.njcn.algorithm.pojo.po.CsEdDataPO;
+import com.njcn.algorithm.pojo.vo.CsEdDataVO;
 import com.njcn.algorithm.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.PubUtils;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
@@ -33,13 +37,20 @@ public class AccessServiceImpl implements IAccessService {
 
     private final EquipmentFeignClient equipmentFeignClient;
 
+    private final CsEdDataFeignClient csEdDataFeignClient;
+
     @Override
-    public void add(String nDid) {
+    public Boolean add(String nDid) {
         CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
-        if (Objects.isNull(vo)){
+        System.out.println("vo==:" + vo);
+        if (Objects.isNull(vo.getNdid())){
             logger.error("平台侧无此网关信息,请先录入!");
-            return;
+            return false;
+        } else {
+            HttpResult<CsEdDataVO> result = csEdDataFeignClient.findByDevTypeId(vo.getDevModel());
+            System.out.println("result==:" + result);
         }
+
         ReqAndResParam.Req reqAndResParam = new ReqAndResParam.Req();
         reqAndResParam.setMid(1);
         reqAndResParam.setDid("0");
@@ -51,5 +62,6 @@ public class AccessServiceImpl implements IAccessService {
         accessDto.setDevType(vo.getDevModel());
         reqAndResParam.setMsg(accessDto);
         publisher.send("/platform/register/"+nDid, PubUtils.obj2json(reqAndResParam),1,false);
+        return true;
     }
 }