xiejun
2024-01-26 d0df2f761d92fbf94cc0751460f9e36b7b0b357a
erp项目代号集成接口开发
已修改4个文件
65 ■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
@@ -31,8 +31,7 @@
    @Value("${erp.item.isStart:false}")
    public boolean ERP_ITEM_ISSTARE;
    @Value("${erp.item.btmName:XHDH}")
    public String ERP_ITEM_BTMNAME;
    /**
     * 是否初始化完成了
     */
@@ -53,7 +52,7 @@
        if(ERP_ITEM_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            String time = formatter.format(new Date());
            codeDuckingSyncServiceI.saveItemDataSyncScheduing(ERP_ITEM_BTMNAME);
            codeDuckingSyncServiceI.saveItemDataSyncScheduing("");
            String outInfo = "============ 执行了从ERP项目代号/型号代号数据 end;";
            log.info(outInfo+time);
        }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -17,10 +17,12 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javafx.scene.control.TableRow;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +58,9 @@
     * 同步集成服务
     */
    private final     ICodeDuckingSyncService codeDuckingSyncService;
    /*@Value("${erp.item.btmName:XHDH}")
    private String ERP_ITEM_BTMNAME;*/
    /**系统集成的系统信息列表
     * @param queryObject 基础查询对象,包含查询条件,分页,排序等
@@ -314,4 +319,18 @@
    public  R sendData(String oid){
        return codeDuckingSyncService.sendData(oid);
    }
    /***
     * 项目型号代号查询同步
     * @return
     */
    @PostMapping("/searchItemDataForERP")
    public R searchItemDataForERP(String endDate){
            try {
                codeDuckingSyncService.saveItemDataSyncScheduing(endDate);
                return R.success("同步成功");
            }catch (Throwable e){
             return    R.fail("同步失败");
            }
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java
@@ -49,6 +49,6 @@
     */
    R sendData(String oids);
    void saveItemDataSyncScheduing(String btmName);
    void saveItemDataSyncScheduing(String endDate);
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -43,6 +43,7 @@
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.HttpUtils;
@@ -113,7 +114,8 @@
    @Value("${erp.item.secValue:A}")
    public String secValue;
    @Value("${erp.item.btmName:XHDH}")
    public String btmName;
    /**
     * 业务类型的服务
     */
@@ -261,21 +263,30 @@
     * 同步型号代号
     */
    @Override
    public void saveItemDataSyncScheduing(String btmName) {
    public void saveItemDataSyncScheduing(String endDate) {
        String paramString="";
        String backString="成功";
        String msg="成功";
        boolean success=true;
        SearchItemParam searchItemParam=new SearchItemParam();
        searchItemParam.setSystag("VCI"); //调用系统标识
        Calendar calendar= Calendar.getInstance();
        calendar.set(Calendar.HOUR_OF_DAY,0);
        calendar.set(Calendar.MINUTE,0);
        calendar.set(Calendar.SECOND,0);
        log.info("查询时间------->"+calendar.getTime());
        SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String lastchangedon= dft.format(calendar.getTime());
        String lastchangedon="";
        if(StringUtils.isBlank(endDate)) {
            Calendar calendar = Calendar.getInstance();
            calendar.set(Calendar.HOUR_OF_DAY, 0);
            calendar.set(Calendar.MINUTE, 0);
            calendar.set(Calendar.SECOND, 0);
            log.info("查询时间------->"+calendar.getTime());
            lastchangedon= dft.format(calendar.getTime());
        }else{
            lastchangedon=endDate;
        }
        searchItemParam.setLastchangedon(lastchangedon);
        searchItemParam.setStatus("1");//
        Map<String,String>searchDataMap=  VciBaseUtil.objectToMapString(searchItemParam);
        //SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
        SearchItemVO searchItemVO=new SearchItemVO();
        SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
        /*SearchItemVO searchItemVO=new SearchItemVO();
        List<SearchItemDataVO> data=new ArrayList<>();
        SearchItemDataVO searchItemDataVO1=initData("1","","pro-00001");
        SearchItemDataVO searchItemDataVO2=initData("0","item-00001","");
@@ -283,11 +294,7 @@
        data.add(searchItemDataVO2);
        searchItemVO.setData(data);
        searchItemVO.setCode("200");
        searchItemVO.setMsg("");
        String paramString="";
        String backString="成功";
        String msg="成功";
        boolean success=true;
        searchItemVO.setMsg("");*/
        if(searchItemVO!=null) {
            paramString = JSONObject.toJSON(searchItemVO).toString();
            try {
@@ -424,6 +431,7 @@
                success=false;
                backString="查询失败--->"+e;
                msg="查询失败--->"+e;
                throw new VciBaseException(e.getMessage());
            }finally {
                try {
                    //记录日志
@@ -431,6 +439,7 @@
                }catch (Throwable e){
                    e.printStackTrace();
                    log.error(e.getMessage());
                    throw new VciBaseException(e.getMessage());
                }
            }
        }