|
@@ -128,7 +128,7 @@ public class EquipmentInfoTask {
|
|
var objectMapper=new ObjectMapper();
|
|
var objectMapper=new ObjectMapper();
|
|
var totalCount=0L;
|
|
var totalCount=0L;
|
|
var page = 1;
|
|
var page = 1;
|
|
- var size = 20;
|
|
|
|
|
|
+ var size = 100;
|
|
var flag=true;
|
|
var flag=true;
|
|
while (flag){
|
|
while (flag){
|
|
Map<String,String> map=new HashMap<>(1);
|
|
Map<String,String> map=new HashMap<>(1);
|
|
@@ -152,27 +152,25 @@ public class EquipmentInfoTask {
|
|
if (chuanyunFindAllResponse.getReturnData()!=null){
|
|
if (chuanyunFindAllResponse.getReturnData()!=null){
|
|
List<ChuanyunEquipmentInformDO> projectresult=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
|
|
List<ChuanyunEquipmentInformDO> projectresult=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
|
|
chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().setSncode(projectresult.get(0).getObjectId());
|
|
chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().setSncode(projectresult.get(0).getObjectId());
|
|
- }
|
|
|
|
|
|
|
|
- List<String> projectmatchers = new ArrayList<>();
|
|
|
|
- projectmatchers.add("F0000001_2,"+chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().getSncode());
|
|
|
|
- projectmatchers.add("F0000002_2,"+chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().getLinenum());
|
|
|
|
- var projectfilter= Filter.instance(0,Integer.MAX_VALUE,true,"And",projectmatchers);
|
|
|
|
- var chuanyunFindResponse = chuanYunManager.findAll(ChuanyunEquipmentDO.SCHEMA_CODE,projectfilter);
|
|
|
|
- ChuanyunSaveDTO chuanyunSaveDTO;
|
|
|
|
- EquipmentDTO equipmentDTO = new EquipmentDTO(chuanyunDeviceConfigureDTO);
|
|
|
|
- var purcostString=objectMapper.writeValueAsString(equipmentDTO);
|
|
|
|
- if (chuanyunFindResponse.getReturnData()!=null){
|
|
|
|
- List<ChuanyunEquipmentDO> projectresult=objectMapper.convertValue(chuanyunFindResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
|
|
|
|
- chuanyunSaveDTO = chuanYunManager.update(ChuanyunEquipmentDO.SCHEMA_CODE,projectresult.get(0).getObjectId(),purcostString);
|
|
|
|
- }else {
|
|
|
|
- chuanyunSaveDTO =chuanYunManager.save(ChuanyunEquipmentDO.SCHEMA_CODE,purcostString,true);
|
|
|
|
- }
|
|
|
|
- if(chuanyunSaveDTO.getSuccessful()){
|
|
|
|
-// log.info("新增配置设备信息成功");
|
|
|
|
- }else{
|
|
|
|
- log.warn("新增配置设备信息失败");
|
|
|
|
|
|
+ List<String> projectmatchers = new ArrayList<>();
|
|
|
|
+ projectmatchers.add("F0000001_2,"+chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().getSncode());
|
|
|
|
+ projectmatchers.add("F0000002_2,"+chuanyunDeviceConfigureDTO.getChuanyunDeviceConfigurePrimaryKey().getLinenum());
|
|
|
|
+ var projectfilter= Filter.instance(0,Integer.MAX_VALUE,true,"And",projectmatchers);
|
|
|
|
+ var chuanyunFindResponse = chuanYunManager.findAll(ChuanyunEquipmentDO.SCHEMA_CODE,projectfilter);
|
|
|
|
+
|
|
|
|
+ EquipmentDTO equipmentDTO = new EquipmentDTO(chuanyunDeviceConfigureDTO);
|
|
|
|
+ var purcostString=objectMapper.writeValueAsString(equipmentDTO);
|
|
|
|
+ if (chuanyunFindResponse.getReturnData()==null){
|
|
|
|
+ ChuanyunSaveDTO chuanyunSaveDTO =chuanYunManager.save(ChuanyunEquipmentDO.SCHEMA_CODE,purcostString,true);
|
|
|
|
+ if(chuanyunSaveDTO.getSuccessful()){
|
|
|
|
+// log.info("新增配置设备信息成功");
|
|
|
|
+ }else{
|
|
|
|
+ log.warn("新增配置设备信息失败");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
} catch (JsonProcessingException | BigSizeException e) {
|
|
} catch (JsonProcessingException | BigSizeException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|