1.设备信息

src/main/java/com/galaxis/manatee/dao/ChuanyunGroupProjectDao.java

@@ -15,4 +15,6 @@ import org.springframework.stereotype.Repository;
 public interface ChuanyunGroupProjectDao extends GalaxisRepository<ChuanyunGroupProjectDO,String> {
 
     Page<ChuanyunGroupProjectDO> findAllByStatus(int status,Pageable pageable);
+
+    ChuanyunGroupProjectDO findByProjectCode(String projectCode);
 }

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunDeviceDTO.java

@@ -0,0 +1,15 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+
+@Data
+public class ChuanyunDeviceDTO {
+
+    private String sncode;
+
+    private String itemcode;
+
+    private String projectcode;
+}

src/main/java/com/galaxis/manatee/manager/ClawFeign.java

@@ -4,10 +4,7 @@ import com.galaxis.capsule.dto.*;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCashFlowDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPurCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDO;
-import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunLaborCostDTO;
-import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunProjectCashFlowDTO;
-import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunPurCostDTO;
-import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunSupplierDTO;
+import com.galaxis.manatee.entity.chuanyun.dto.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -72,6 +69,14 @@ public interface ClawFeign {
     @GetMapping("/laborcost/findAllByParameters")
     PageDTO<ChuanyunLaborCostDTO> findChuanyunLaborCost(@RequestParam Map<String,String> map);
 
+    /**
+     * 查询设备信息
+     * @param map
+     * @return
+     */
+    @GetMapping("/device/findAllByParameters")
+    PageDTO<ChuanyunDeviceDTO> findChuanyunDevice(@RequestParam Map<String,String> map);
+
 
     /**
      * 测试

src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -225,14 +225,18 @@ public class ChuanyunServiceImpl implements ChuanyunService {
         list.forEach(chuanyunEquipmentDO -> {
             //更新氚云
             try {
-//                List<String> matchers = new ArrayList<>();
-//                matchers.add("F0000001_2,"+chuanyunEquipmentDO.getEquipmentCode());
-//                var filter= Filter.instance(0,1,true,"And",matchers);
-//                var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunEquipmentDO.SCHEMA_CODE,filter);
-                ChuanyunEquipmentInformDO chuanyunEquipmentInformDO = chuanyunEquipmentInformDao.findByEquipmentCode(chuanyunEquipmentDO.getEquipmentCode());
-                if (chuanyunEquipmentInformDO!=null){
-                    chuanyunEquipmentDO.setEquipmentCode(chuanyunEquipmentInformDO.getObjectId());
+                List<String> matchers = new ArrayList<>();
+                matchers.add("F0000001_2,"+chuanyunEquipmentDO.getEquipmentCode());
+                var filter= Filter.instance(0,1,true,"And",matchers);
+                var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunEquipmentInformDO.SCHEMA_CODE,filter);
+                if (chuanyunFindAllResponse.getReturnData()!=null){
+                    List<ChuanyunEquipmentInformDO> projectresult=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
+                    chuanyunEquipmentDO.setEquipmentCode(projectresult.get(0).getObjectId());
                 }
+//                ChuanyunEquipmentInformDO chuanyunEquipmentInformDO = chuanyunEquipmentInformDao.findByEquipmentCode(chuanyunEquipmentDO.getEquipmentCode());
+//                if (chuanyunEquipmentInformDO!=null){
+//                    chuanyunEquipmentDO.setEquipmentCode(chuanyunEquipmentInformDO.getObjectId());
+//                }
                 EquipmentDTO equipmentDTO = new EquipmentDTO(chuanyunEquipmentDO);
                 var equipmentString = objectMapper.writeValueAsString(equipmentDTO);
                 ChuanyunSaveDTO chuanyunSaveDTO;