From d0df2f761d92fbf94cc0751460f9e36b7b0b357a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 26 一月 2024 13:08:13 +0800
Subject: [PATCH] erp项目代号集成接口开发
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java | 5 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 39 ++++++++++++-------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 19 +++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java | 2
4 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
index e1debed..574b42c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java
+++ b/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);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 49df39d..121128e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/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("鍚屾澶辫触");
+ }
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java
index 4b7bb10..2f93cac 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java
+++ b/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);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 227274c..b3d3f2b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/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());
}
}
}
--
Gitblit v1.9.3