From c12742429bff42ef71261505e6c8c74a6a450452 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 11 七月 2023 17:36:07 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 33 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 91 ++++++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 15 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 247 +++++++++++++++------------
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 97 ++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java | 39 ++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java | 4
10 files changed, 384 insertions(+), 149 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
index 3ed42a7..0e819d8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
@@ -321,7 +321,6 @@
throw new VciBaseException(LangBaseUtil.getErrorMsg(var13), new String[0], var13);
} finally {
IOUtils.closeQuietly(os);
-
try {
wb.close();
} catch (Throwable var12) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index a6f8417..b7db59f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -123,10 +123,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
- <exclusion>
+ <!--<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
- </exclusion>
+ </exclusion>-->
<exclusion>
<artifactId>geronimo-activation_1.1_spec</artifactId>
<groupId>org.apache.geronimo.specs</groupId>
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 c24f718..20dfef7 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
@@ -4,19 +4,14 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
+import com.vci.ubcs.code.dto.DockingTaskDTO;
import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
-import com.vci.ubcs.code.entity.DockingData;
-import com.vci.ubcs.code.entity.DockingSystem;
-import com.vci.ubcs.code.entity.DockingSystemConfig;
-import com.vci.ubcs.code.service.IDockingDataService;
-import com.vci.ubcs.code.service.IDockingSystemConfigService;
-import com.vci.ubcs.code.service.IDockingSystemService;
-import com.vci.ubcs.code.vo.pagemodel.DockingDataVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
-import com.vci.ubcs.code.wrapper.DockingDataWrapper;
-import com.vci.ubcs.code.wrapper.DockingSystemWrapper;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.wrapper.*;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -24,6 +19,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
/**
* 鐮佹鍩虹淇℃伅鎺у埗鍣�
@@ -45,13 +42,15 @@
* 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟
*/
private final IDockingSystemConfigService dockingSystemConfigService;
-
+ /***
+ * 寰呴泦绠＄悊閰嶇疆鏈嶅姟
+ */
+ private final IDokingSysManaentService dokingSysManaentService;
/***
- * 寰呴泦鎴愭暟鎹湇鍔�
+ * 鍚屾闆嗘垚鏈嶅姟
*/
- private final IDockingDataService dockingDataService;
-
+ private final ICodeDuckingSyncService codeDuckingSyncService;
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
* @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -188,7 +187,71 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
- IPage<DockingData> pages = dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
- return R.data(DockingDataWrapper.build().pageVO(pages));
+ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
+ return R.data(pages);
+ }
+
+
+ /**
+ * data鍒楄〃
+ * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ @GetMapping("/gridDockingTask")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingTaskVO")
+ public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
+ IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
+ * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridLoge")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
+ public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
+ IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridParam")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
+ public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
+ IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
+ return R.data(pages);
+ }
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @GetMapping("/gridHeader")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
+ public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
+ IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
+ return R.data(pages);
+
+
+ }
+ /**
+ *鎵归噺澶勭悊
+ * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
+ * @return
+ */
+ @PostMapping("/sendData")
+ public R sendData(String oid){
+ return codeDuckingSyncService.sendData(oid);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
index 3539281..aed6f9d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
@@ -1,10 +1,49 @@
package com.vci.ubcs.code.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.vo.pagemodel.*;
+import org.springblade.core.mp.support.Query;
+
/***
* 绯荤当绠＄悊鐩稿叧鏈嶅姟
*/
public interface IDokingSysManaentService {
+ /**
+ * data鍒楄〃
+ * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query);
+ /**
+ * 寰呴泦鎴愭暟鎹�
+ * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
+ */
+ IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query);
+ /**
+ * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
+ * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query);
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ IPage<DockingSysIntParamVO>gridParam(DockingSysIntParam dockingSysIntParam, Query query);
+
+
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ IPage<DockingSysIntHeaderVO>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query);
+
}
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 c17b3a8..91d1f4f 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
@@ -1,10 +1,16 @@
package com.vci.ubcs.code.service.impl;
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.vci.ubcs.code.entity.DockingSystem;
-import com.vci.ubcs.code.service.ICodeDuckingSyncService;
-import com.vci.ubcs.code.service.IDockingSystemService;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
+import com.vci.ubcs.starter.web.util.WebUtil;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
@@ -13,6 +19,8 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
+
+import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
/*
@@ -28,7 +36,14 @@
@Resource
private IDockingSystemService dockingSystemService;
-
+ @Resource
+ private IDockingDataService dockingDataService;
+ @Resource
+ private IDockingTaskService dockingTaskService;
+ @Resource
+ private IDockingSystemConfigService dockingSystemConfigService;
+ @Resource
+ private ICodeClassifyService codeClassifyService;
@Override
public void DockingDataSyncScheduing() {
@@ -45,6 +60,9 @@
@Override
public R sendData(String oids) {
+
+
+
return null;
}
@@ -54,115 +72,120 @@
* @param type
*/
private void initPushDataTaks(int type){
-// //initSysadmin();
-// //sysintinfo鏌ヨ瑕佹帹閫佺殑涓婚搴撳拰鐩稿叧绯荤粺淇℃伅
-// Map<String, String> conditionMap = new HashMap<>();
-// conditionMap.put("usedflag","true");
-// conditionMap.put("pushType",type==2?"2":"1") ;//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
-//
-// Wrappers wrappers=new Wrappers();
-//
-// List<DockingSystem> sysIntInfoVOList = dockingSystemService.list(Wrappers.query().lambda().eq());
-// if(CollectionUtils.isEmpty(sysIntInfoVOList)){
-// String title=type==2?"鍒嗙被鎺ㄩ��":"鏁版嵁鎺ㄩ��";
-// log.info("info->鎵�鏈夐泦鎴愮郴缁燂紝鏈煡璇㈠埌鐩稿叧鐨勩��"+title+"銆戠殑鎺ュ彛閰嶇疆淇℃伅锛岄厤缃�");
-// return;
-// }
-// Map<String ,List<DockingSystem>> sysIntInfoDOMap = new HashMap<String ,List<DockingSystem>>();//key=classifyoid,value=list<map>
-// for (SysIntInfoDO sysIntInfoVOi:sysIntInfoVOList){
-// List<SysIntInfoDO> SysIntInfoVOListi = sysIntInfoDOMap.get(sysIntInfoVOi.getClassifyoid());
-// if(SysIntInfoVOListi==null){
-// SysIntInfoVOListi = new ArrayList<SysIntInfoDO>();
-// }
-// SysIntInfoVOListi.add(sysIntInfoVOi);
-// sysIntInfoDOMap.put(sysIntInfoVOi.getClassifyoid(),SysIntInfoVOListi);
-// }
-// //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
-// VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingDataDO.class);
-// queryWrapperForDO.addQueryMap("sendflag","false");
-// if(type==2){
-// queryWrapperForDO.addQueryMap("btmTypeId",DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
-// }else {
-// queryWrapperForDO.addQueryMap("btmTypeId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)) + ")");
-// }
-// List<DockingDataDO> dataList = dockingDataDaoI.selectByWrapper(queryWrapperForDO);
-//
-// for (DockingDataDO mapi:dataList){
-// WebUtil.setPersistence(false);
-// BatchCBO batchCBO = new BatchCBO();
-// String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
-// String classifyoid = mapi.getClassifyoid();
-// String id = mapi.getId();
-// String uniquecode = mapi.getUniquecode();
-// String btmid = mapi.getBtmid();
-// String btmoid = mapi.getBtmoid();
-// String sendtype = mapi.getSendtype();
-// String classifyid = mapi.getClassifyid();
-// String classifyname = mapi.getClassifyname();
-// String curentClassOid=null;
-// if(type==2){
-// curentClassOid=btmoid;
-// }else{
-// curentClassOid=classifyoid;
-// }
-// List<SysIntInfoDO> effectiveSysIntInfoVOs=new ArrayList<>();
-// //鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
-// List<CodeClassifyDO> parentLeveDO= codeClassifyDaoI.selectAllLevelParentByOid(curentClassOid);
-// if(CollectionUtils.isEmpty(parentLeveDO)){
-// continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
-// }
-// Map<String, CodeClassifyDO> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
-//
-// oidCodeclassifyDOMap.keySet().forEach(oid->{
-// if(sysIntInfoDOMap.containsKey(oid)){
-// List<SysIntInfoDO> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
-// effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
-// }
-// });
-// //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
-// if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
-// continue;
-// }
-// List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<DockingTaskDO>();
-// for (SysIntInfoDO sysIntInfoVOi:effectiveSysIntInfoVOs){
-// DockingTaskDO dockingTaskDO = new DockingTaskDO();
-// dockingTaskDO.setOid(redisService.getUUIDEveryDay());
-// dockingTaskDO.setSendflag(SEND_FLAG_FALSE);
-// dockingTaskDO.setId(id);//缂栫爜
-// dockingTaskDO.setUniquecode(uniquecode);
-// dockingTaskDO.setBtmoid(btmoid);//鏁版嵁oid
-// dockingTaskDO.setBtmid(btmid);//鏁版嵁涓氬姟绫诲瀷id
-// dockingTaskDO.setClassifyid(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
-// dockingTaskDO.setClassifyoid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
-// dockingTaskDO.setClassifyname(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
-// dockingTaskDO.setSendtype(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
-// dockingTaskDO.setDataoid(dataoid);
-//
-// //intinfo
-// dockingTaskDO.setSysinfooid(sysIntInfoVOi.getOid());//intinfo鐨刼id
-// dockingTaskDO.setSystemoid(sysIntInfoVOi.getSysbaseoid());//绯荤粺oid
-// dockingTaskDO.setSystemcode(sysIntInfoVOi.getSysbaseid());//绯荤粺缂栫爜
-// dockingTaskDO.setSystemname(sysIntInfoVOi.getSysbasename());//绯荤粺name
-// dockingTaskDO_insert.add(dockingTaskDO);
-// }
-//
-// BatchCBO bi = null;
-// if(dockingTaskDO_insert.size()!=0) {
-// bi = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
-// batchCBO.copyFromOther(bi);
-// }
-// WebUtil.setPersistence(true);
-// boService.persistenceBatch(batchCBO);
-// //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
-// boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
-// if(!u){
-// log.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
-// continue;
-// }
-//
-// }
+ //initSysadmin();
+
+ List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
+ Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
+ .eq(DockingSystemConfig::getPushType,type==2?"2":"1"));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
+
+ if(CollectionUtils.isEmpty(dockingSystemConfigList)){
+ String title=type==2?"鍒嗙被鎺ㄩ��":"鏁版嵁鎺ㄩ��";
+ log.info("info->鎵�鏈夐泦鎴愮郴缁燂紝鏈煡璇㈠埌鐩稿叧鐨勩��"+title+"銆戠殑鎺ュ彛閰嶇疆淇℃伅锛岄厤缃�");
+ return;
+ }
+ Map<String ,List<DockingSystemConfig>> sysIntInfoDOMap = new HashMap<>();//key=classifyoid,value=list<map>
+ for (DockingSystemConfig dockingSystemConfig:dockingSystemConfigList){
+ List<DockingSystemConfig> dockingSystemList = sysIntInfoDOMap.get(dockingSystemConfig.getClassifyOid());
+ if(dockingSystemList==null){
+ dockingSystemList = new ArrayList<>();
+ }
+ dockingSystemList.add(dockingSystemConfig);
+ sysIntInfoDOMap.put(dockingSystemConfig.getClassifyOid(),dockingSystemList);
+ }
+ //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
+ LambdaQueryWrapper<DockingData> queryWrapper = Wrappers.<DockingData>lambdaQuery();
+ queryWrapper.eq(DockingData::getSendFlag,"false");
+ if(type==2){
+ queryWrapper.eq(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
+ }else {
+ queryWrapper.notIn(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
+ }
+ List<DockingData> dataList = dockingDataService.list(queryWrapper);
+
+ for (DockingData mapi:dataList){
+ WebUtil.setPersistence(false);
+ String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
+ String classifyoid = mapi.getClassifyOid();
+ String id = mapi.getId();
+ String uniquecode = mapi.getUniqueCode();
+ String btmid = mapi.getBtmId();
+ String btmoid = mapi.getBtmOid();
+ String sendtype = mapi.getSendType();
+ String classifyid = mapi.getClassifyId();
+ String classifyname = mapi.getClassifyName();
+ String curentClassOid=null;
+ if(type==2){
+ curentClassOid=btmoid;
+ }else{
+ curentClassOid=classifyoid;
+ }
+ List<DockingSystemConfig> effectiveSysIntInfoVOs=new ArrayList<>();
+ //鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
+ List<CodeClassify> parentLeveDO= codeClassifyService.selectAllLevelParentByOid(curentClassOid);
+ if(CollectionUtils.isEmpty(parentLeveDO)){
+ continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
+ }
+ Map<String, CodeClassify> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
+
+ oidCodeclassifyDOMap.keySet().forEach(oid->{
+ if(sysIntInfoDOMap.containsKey(oid)){
+ List<DockingSystemConfig> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
+ effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
+ }
+ });
+ //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
+ if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
+ continue;
+ }
+ List<DockingTask> dockingTask_insert = new ArrayList<>();
+ for (DockingSystemConfig sysIntInfoVOi:effectiveSysIntInfoVOs){
+ DockingTask dockingTask = new DockingTask();
+ dockingTask.setOid(VciBaseUtil.getPk());
+ dockingTask.setSendFlag(SEND_FLAG_FALSE);
+ dockingTask.setId(id);//缂栫爜
+ dockingTask.setUniqueCode(uniquecode);
+ dockingTask.setBtmOid(btmoid);//鏁版嵁oid
+ dockingTask.setBtmId(btmid);//鏁版嵁涓氬姟绫诲瀷id
+ dockingTask.setClassifyId(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
+ dockingTask.setClassifyOid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
+ dockingTask.setClassifyName(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
+ dockingTask.setSendType(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
+ dockingTask.setDataOid(dataoid);
+
+ //intinfo
+ dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo鐨刼id
+ dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//绯荤粺oid
+ dockingTask.setSystemCode(sysIntInfoVOi.getSysBaseId());//绯荤粺缂栫爜
+ dockingTask.setSystemName(sysIntInfoVOi.getSysBaseName());//绯荤粺name
+ dockingTask_insert.add(dockingTask);
+ }
+
+ if(dockingTask_insert.size()!=0) {
+ dockingTaskService.saveBatch(dockingTask_insert);
+ }
+ //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
+ boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
+ if(!u){
+ log.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
+ continue;
+ }
+ }
}
-
+ /**
+ * dockingdata鏍规嵁oid淇敼sendflag
+ * @param oid
+ * @param sendflag
+ * @return
+ */
+ public boolean updateDockingDatasSendFlag(String oid,String sendflag){
+ boolean u=false;
+ DockingData dockingData=dockingDataService.getById(oid);
+ if(dockingData!=null){
+ dockingData.setSendFlag(sendflag);
+ u= dockingDataService.updateById(dockingData);
+ }
+ return u;
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index db243fa..2c282f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -98,7 +98,7 @@
/***
* 浠诲姟鐢熸垚鏈嶅姟
*/
- @Autowired(required = false)
+ @Autowired( required = false)
private IDockingTaskService dockingTaskService;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
new file mode 100644
index 0000000..299711d
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -0,0 +1,91 @@
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.wrapper.*;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
+
+
+ /***
+ * 浠诲姟鐢熸垚鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingTaskService dockingTaskService;
+
+
+ /***
+ * 鏃ュ織鐢熸垚鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingLogeService dockingLogeService;
+
+ /***
+ * 闆嗘垚鎺ュ彛澶村崗璁湇鍔�
+ */
+ @Autowired( required = false)
+ private IDockingSysIntHeaderService dockingSysIntHeaderService;
+ /***
+ * 闆嗘垚鎺ュ彛鍙傛暟鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingSysIntParamService dockingSysIntParamService;
+
+ /***
+ * 寰呴泦鎴愭暟鎹湇鍔�
+ */
+ @Autowired( required = false)
+ private IDockingDataService dockingDataService;
+ /**
+ * data鍒楄〃
+ * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
+ */
+ @Override
+ public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
+ IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+ return DockingTaskWrapper.build().pageVO(pages);
+ }
+
+ @Override
+ public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
+ IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
+ return DockingDataWrapper.build().pageVO(pages);
+ }
+
+ /**
+ * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
+ * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @Override
+ public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
+ IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+ return DockingLogeWrapper.build().pageVO(pages);
+ }
+
+ @Override
+ public IPage<DockingSysIntParamVO> gridParam(DockingSysIntParam dockingSysIntParam, Query query) {
+ IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntParam));
+ return DockingSysIntParamWrapper.build().pageVO(pages);
+ }
+ /**
+ * 鎺ュ彛param鍒楄〃
+ * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
+ */
+ @Override
+ public IPage<DockingSysIntHeaderVO> gridHeader(DockingSysIntHeader dockingSysIntHeader , Query query) {
+ IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntHeader));
+ return DockingSysIntHeaderWrapper.build().pageVO(pages);
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index eae24b4..a2c6424 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -361,16 +361,23 @@
//鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
//鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
//缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
- List<CodeClassifyTemplateAttrVO> templateAttrVOS = codeClassifyTemplateVO.getAttributes().stream().filter(s ->
+ List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList=codeClassifyTemplateVO.getAttributes();
+ if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrVOList)) {
+ if (CollectionUtils.isEmpty(codeClassifyTemplateAttrVOList)) {
+ throw new VciBaseException("妯℃澘娌℃湁閰嶇疆灞炴��");
+ }
+ }
+ List<CodeClassifyTemplateAttrVO> templateAttrVOS = codeClassifyTemplateAttrVOList.stream().filter(s ->
!DEFAULT_ATTR_LIST.contains(s.getId())
&& StringUtils.isBlank(s.getComponentRule())
&& StringUtils.isBlank(s.getClassifyInvokeAttr())
&& (isHistory || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(templateAttrVOS)){
- throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
- }
+ if (CollectionUtils.isEmpty(templateAttrVOS)) {
+ throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
+ }
+
List<CodeClassifyTemplateAttrVO> idAttrVOList = codeClassifyTemplateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
Workbook workbook = new HSSFWorkbook();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 57b99c2..e83c585 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1115,7 +1115,7 @@
* 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
*/
public void getConfigDatas(String systemId,String libray, ApplyDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
- List<ApplyDataVO> applyDataVOList=applyDatasVO.getObject();
+
LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
@@ -1125,15 +1125,23 @@
Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
//stringStringMap.put("RLM","D:\\RLM.xml");
- LibraryDO libraryDO=gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
- List<LibraryClsfDO> libraryClsfDOList=libraryDO.getClsf();
- Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
- if(libPropMaps.containsKey(libray)){
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
- List<ClsfAttrMappingDO> clsfAttrMappingDOList=libPropMaps.get(libray);
- propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
- log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+"+clsfAttrMappingDOList.size());
+ if(!CollectionUtils.isEmpty(stringStringMap)) {
+ log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
+ LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
+ List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
+ if(!CollectionUtils.isEmpty(libraryClsfDOList)) {
+ Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+ String path=stringStringMap.get(systemId);
+ if (libPropMaps.containsKey(libray)) {
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+ List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray);
+ propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+ log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+ }else{
+ throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+ }
+ }
}
log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
}catch (Throwable e){
@@ -1155,6 +1163,11 @@
dataObjectVO.setColName(rowNameList);//鏀惧叆灞炴��
attrMapConfigMap.putAll(propMaps);
LinkedList<RowDatas> rowDataList = new LinkedList<>();
+ List<ApplyDataVO> applyDataVOList=new ArrayList<>();
+
+ if(!CollectionUtils.isEmpty(applyDatasVO.getObject())){
+ applyDataVOList=applyDatasVO.getObject();
+ }
//Map<String, List<ProppertyVO>> dataPropMap = applyDataVOList.stream().collect(Collectors.toMap(ApplyDataVO::getId, ApplyDataVO::getProp, (key1, key2) -> key2));
final int[] rowIndex = {0};
applyDataVOList.stream().forEach(applyDataVO -> {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java
index 377a698..eabea3a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingTaskWrapper.java
@@ -12,8 +12,8 @@
import java.util.Objects;
public class DockingTaskWrapper extends BaseEntityWrapper<DockingTask, DockingTaskVO> {
- public static DockingSystemWrapper build() {
- return new DockingSystemWrapper();
+ public static DockingTaskWrapper build() {
+ return new DockingTaskWrapper();
}
@Override
public DockingTaskVO entityVO(DockingTask entity) {
--
Gitblit v1.9.3