ludc
2024-03-13 ec2b8254dad99234529c7586add98c66b740c160
集成相关更改
已修改2个文件
10 ■■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
@@ -51,7 +51,7 @@
        log.info("执行从ERP项目代号/型号代号数据 start:");
        log.info("执行主数据集成数据推送 end: "+ "开关是否开启:" +ERP_ITEM_ISSTARE);
        if(ERP_ITEM_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String time = formatter.format(new Date());
            codeDuckingSyncServiceI.saveItemDataSyncScheduing("");
            String outInfo = "============ 执行了从ERP项目代号/型号代号数据 end;";
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -305,14 +305,14 @@
            calendar.set(Calendar.HOUR_OF_DAY, 0);
            calendar.set(Calendar.MINUTE, 0);
            calendar.set(Calendar.SECOND, 0);
            log.info("查询时间------->"+calendar.getTime());
            log.info("查询时间------->"+dft.format(new Date()));
            lastchangedon= dft.format(calendar.getTime());
        }else{
            lastchangedon=endDate;
        }
        searchItemParam.setLastchangedon(lastchangedon);
        searchItemParam.setStatus(itemStatus);//
        Map<String,String>searchDataMap=  VciBaseUtil.objectToMapString(searchItemParam);
        Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
        try {
            paramString=JSONObject.toJSON(searchItemParam).toString();
            // TODO: 改为使用HttpUtils方式进行申请,因为现在申请用之前的方式会报错
@@ -358,7 +358,7 @@
                    List<String> itemCodeList = new ArrayList<>();
                    ApplyDatasVO allDatasVO = new ApplyDatasVO();
                    List<ApplyDataVO> allObjectList = new ArrayList<>();
                    if (!CollectionUtils.isEmpty(dataList)) {
                    if (Func.isNotEmpty(dataList)) {
                        dataList.stream().forEach(searchItemDataVO -> {
                            String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//项目代号
                            dataVOMap.put(itemCode, searchItemDataVO);
@@ -464,8 +464,6 @@
                        paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
                        Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
                        backString = Func.isEmpty(backObject) ? "" : backObject.toString();
                    }else{
                        throw new Throwable("接口未返回信息");
                    }
                } catch (Throwable e) {
                    e.printStackTrace();