From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 四月 2024 10:05:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 10 +-
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java | 8 ++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java | 35 ++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 51 +++++++++++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 9 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 17 +++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java | 13 ++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java | 10 ++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java | 8 -
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 56 ++++++++++++--
11 files changed, 190 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
index 1d40f40..6733fd4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
@@ -35,4 +35,14 @@
return R.data(operateLogService.listByCondition(bladeQueryObject));
}
+ /**
+ * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+ * @param oid
+ * @return
+ */
+ @GetMapping("/detailByOid")
+ public R<LogOperate> detailByOid(String oid) {
+ return R.data(operateLogService.detailByOid(oid));
+ }
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
index 417f0a1..df90b74 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
@@ -29,4 +29,12 @@
*/
IPage<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException;
+ /**
+ * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+ * @param oid
+ * @return
+ * @throws ServiceException
+ */
+ LogOperate detailByOid(String oid) throws ServiceException;
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index becbc97..8e91b71 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -85,7 +85,7 @@
*/
@Override
public List<LocalLogVO> getSystemLogList(String logParentPath) {
- List<LocalLogVO> localLogsVO = new ArrayList<>();
+ List<LocalLogVO> localLogsVOS = new ArrayList<>();
// 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
if(Func.isNotEmpty(logParentPath)){
File file = new File(logParentPath);
@@ -104,7 +104,7 @@
localLog.setServiceId(serviceId);
localLog.setServiceName(getServiceName(serviceId));
localLog.setHasChildren(false);
- localLogsVO.add(localLog);
+ localLogsVOS.add(localLog);
});
}
}
@@ -128,13 +128,15 @@
localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
localLogVO.setHasChildren(true);
- localLogsVO.add(localLogVO);
+ localLogsVOS.add(localLogVO);
}
}
});
}
}
- return localLogsVO;
+ // 瀵规棩蹇楄繘琛岄檷搴忔帓搴�
+ List<LocalLogVO> resLocalLogVOS = localLogsVOS.stream().sorted(Comparator.comparing(LocalLogVO::getLastModifier).reversed()).collect(Collectors.toList());
+ return resLocalLogVOS;
}
/**
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
index 3e739d8..2535d60 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
@@ -1,6 +1,10 @@
package com.vci.ubcs.log.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.log.mapper.LogOperateMapper;
@@ -60,8 +64,37 @@
throw new ServiceException("鏃ュ織鏌ヨ蹇呬紶鍙傛暟銆愭棩蹇楃被鍨嬨�戜笉鑳戒负绌猴紒");
}
// map瀵硅薄杞崲涓烘煡璇㈠璞�
- IPage<LogOperate> logOperateIPage = this.logOperateMapper.selectPage(Condition.getPage(bladeQueryObject.getQuery().setDescs("TIME")), UBCSCondition.getQueryWrapper(bladeQueryObject.getConditionMap(), LogOperate.class));
+ LambdaQueryWrapper<LogOperate> wrapper = UBCSCondition.getQueryWrapper(bladeQueryObject.getConditionMap(), LogOperate.class).lambda();
+ wrapper.select(
+ LogOperate::getOid,
+ LogOperate::getUserName,
+ LogOperate::getRealName,
+ LogOperate::getIp,
+ LogOperate::getModel,
+ LogOperate::getOperate,
+ LogOperate::getTime,
+ LogOperate::getOperateResult,
+ LogOperate::getLogType,
+ LogOperate::getIsAdmin
+ );
+ IPage<LogOperate> logOperateIPage = this.logOperateMapper.selectPage(Condition.getPage(bladeQueryObject.getQuery().setDescs("TIME")), wrapper);
return logOperateIPage;
}
+ /**
+ * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+ * @param oid
+ * @return
+ * @throws ServiceException
+ */
+ @Override
+ public LogOperate detailByOid(String oid) throws ServiceException {
+ if(Func.isBlank(oid)){
+ throw new ServiceException("蹇呬紶鍙傛暟鏃ュ織鐨刼id涓嶈兘涓虹┖锛�");
+ }
+ LogOperate logOperate = this.logOperateMapper.selectOne(Wrappers.<LogOperate>query().lambda().eq(LogOperate::getOid, oid));
+ return logOperate;
+ }
+
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
index 775e066..59ca7e3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
@@ -15,11 +15,11 @@
@EqualsAndHashCode(callSuper = true)
public class DockingLog extends BaseModel {
-
/**
* 搴忓垪鍖�
*/
private static final long serialVersionUID = 5020487634341415429L;
+
/**
* 绯荤粺id
*/
@@ -67,6 +67,7 @@
*/
@ApiModelProperty(value = "鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤")
private String type;
+
/***
* 鎺ュ彛绫诲瀷鏄剧ず鍊�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
index 248b1d9..9ab150f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -34,41 +34,36 @@
*/
private String interfaceStatus;
-
/**
* 鍙傛暟
*/
private String paramString;
-
/**
* 杩斿洖
*/
private String returnString;
-
/**
* 绯荤粺缂栧彿
*/
private String systemCode;
-
/**
* 绯荤粺鍚嶇О
*/
private String systemName;
-
/**
* 绯荤粺id
*/
private String systemOid;
-
/**
* 鎺ュ彛绫诲瀷
*/
private String type;
+
/**
* 鎺ュ彛绫诲瀷鏄剧ず鍊�
*/
@@ -221,4 +216,5 @@
", msg='" + msg + '\'' +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
index bc1eb1f..6b2e357 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -38,7 +38,6 @@
private static final String NOT_NULL = "_notnull";
private static final String IGNORE = "_ignore";
-
public UBCSSqlKeyword() {
}
@@ -54,6 +53,7 @@
}
return sqlwhere;
}
+
private static String sqlKeywordValueSqlwhere(String field, Object value, SqlKeyword operation){
String sqlwhere="";
switch(operation) {
@@ -83,6 +83,7 @@
}
return sqlwhere;
}
+
private static String dateValueSqlwhere(String field, Object value, SqlKeyword operation){
String sqlwhere="";
switch(operation) {
@@ -101,6 +102,7 @@
}
return sqlwhere;
}
+
public static String buildSqlwhere(Map<String, Object> query) {
StringBuffer sb=new StringBuffer();
if (!Func.isEmpty(query)) {
@@ -151,6 +153,7 @@
return sb.toString();
}
+
public static void buildCondition(Map<String, Object> query, QueryWrapper<?> qw) {
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
@@ -248,7 +251,8 @@
});
}
}
- public static MPJLambdaWrapper buildConditionByMapString(Map<String, String> query) {
+
+ public static MPJLambdaWrapper buildConditionByMapString(Map<String, String> query) {
MPJLambdaWrapper<?>qw=new MPJLambdaWrapper<>();
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
@@ -294,6 +298,7 @@
};
return qw;
}
+
public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 6bb3dad..320f739 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -18,6 +18,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
@@ -29,6 +30,7 @@
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
+import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -219,8 +221,9 @@
// 3.1銆侀�氳繃璇ユ潯鏁版嵁鐨勫垎绫籭d锛屾嬁鍒伴泦鍥㈠睘鎬ф槧灏勯厤缃紝鐢ㄦ潵灏嗛泦鍥㈢殑灞炴�ф槧灏勫埌鎴戜滑绯荤粺鐨勫睘鎬�
List<DockingPreAttrMapping> dockingPreAttrMappings = dockingPreAttrMappingService.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid).eq(DockingPreAttrMapping::getViewName,"缂栫爜瑙嗗浘"));
if(Func.isNotEmpty(dockingPreAttrMappings)){
+ log.info("寮�濮嬭皟鐢╯ourceAttrKey2TargetKey鏂规硶銆�");
//鏍规嵁闆嗗洟灞炴�ф槧灏勫皢闆嗗洟杞埌鎴戜滑绯荤粺锛屽苟淇敼涓嶄竴鑷寸殑鍒版垜浠郴缁熶腑瀵瑰簲鐨勮鏉¤褰曠殑鍊�
- sourceAttrKey2TargetKey(dockingPreAttrMappings, viewValueList.get(0), oldDatalist, baseModel);
+ sourceAttrKey2TargetKey(dockingPreAttrMappings, viewValueList.get(0), baseModel);
}
}
log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
@@ -253,33 +256,70 @@
* 鏍规嵁闆嗗洟灞炴�ф槧灏勫皢闆嗗洟杞埌鎴戜滑绯荤粺
* @param dockingPreAttrMappings
* @param viewValueMap
- * @param oldDatalist
* @param baseModel
*/
- private void sourceAttrKey2TargetKey(List<DockingPreAttrMapping> dockingPreAttrMappings,Map<String, Object> viewValueMap, List<BaseModel> oldDatalist,BaseModel baseModel){
- Map<String, Object> targetKeyMap = new HashMap<>();
+ private void sourceAttrKey2TargetKey(List<DockingPreAttrMapping> dockingPreAttrMappings,Map<String, Object> viewValueMap,BaseModel baseModel) throws ServiceException {
+ log.info("寮�濮嬫牴鎹泦鍥㈠睘鎬ф槧灏勶紝灏嗛泦鍥㈠睘鎬ц浆鎴愮紪鐮佺郴缁熷睘鎬э紝骞惰繘琛屾槸鍚︿慨鏀圭殑姣斿锛�");
+ //娣辨嫹璐濊褰曚笅鍘熷璞★紝濡傛灉鏈夋洿鏀圭敤鏉ユ斁鍦ㄦ棫涓氬姟鏁版嵁瀛楁锛坥ldbusinessdata锛変笂
+ BaseModel oldBaseModel = null;
+ try {
+ oldBaseModel = deepCopy(baseModel);
+ } catch (Exception e) {
+ log.error("璁板綍鏃х殑涓氬姟鏁版嵁鏃讹紝baseModel瀵硅薄娣辨嫹璐濆嚭鐜伴敊璇紝鍘熷洜锛�"+e.getMessage());
+ e.printStackTrace();
+ throw new ServiceException("璁板綍鏃х殑涓氬姟鏁版嵁鏃讹紝baseModel瀵硅薄娣辨嫹璐濆嚭鐜伴敊璇紝鍘熷洜锛�"+e.getMessage());
+ }
+ Map<String, Object> targetKeyMap = new CaseInsensitiveMap<>();
// 灏嗛泦鍥㈠睘鎬ц浆鎴愭垜浠郴缁熷睘鎬х殑map
dockingPreAttrMappings.stream().forEach(item->{
targetKeyMap.put(item.getTargetAttrKey(),viewValueMap.get(item.getSourceAttrKey()));
});
// 姣斿baseModel鐨刣ata涓殑灞炴�ф槸鍚﹀拰targetKeyMap涓嶄竴鑷达紝涓嶄竴鑷寸殑璇濆氨闇�瑕佸皢baseModel鐨刣ata涓殑瀵瑰簲key鐨剉alue鍊艰浆鎴愰泦鍥㈢殑
boolean isEdit = false;
+ // 蹇界暐澶у皬鍐�
+ Map caseInsensitiveMap = new CaseInsensitiveMap(baseModel.getData());
for (Map.Entry<String, Object> entry : targetKeyMap.entrySet()) {
String key = entry.getKey();
Object targetValue = entry.getValue();
- String dataValue = baseModel.getData().get(key);
-
+ String dataValue = String.valueOf(caseInsensitiveMap.get(key));
if (targetValue != null && !targetValue.equals(dataValue)) {
- baseModel.getData().put(key, targetValue.toString());
+ caseInsensitiveMap.put(key, targetValue.toString());
isEdit = true;
}
}
// 闆嗗洟瀵规垜浠郴缁熷睘鎬у仛浜嗚皟鏁达紝鎴戜滑闇�瑕佸鑰佺殑涓氬姟鏁版嵁鍋氳褰�
if (isEdit) {
- baseModel.getData().put("oldbusinessdata", JSON.toJSONString(oldDatalist));
+ log.info("闆嗗洟杩斿洖鐨勬暟鎹瓨鍦ㄥ樊寮傦紝寮�濮嬫墽琛屽缂栫爜绯荤粺basemodel瀵硅薄淇敼鎿嶄綔锛�");
+ // 娓呯┖鍘熷厛鐨刴ap锛屼娇鐢ㄦ柊鐨勪笉鍖哄垎key澶у皬鍐欑殑map
+ baseModel.getData().clear();
+ baseModel.getData().putAll(caseInsensitiveMap);
+ // 绉婚櫎鍘嗗彶鐨刼ldbusinessdata瀛楁锛屽惁鍒欎細瓒呴暱
+ oldBaseModel.getData().remove("oldbusinessdata");
+ baseModel.getData().put("oldbusinessdata", JSON.toJSONString(oldBaseModel));
}
}
+ /**
+ * 娣辨嫹璐�
+ * @param baseModel
+ * @return
+ * @throws ClassNotFoundException
+ * @throws IOException
+ */
+ public static BaseModel deepCopy(BaseModel baseModel) throws ClassNotFoundException, IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ oos.writeObject(baseModel);
+ oos.close();
+
+ ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bis);
+ BaseModel copy = (BaseModel) ois.readObject();
+ ois.close();
+
+ return copy;
+ }
+
/***
* 鎺ュ彈闆嗗洟鍒嗙被涓绘ā鍨嬫暟鎹�
* @param dockingClassifyModelAttrVO
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 bde189c..77bd3ea 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,5 +1,6 @@
package com.vci.ubcs.code.controller;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
@@ -267,12 +268,24 @@
}
/**
+ * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯�
+ * @param oid
+ * @return
+ */
+ @GetMapping("/gridLogeDetail")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
+ public R<DockingLogeVO> getDockingLogDetailByOid(String oid) throws ServiceException {
+ return R.data(dokingSysManaentService.getDockingLogDetailByOid(oid));
+ }
+
+ /**
* 鎺ュ彛param鍒楄〃
* @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridParam")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
Map<String,String> condtionMap=queryObject.getConditionMap();
@@ -292,7 +305,7 @@
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridHeader")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 6)
@ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
Map<String,String> condtionMap=queryObject.getConditionMap();
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 ae7268c..efcf48b 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,9 +1,11 @@
package com.vci.ubcs.code.service;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
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;
+import org.springblade.core.tool.api.R;
import java.util.Map;
@@ -11,12 +13,14 @@
* 绯荤当绠＄悊鐩稿叧鏈嶅姟
*/
public interface IDokingSysManaentService {
+
/**
* data鍒楄〃
* @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query);
+
/**
* 寰呴泦鎴愭暟鎹�
* @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -24,7 +28,13 @@
*/
IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query);
-
+ /**
+ * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯�
+ * @param oid
+ * @return
+ * @throws ServiceException
+ */
+ public DockingLogeVO getDockingLogDetailByOid(String oid) throws ServiceException;
/**
* 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
@@ -39,7 +49,6 @@
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
IPage<DockingSysIntParamVO>gridParam(Map<String,String> condtionMap , Query query);
-
/**
* 鎺ュ彛param鍒楄〃
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
index 988a97b..07ada19 100644
--- 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
@@ -1,7 +1,13 @@
package com.vci.ubcs.code.service.impl;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
import com.vci.ubcs.code.service.*;
@@ -11,6 +17,7 @@
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,13 +27,11 @@
@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
-
-// /***
+ // /***
// * 浠诲姟鐢熸垚鏈嶅姟
// */
// @Resource
// private IDockingTaskService dockingTaskService;
-
/***
* 鏃ュ織鐢熸垚鏈嶅姟
@@ -74,6 +79,21 @@
}
/**
+ * 鏍规嵁闆嗘垚鏃ュ織oid锛屾煡璇㈡棩蹇楄鎯�
+ * @param oid
+ * @return
+ * @throws ServiceException
+ */
+ @Override
+ public DockingLogeVO getDockingLogDetailByOid(String oid) throws ServiceException {
+ if(Func.isBlank(oid)){
+ throw new ServiceException("蹇呬紶鍙傛暟闆嗘垚鏃ュ織oid涓嶈兘涓虹┖锛�");
+ }
+ DockingLog dockingLog = dockingLogeService.getOne(Wrappers.<DockingLog>query().lambda().eq(DockingLog::getOid, oid));
+ return DockingLogeWrapper.build().entityVO(dockingLog);
+ }
+
+ /**
* 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
* @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
@@ -81,7 +101,29 @@
@Override
public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
//IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
- IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
+ LambdaQueryWrapper<DockingLog> lambdaQueryWrapper = UBCSCondition.getQueryWrapperByMapString(condtionMap, DockingLog.class).lambda();
+ lambdaQueryWrapper.select(
+ DockingLog::getOid,
+ DockingLog::getCreateTime,
+ DockingLog::getCreator,
+ DockingLog::getLastModifier,
+ DockingLog::getLastModifyTime,
+ DockingLog::getTenantId,
+ DockingLog::getSystemOid,
+ DockingLog::getSystemCode,
+ DockingLog::getSystemName,
+ DockingLog::getClassifyOid,
+ DockingLog::getClassifyId,
+ DockingLog::getClassifyName,
+ DockingLog::getUniqueCode,
+ DockingLog::getType,
+ DockingLog::getMsg,
+ //DockingLog::getParamString,
+ DockingLog::getSendXml,
+ DockingLog::getReturnString,
+ DockingLog::getInterfaceStatus
+ );
+ IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), lambdaQueryWrapper);
return DockingLogeWrapper.build().pageVO(pages);
}
@@ -100,4 +142,5 @@
IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingSysIntHeaderWrapper.build().pageVO(pages);
}
+
}
--
Gitblit v1.9.3