From 52e81ee85d4c2a3fb9d3fcd70eae998272d48cd2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 四月 2024 23:22:40 +0800
Subject: [PATCH] 集成相关代码修改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 1
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 5 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 58 +++++++++++++++++++---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java | 7 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java | 1
8 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index c7adc5e..4e4877b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -118,8 +118,9 @@
public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setLastModifyTime(new Date());
- baseModel.setTs(new Date());
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index 734f872..7650067 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.applyjtcodeservice.controller;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
index 315f97a..c7efaee 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
@@ -23,7 +23,7 @@
@Slf4j
public class DockingDataSyncScheduling {
-// private Logger logger = LoggerFactory.getLogger(getClass());
+ // private Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private ICodeDuckingSyncService codeDuckingSyncServiceI;
@@ -44,7 +44,9 @@
FINISH_INIT = "true";
}
- //榛樿姣忓垎閽熸墽琛屾柟娉�
+ /**
+ * 榛樿姣忓垎閽熸墽琛屾柟娉�
+ */
@Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
public void scheduled() {
log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� start:");
@@ -57,4 +59,5 @@
}
log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� end: "+ "寮�鍏虫槸鍚﹀紑鍚�:" +DATA_SYNC_PUSH_ISSTARE);
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
index 23fc0bb..45fbdb6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
@@ -1,7 +1,6 @@
package com.vci.ubcs.code.controller;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.vci.ubcs.code.service.UniversalInterfaceI;
import com.vci.ubcs.code.vo.webserviceModel.person.*;
import org.slf4j.Logger;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
index 2f22a7a..4129fb2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
@@ -68,6 +68,6 @@
Map<String,Object> getCurrentRevision(@Param("tableName")String tableName,@Param("nameoid") String nameoid);
-// Integer updateByTaleAndOid(@Param("tableName")String tableName, @Param("nameoid") String nameoid, @Param("lcStatus") String lcStatus);
+ // Integer updateByTaleAndOid(@Param("tableName")String tableName, @Param("nameoid") String nameoid, @Param("lcStatus") String lcStatus);
}
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 f7ee151..d9689cf 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
@@ -9,6 +9,7 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
+import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
import com.vci.ubcs.code.constant.MdmDuckingConstant;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
@@ -51,7 +52,6 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
-import com.xkcoding.http.support.Http;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.springblade.core.redis.cache.BladeRedis;
@@ -66,7 +66,6 @@
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionStatus;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -123,7 +122,6 @@
@Value("${erp.item.tenant:10000}")
private String ERPXHDHTENANT;
-
/**
* 涓氬姟绫诲瀷鐨勬湇鍔�
@@ -185,8 +183,8 @@
@Autowired(required = false)
private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
- @Autowired
- HttpServletRequest request;
+ @Resource
+ private ICodeAllCodeService codeAllCodeService;
@Override
public void DockingDataSyncScheduing() {
@@ -283,7 +281,6 @@
}
org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
}
-
return request;
}
@@ -311,20 +308,24 @@
lastchangedon=endDate;
}
searchItemParam.setLastchangedon(lastchangedon);
- searchItemParam.setStatus(itemStatus);//
- Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
+ searchItemParam.setIsenabled("");
+ searchItemParam.setStatus(itemStatus);
+ //Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
try {
- paramString=JSONObject.toJSON(searchItemParam).toString();
+ String sendParamString=JSONObject.toJSON(searchItemParam).toString();
// TODO: 鏀逛负浣跨敤HttpUtils鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊
LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Authorization",ERPXHDHAUTH);
headers.add("X-ECC-Current-Tenant",ERPXHDHTENANT);
headers.add("Accept-Language","zh-CHS");
headers.add("Content-Type",MediaType.APPLICATION_JSON.toString());
- String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+ String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",sendParamString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
// String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
if (searchItemVO != null) {
+ if(!"200".equals(searchItemVO.getStatus())){
+ throw new ServiceException(String.format("鎺ュ彛杩斿洖鐘舵�佺爜涓猴細%s锛屽師鍥狅細%s",searchItemVO.getStatus(),searchItemVO.getMessage()));
+ }
BladeUser finalUser;
paramString = JSONObject.toJSON(searchItemVO).toString();
log.info("鍨嬪彿浠ｅ彿鏁版嵁鍊�-------銆�"+paramString);
@@ -948,7 +949,7 @@
/***
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
- private void sendpushDataForService (List<DockingTask> dockingTaskS){
+ private void sendpushDataForService(List<DockingTask> dockingTaskS){
//姣忎釜task渚濇鎵ц鎺ㄩ��
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -965,13 +966,31 @@
//琛ㄧず鏄富鏁版嵁
CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
-
List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
Map<String/**鑻辨枃鍚嶇О**/, String/**涓枃鍚嶇О**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
Map<String, String> data = new HashMap<>();
- if (r == null) {
- JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
- data = (Map) josni;
+ // TODO: 鍥炴敹缂栫爜鐨勬儏鍐碉紝浼氬嚭鐜版暟鎹凡缁忓洖鏀讹紝浣嗘槸浜嬪姟杩樻湭鎵ц鐨勬儏鍐碉紝
+ // 鎵�浠ヨ繖鍎跨紦瀛樺氨寰楁寜鐓у暐鏃跺�欏洖鏀剁殑鎺ㄩ�佹垚鍔熶簡鍟ユ椂鍊欐墠鑳芥竻绌烘寚瀹氱殑缂撳瓨
+ if (!r.isSuccess() || Func.isEmpty(r.getData())) {
+ List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getId, dockingTask.getId()));
+ CodeAllCode codeAllCode = codeAllCodes.get(0);
+ BaseModel baseModel = JSONObject.parseObject(codeAllCode.getBusinessData(), BaseModel.class);
+ Map<String, Object> objectMap = VciBaseUtil.objectToMap(baseModel);
+ for (Map.Entry<String,Object> entry : objectMap.entrySet()){
+ if(entry.getKey().equals("data") && Func.isNotEmpty(entry.getValue())){
+ Map<String, Object> dataMap = ((JSONObject) entry.getValue());
+ for(Map.Entry<String,Object> dataEntry : dataMap.entrySet()){
+ String v = String.valueOf(dataEntry.getValue());
+ data.put(dataEntry.getKey().toLowerCase(Locale.ROOT), v == null ? "" : v);
+ }
+ }else{
+ String key = entry.getKey().toLowerCase(Locale.ROOT);
+ String value = String.valueOf(entry.getValue());
+ data.put(key, value == null ? "":value);
+ }
+ }
+ /*JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
+ data = (Map) josni;*/
} else {
data = r.getData().get(0);
}
@@ -1001,8 +1020,10 @@
}
if(isGroupCodeFlage){
code=data.getOrDefault("groupcode","");
- if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
+ if(StringUtils.isBlank(code)) {
+ //濡傛灉鏄帹閫侀泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
+ // TODO锛氬彲鑳戒細鍑虹幇鏈幏鍙栧埌闆嗗洟鐮侊紝灏辫鐐逛簡鍥炴敹锛岃繖鏃跺��
dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
dockingTask.setLastModifyTime(new Date());
dockingTaskService.updateById(dockingTask);
@@ -1204,7 +1225,7 @@
/***
* 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
*/
- private void sendpushDataForService (){
+ private void sendpushDataForService(){
initSysadmin();
//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
//VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1224,12 +1245,11 @@
*/
private void sendpushClsfForService(){
initSysadmin();
- /* //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
+ /* //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE);
queryWrapper.addQueryMap("btmId",DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT));
List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);*/
-
//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
LambdaQueryWrapper<DockingTask> queryWrapper = Wrappers.<DockingTask>lambdaQuery();
queryWrapper.eq(DockingTask::getSendFlag,MdmDuckingConstant.SEND_FLAG_FALSE);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
index d9ac268..fbc1f4f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
@@ -7,6 +7,7 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
import java.util.List;
import java.util.Objects;
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
index 2427ebe..c1f0c39 100644
--- a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
@@ -205,7 +205,7 @@
public R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {
boolean checkBoolean = checkCmdVer(deployAppsVO.getStartCmd()) && checkCmdVer(deployAppsVO.getStopCmd()) && checkCmdVer(deployAppsVO.getRestartCmd());
if(checkBoolean){
- return R.fail("閰嶇疆鐨勫懡浠や腑鍖呭惈鍗遍櫓鍛戒护锛屽锛歳m銆乵v銆乺m -rf銆乧hmod绛夊懡浠ゅ拰鍏抽敭璇嶏紒 ");
+ return R.fail("閰嶇疆鐨勫懡浠や腑鍖呭惈鍗遍櫓鍛戒护锛屽锛歳m銆乵v銆乺m -rf銆乧hmod绛夊懡浠ゅ拰鍏抽敭瀛楋紒 ");
}
return R.status(this.saveOrUpdate(deployAppsVO));
}
--
Gitblit v1.9.3