From 79b61d7f259618ddde73948de8b60e1b07bc7d42 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 22 三月 2024 19:45:46 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 3 +--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 12 +++++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java | 10 +++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java | 1 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 6 ------
6 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
index 181afc6..9805f1a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -67,12 +67,10 @@
*/
private String description;
-
/**
* 鎺ュ彛绫诲瀷
*/
private String interfaceType;
-
/**
* 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
@@ -83,7 +81,6 @@
*/
private String paramType;
-
/**
* 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
*/
@@ -92,7 +89,6 @@
* 璇锋眰鏂瑰紡
*/
private String requestMethod;
-
/**
* 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
@@ -128,12 +124,15 @@
*/
private String requestUrl;
-
/**
* 杩斿洖鍊肩被鍨�
*/
private String returnType;
+ /**
+ * 鍐呭绫诲瀷
+ */
+ private String contentType;
/**
* 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
@@ -308,4 +307,5 @@
", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
index bade0bf..427ee43 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -181,7 +181,6 @@
@ApiModelProperty(value = "鍐呭绫诲瀷")
private String contentType;
-
/**
* 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
*/
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 242b506..bde189c 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
@@ -1,12 +1,9 @@
package com.vci.ubcs.code.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
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.*;
import com.vci.ubcs.code.service.*;
@@ -17,13 +14,10 @@
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.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index ca58a3c..bb8b695 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -45,8 +45,7 @@
* @param sysInfoStatusDTO
* @return
*/
- public R updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO);
-
+ R updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO);
/***
* 鎵嬪姩鍚屾鎺ュ彛锛屽彧鏈夋帹閫佺殑鎵嶄細
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 a459868..f7ee151 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
@@ -535,7 +535,7 @@
dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
}
dockingLogeService.save(dockingLoge);
- log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+ log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
}
/***
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 ea79cdb..0c37fdb 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
@@ -462,7 +462,7 @@
if(isUsedFlag){
AtomicBoolean success= new AtomicBoolean(true);
List<PersonMasterData> masterDataList=new ArrayList<>();
- List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+ List<String> fields = Func.toStrList(personAndDeptConfig.getPersonFields());
try {
if(personData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
@@ -695,7 +695,8 @@
}
}catch (Throwable e){
success.set(false);
- message="浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ message = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ msg = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -744,7 +745,7 @@
String systemCode="";
if(isUsedFlag){
List<OrgMasterData> orgMasterDataList=new ArrayList<>();
- List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getDeptFields());
+ List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
try {
if(orgData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
@@ -973,7 +974,8 @@
}
}catch (Throwable e){
success.set(false);
- message="閮ㄩ棬鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ message = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ msg = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -2724,7 +2726,7 @@
dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
}
dockingLogeService.save(dockingLoge);
- log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+ log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
}
/***
--
Gitblit v1.9.3