From b874509c73cbdea8eab37bb232ed3fd515b9a1a2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 27 十一月 2023 09:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml | 8
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java | 13 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 63 +++--
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 11
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java | 5
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java | 8
/dev/null | 165 ----------------
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java | 182 ++++++++++++++++++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 79 ++++---
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 | 17 +
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 15 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 9
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 10
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java | 3
16 files changed, 340 insertions(+), 260 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index 90d9130..057a888 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -69,7 +69,7 @@
// menuWidth: 300,
dialogClickModal: false,
highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
- rowKey: "logName", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
+ rowKey: "randomOid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
column: [
{
label: "鏈嶅姟鍚嶇О",
@@ -121,11 +121,18 @@
};
}
},
- methods: {
-
+ methods: {
+ // 鍒ゆ柇瀹㈡埛绔墍鍦ㄧ殑鎿嶄綔绯荤粺骞冲彴
+ isWindows() {
+ return navigator.platform.indexOf('Win') !== -1
+ },
+ // 鏍规嵁鎿嶄綔绯荤粺骞冲彴杩斿洖鐩稿簲鐨勮矾寰勫垎闅旂
+ getPathSeparator() {
+ return this.isWindows() ? '\\' : '/'
+ },
downLoadLogFile(row){
this.downloadLoading = true;
- let logPath = row.hasChildren ? row.logPath:row.logPath+"\\"+row.logName;
+ let logPath = row.hasChildren ? row.logPath:row.logPath+this.getPathSeparator()+row.logName;
downLoadLog(Object.assign({},row,{logFullPaths:logPath})).then(res=>{
func.downloadFileByBlobHandler(res);
this.downloadLoading = false;
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
index 0e5ba31..7697a7f 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
@@ -10,6 +10,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>ubcs-log-api</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
index 2d9cac1..f7d063e 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
@@ -1,10 +1,14 @@
package com.vci.ubcs.log.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.util.Date;
/**
* 鎿嶄綔鏃ュ織绠＄悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠＄悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
@@ -14,6 +18,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
+@TableName("PL_LOG_OPERATE")
public class LogOperate implements Serializable {
/**
@@ -24,6 +29,7 @@
/**
* 涓婚敭
*/
+ @TableId("OID")
private String oid;
/**
@@ -54,7 +60,7 @@
/**
* 鏃堕棿
*/
- private String time;
+ private Date time;
/**
* 鎿嶄綔缁撴灉
@@ -66,4 +72,9 @@
*/
private String description;
+ /**
+ * 鏃ュ織绫诲瀷
+ */
+ private String logType;
+
}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
deleted file mode 100644
index 0b9022e..0000000
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.vci.ubcs.log.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @author ludc
- * @date 2023/10/31 15:43
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SystemLog {
-
- /**
- * 鏃ュ織鎵�灞炴湇鍔″悕绉�
- */
- private String serviceName;
-
- /**
- * 鏈嶅姟id
- */
- private String serviceId;
-
- /**
- * 鏃ュ織鏂囦欢鎵�鍦ㄧ殑璺緞
- */
- private String logPath;
-
- /**
- * 鏃ュ織鍚嶇О
- */
- private String logName;
-
- /**
- * 鏃ュ織绫诲瀷
- */
- private String logType;
-
- /**
- * 鏃ュ織鍒涘缓鏃堕棿
- */
- private String createTime;
-
- /**
- * 鏃ュ織鐨勬渶鍚庝慨鏀规椂闂�
- */
- private String lastmodifier;
-
-}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
new file mode 100644
index 0000000..e65283e
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/enumpack/ServiceNameRoleEnum.java
@@ -0,0 +1,182 @@
+package com.vci.ubcs.log.enumpack;
+
+import com.vci.ubcs.starter.web.enumpck.BaseEnum;
+
+/**
+ * @author ludc
+ * @date 2023/11/26 18:54
+ */
+public enum ServiceNameRoleEnum implements BaseEnum {
+
+ /**
+ * 缂栫爜鏈嶅姟
+ */
+ UBCS_CODE("ubcs_code","缂栫爜鏈嶅姟"),
+
+ /**
+ * 閴存潈鏈嶅姟
+ */
+ UBCS_AUTH("ubcs_auth","閴存潈鏈嶅姟"),
+
+ /**
+ * 娴佺▼绠＄悊鏈嶅姟
+ */
+ UBCS_FLOW("ubcs_flow","娴佺▼绠＄悊鏈嶅姟"),
+
+ /**
+ * 瀵硅薄寤烘ā绠＄悊鏈嶅姟
+ */
+ UBCS_OMD("ubcs_omd","瀵硅薄寤烘ā绠＄悊鏈嶅姟"),
+
+ /**
+ * 鏃ュ織绠＄悊鏈嶅姟
+ */
+ UBCS_LOG("ubcs_log","鏃ュ織绠＄悊鏈嶅姟"),
+
+ /**
+ * 闆嗘垚绠＄悊鏈嶅姟
+ */
+ UBCS_APPLYJTCODESERVICE("ubcs_applyjtcodeservice","闆嗘垚绠＄悊鏈嶅姟"),
+
+ /**
+ * 绯荤粺绠＄悊鏈嶅姟
+ */
+ UBCS_SYSTEM("ubcs_system","绯荤粺绠＄悊鏈嶅姟"),
+
+ /**
+ * 棣栭〉妗岄潰鏈嶅姟
+ */
+ UBCS_DESK("ubcs_desk","棣栭〉妗岄潰鏈嶅姟"),
+
+ /**
+ * 鏂囦欢绠＄悊鏈嶅姟
+ */
+ UBCS_RESOURCE("ubcs_resource","鏂囦欢绠＄悊鏈嶅姟"),
+
+ /**
+ * 缃戝叧鏈嶅姟
+ */
+ UBCS_GATEWAY("ubcs_gateway","缃戝叧鏈嶅姟"),
+
+ /**
+ * 鎶ヨ〃鏈嶅姟
+ */
+ UBCS_REPORT("ubcs_report","鎶ヨ〃鏈嶅姟"),
+
+ /**
+ * 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
+ */
+ UBCS_USER("ubcs_user","鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟"),
+
+ /**
+ * 鐢ㄦ埛淇℃伅绠＄悊鏈嶅姟
+ */
+ UBCS_ADMIN("ubcs_user","鏈嶅姟娌荤悊鏈嶅姟")
+
+ ;
+
+ /**
+ * 鏋氫妇鐨勫��
+ */
+ private String value;
+
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
+
+ /**
+ * 鑾峰彇鏋氫妇鍊�
+ *
+ * @return 鏋氫妇鍊�
+ */
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * 璁剧疆鏋氫妇鍊�
+ *
+ * @param value 鏋氫妇鍊�
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
+ *
+ * @return 鏄剧ず鏂囨湰
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * 璁剧疆鏄剧ず鏂囨湰
+ *
+ * @param text 鏄剧ず鏂囨湰
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * 鏋勯�犲嚱鏁�
+ *
+ * @param value 鍊�
+ * @param text 鏄剧ず鏂囨湰
+ */
+ private ServiceNameRoleEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ /**
+ * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
+ *
+ * @param text 鍚嶇О
+ * @return 鏋氫妇鍊�
+ */
+ public static String getValueByText(String text) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鍚嶇О
+ */
+ public static String getTextByValue(String value) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
+ */
+ public static ServiceNameRoleEnum forValue(String value) {
+ for (ServiceNameRoleEnum wenum : ServiceNameRoleEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
similarity index 72%
rename from Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
rename to Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
index add2fea..0065b6d 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
@@ -1,6 +1,7 @@
-package com.vci.ubcs.log.dto;
+package com.vci.ubcs.log.vo;
import com.vci.ubcs.log.entity.LocalLog;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -28,4 +29,9 @@
*/
private String logFullPaths;
+ /**
+ * 闅忔満鐨刼id锛屼负浜嗚В鍐宠〃鏍兼覆鏌搑owkey閲嶅鐨勯棶棰�
+ */
+ private String randomOid = VciBaseUtil.getPk();
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 8fea8d4..e62e28e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -1,28 +1,23 @@
package com.vci.ubcs.log.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.rmi.ServerException;
import java.util.List;
-import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
@@ -44,7 +39,7 @@
* @return
*/
@PostMapping("/lazy-list")
- public R<List<LocalLog>> getSystemLogList(@RequestBody LocalLog localLog){
+ public R<List<LocalLogVO>> getSystemLogList(@RequestBody LocalLog localLog){
return R.data(logLocalService.getSystemLogList(localLog.getLogPath()));
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java
deleted file mode 100644
index 49c0e57..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.vci.ubcs.log.controller;
-
-import com.vci.ubcs.log.service.ILogErrorService;
-import com.vci.ubcs.log.service.ILogSystemService;
-import com.vci.ubcs.log.entity.SystemLog;
-import lombok.AllArgsConstructor;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:37
- */
-@NonDS
-@RestController
-@AllArgsConstructor
-@RequestMapping("/systemLog")
-public class LogSystemController {
-
- private final ILogSystemService logSystemService;
-
- @GetMapping("/lazy-list")
- private R<List<SystemLog>> getSystemLogList(@RequestParam String serviceName){
- return R.data(logSystemService.getSystemLogList(serviceName));
- }
-
-
-
-
-}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
index 616af88..4b613ec 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
@@ -67,4 +67,7 @@
log.setParams(log.getParams().replace("&", "&"));
return R.data(errorLogService.save(log));
}
+
+
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
index 38a03f0..e0d7a25 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
@@ -1,13 +1,12 @@
package com.vci.ubcs.log.service;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;
import java.rmi.ServerException;
import java.util.List;
-import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
@@ -21,7 +20,7 @@
* @param logParentPath
* @return
*/
- List<LocalLog> getSystemLogList(String logParentPath);
+ List<LocalLogVO> getSystemLogList(String logParentPath);
/**
* 涓嬭浇锛屾牴鎹湇鍔″悕鎵�鍦ㄦ枃浠跺悕鍜屾枃浠跺悕涓嬭浇鏂囦欢
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 6af6c3d..e10e6c0 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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.log.entity.LogOperate;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.springblade.core.log.exception.ServiceException;
import java.util.List;
@@ -17,13 +19,13 @@
* @param logOperate
* @return
*/
- boolean saveLogOperate(LogOperate logOperate);
+ boolean saveLogOperate(LogOperate logOperate) throws ServiceException;
/**
* 鏉′欢鏌ヨ鑾峰彇鏃ュ織鍒楄〃
- * @param logOperate
+ * @param bladeQueryObject
* @return
*/
- List<LogOperate> listByCondition(LogOperate logOperate);
+ List<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException;
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java
deleted file mode 100644
index 30d3e30..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.vci.ubcs.log.service;
-
-import com.vci.ubcs.log.entity.SystemLog;
-import com.vci.ubcs.resource.bo.FileObjectBO;
-
-import java.rmi.ServerException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:38
- */
-public interface ILogSystemService {
-
- /**
- * 鏌ョ湅锛屾湰鍦扮郴缁熸棩蹇楀垪琛�
- * @param logParentPath
- * @return
- */
- List<SystemLog> getSystemLogList(String logParentPath);
-
- /**
- * 涓嬭浇锛屾牴鎹湇鍔″悕鎵�鍦ㄦ枃浠跺悕鍜屾枃浠跺悕涓嬭浇鏂囦欢
- * @param condition 鏌ヨ鏉′欢map
- * @return 鏂囦欢鐨勪俊鎭�
- */
- FileObjectBO downloadLogByServiceNameAndFileName(Map<String,String> condition) throws ServerException;
-
- /**
- * 鍒犻櫎锛屾牴鎹湇鍔℃墍鍦ㄦ枃浠跺悕锛屽拰鏃ュ織鏂囦欢鍚嶇О鍒犻櫎
- * @param condition 涓婚敭闆嗗悎
- * @return 鎵ц缁撴灉
- */
- void deleteLogFile(Map<String,String> condition) throws ServerException;
-
-}
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 f8ba775..fe14f86 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
@@ -1,14 +1,12 @@
package com.vci.ubcs.log.service.impl;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.enumpack.ServiceNameRoleEnum;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileUtil;
import com.vci.ubcs.resource.utils.ZipUtil;
-import com.vci.ubcs.resource.vo.FileObjectVO;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.web.util.BeanUtil;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -17,16 +15,13 @@
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -43,7 +38,7 @@
*/
@Service
@Slf4j
-public class LogLocalServiceImpl implements ILogLocalService{
+public class LogLocalServiceImpl implements ILogLocalService, EnvironmentAware {
/**
* 鍚勪釜鏈嶅姟瀛樻斁鐨勭殑鐖惰矾寰�
@@ -62,9 +57,13 @@
*/
private Boolean isWindows = true;
- {
- String os = System.getProperty("os.name").toLowerCase();
- //榛樿灏遍厤缃负windows鐨勶紝濡傛灉涓嶆槸褰撳墠绯荤粺涓嶆槸windows灏遍渶瑕佸鍏惰浆鎹负linux鐨勬枃浠惰矾寰勬牸寮�
+ /**
+ * 鏍规嵁褰撳墠杩愯鐨勭幆澧冿紝瀵归厤缃殑鏃ュ織璺緞鏍煎紡杩涜璋冩暣
+ * @param environment
+ */
+ @Override
+ public void setEnvironment(Environment environment) {
+ String os = environment.getProperty("os.name").toLowerCase();
if (!os.contains("win")) {
this.PARENTPATH = this.PARENTPATH.substring(this.PARENTPATH.lastIndexOf(":") + 1).replace("\\", "/");
this.LOGPATH = this.LOGPATH.replace("\\", "/");
@@ -84,8 +83,8 @@
* @return
*/
//@Override
- public List<LocalLog> getSystemLogList(String logParentPath) {
- List<LocalLog> localLogs = new ArrayList<>();
+ public List<LocalLogVO> getSystemLogList(String logParentPath) {
+ List<LocalLogVO> localLogsVO = new ArrayList<>();
// 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
if(Func.isNotEmpty(logParentPath)){
File file = new File(logParentPath);
@@ -93,7 +92,7 @@
File[] files = file.listFiles();
Arrays.stream(files).forEach(item->{
// 缁勫缓鏃ュ織鏂囦欢瀵硅薄
- LocalLog localLog = new LocalLog();
+ LocalLogVO localLog = new LocalLogVO();
localLog.setLogName(item.getName());
localLog.setLogType(getLogType(item.getName()));
localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
@@ -103,7 +102,7 @@
localLog.setServiceId(serviceId);
localLog.setServiceName(getServiceName(serviceId));
localLog.setHasChildren(false);
- localLogs.add(localLog);
+ localLogsVO.add(localLog);
});
}
}else {
@@ -113,22 +112,24 @@
if(dir.getName().contains("ubcs_")){
String fullPath = dir.getPath() + LOGPATH;
File file = new File(fullPath);
- LocalLog localLog = new LocalLog();
- localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
- localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
- localLog.setLogPath(fullPath);
- String serviceId = getServiceId(file.getPath());
- localLog.setServiceId(serviceId);
- String serviceName = getServiceName(serviceId);
- localLog.setServiceName(serviceName);
- localLog.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setHasChildren(true);
- localLogs.add(localLog);
+ if(file.exists()){
+ LocalLogVO localLogVO = new LocalLogVO();
+ localLogVO.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
+ localLogVO.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
+ localLogVO.setLogPath(fullPath);
+ String serviceId = getServiceId(file.getPath());
+ localLogVO.setServiceId(serviceId);
+ String serviceName = getServiceName(serviceId);
+ localLogVO.setServiceName(serviceName);
+ localLogVO.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLogVO.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLogVO.setHasChildren(true);
+ localLogsVO.add(localLogVO);
+ }
}
});
}
- return localLogs;
+ return localLogsVO;
}
/**
@@ -193,7 +194,8 @@
* @return
*/
private String getServiceName(String serViceId){
- return EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId);
+ // EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId)
+ return ServiceNameRoleEnum.getTextByValue(serViceId);
}
/**
@@ -223,7 +225,7 @@
throw new ServerException("鏈幏鍙栧埌璇ユ棩蹇楄矾寰勶紒");
}
FileObjectBO fileObjectBO = new FileObjectBO();
- String logFullPaths = localLogVO.getLogFullPaths();
+ String logFullPaths = this.convertWindows2Linux(localLogVO.getLogFullPaths());
// 鍒ゆ柇鏄惁鏄埗鐩綍
if(!localLogVO.getHasChildren()){
//鍙笅杞戒竴涓棩蹇楁枃浠�
@@ -281,6 +283,19 @@
}
/**
+ * 涓嬭浇涔嬪墠灏唚indows鐨勮矾寰勬牸寮忚浆鎹负linux
+ * @param fullPath
+ * @return
+ */
+ private String convertWindows2Linux(String fullPath){
+ String os = System.getProperty("os.name").toLowerCase();
+ if (!os.contains("win")) {
+ fullPath = fullPath.replace("\\", "/");
+ }
+ return fullPath;
+ }
+
+ /**
* 鍒犻櫎鏃ュ織鏂囦欢
* @param localLogVO 鏂囦欢鍏ㄨ矾寰勯泦鍚�
* @throws ServerException
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 9c02711..a7d5fd0 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
@@ -6,12 +6,15 @@
import com.vci.ubcs.log.entity.LogOperate;
import com.vci.ubcs.log.mapper.LogOperateMapper;
import com.vci.ubcs.log.service.ILogOperateService;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 鎿嶄綔鏃ュ織绠＄悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠＄悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
@@ -30,7 +33,7 @@
* @return
*/
@Override
- public boolean saveLogOperate(LogOperate logOperate) {
+ public boolean saveLogOperate(LogOperate logOperate)throws ServiceException {
if(Func.isEmpty(logOperate)){
return false;
}
@@ -39,13 +42,17 @@
/**
* 鏉′欢鏌ヨ鑾峰彇鏃ュ織鍒楄〃
- * @param logOperate
+ * @param bladeQueryObject
* @return
*/
@Override
- public List<LogOperate> listByCondition(LogOperate logOperate) {
- QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(logOperate);
- this.list(queryWrapper);
+ public List<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException{
+ Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
+ if(conditionMap.isEmpty() || Func.isBlank(conditionMap.get("logType").toString())){
+ throw new ServiceException("鏃ュ織鏌ヨ蹇呬紶鍙傛暟銆愭棩蹇楃被鍨嬨�戜笉鑳戒负绌猴紒");
+ }
+ // map瀵硅薄杞崲涓烘煡璇㈠璞�
+ QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(bladeQueryObject.getConditionMap(),LogOperate.class);
return this.list(queryWrapper);
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java
deleted file mode 100644
index 6f6f4ea..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.vci.ubcs.log.service.impl;
-
-import com.vci.ubcs.log.service.ILogSystemService;
-import com.vci.ubcs.log.entity.SystemLog;
-import org.springblade.core.log.exception.ServiceException;
-import com.vci.ubcs.omd.cache.EnumCache;
-import com.vci.ubcs.omd.enums.EnumEnum;
-import com.vci.ubcs.resource.bo.FileObjectBO;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.stereotype.Service;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.rmi.ServerException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:39
- */
-@Service
-public class LogSystemServiceImpl implements ILogSystemService{
-
- /**
- * 鍚勪釜鏈嶅姟瀛樻斁鐨勭殑鐖惰矾寰�
- */
- private final String parentPath = "/data1/ubcs/ubcs-server";
-
- /**
- * 鍚勪釜鏈嶅姟鐨勬棩蹇楀叿浣撶殑鐩綍璺緞
- */
- //@Value("#{'${ip-whitelist.ip}'.split(',')}")
- private List<String> serviceDirNames = new ArrayList<>(Arrays.asList("/ubcs_code/target/log","/ubcs_omd/target/log","/ubcs_system/target/log"));
-
- /**
- * 鑾峰彇鏈湴鏃ュ織鍒楄〃
- * @param logParentPath
- * @return
- */
- @Override
- public List<SystemLog> getSystemLogList(String logParentPath) {
- List<SystemLog> systemLogs = new ArrayList<>();
- // 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
- if(Func.isNotEmpty(logParentPath)){
- File file = new File(logParentPath);
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- Arrays.stream(files).forEach(item->{
- // 缁勫缓鏃ュ織鏂囦欢瀵硅薄
- SystemLog systemLog = new SystemLog();
- systemLog.setLogName(item.getName());
- systemLog.setLogType(getLogType(item.getName()));
- systemLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
- systemLog.setLastmodifier(getLastModifiedOrCreatTime(true,logParentPath));
- systemLog.setLogPath(logParentPath);
- String serviceId = getServiceId(logParentPath);
- systemLog.setServiceId(serviceId);
- systemLog.setServiceName(getServiceName(serviceId));
- systemLogs.add(systemLog);
- });
- }
- }else {
- serviceDirNames.stream().forEach(serviceDirName->{
- File file = new File(parentPath+serviceDirName);
- SystemLog systemLog = new SystemLog();
- systemLog.setLastmodifier(getLastModifiedOrCreatTime(true,parentPath+serviceDirName));
- systemLog.setCreateTime(getLastModifiedOrCreatTime(false,parentPath+serviceDirName));
- systemLog.setLogPath(parentPath+serviceDirName);
- String serviceId = getServiceId(logParentPath);
- systemLog.setServiceId(serviceId);
- systemLog.setServiceName(getServiceName(serviceId));
- systemLogs.add(systemLog);
- });
- }
- return systemLogs;
- }
-
- /**
- * 鑾峰彇鏂囦欢鏈�鍚庝慨鏀规垨鑰呭垱寤烘椂闂�
- * @param isModifier
- * @return
- */
- private String getLastModifiedOrCreatTime(boolean isModifier,String pathStr) {
- Path path = FileSystems.getDefault().getPath(pathStr);
- String date = "";
- try {
- BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- // 鏄幏鍙栨渶鍚庝慨鏀规椂闂�
- if(isModifier){
- date = dateFormat.format(new Date(attr.lastModifiedTime().toMillis()));
- }else {
- date = dateFormat.format(new Date(attr.creationTime().toMillis()));
- }
- } catch (IOException e) {
- throw new ServiceException("Error reading file date attributes: " + e.getMessage());
- }
- return date;
- }
-
- /**
- * 鑾峰彇鏃ュ織绫诲瀷
- * @param fileName
- * @return
- */
- private String getLogType(String fileName){
- //鍒ゆ柇鏃ュ織鐨勭殑绫诲瀷
- if (fileName.contains("error")) {
- return "Error";
- } else if (fileName.contains("info")) {
- return "Info";
- } else if (fileName.contains("warning")) {
- return "Warning";
- } else {
- return "Unknown";
- }
- }
-
- /**
- * 鑾峰彇鏈嶅姟ID
- * @param servciePath
- * @return
- */
- private String getServiceId(String servciePath){
- String[] parts = servciePath.split("/");
- String extractedString = parts[parts.length - 2];
- return extractedString;
- }
-
- /**
- * 鑾峰彇鏈嶅姟鍚嶇О
- * @param serViceId
- * @return
- */
- private String getServiceName(String serViceId){
- return EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId);
- }
-
- /**
- * 涓嬭浇鏃ュ織鏂囦欢
- * @param condition 鏌ヨ鏉′欢map
- * @return
- * @throws ServerException
- */
- @Override
- public FileObjectBO downloadLogByServiceNameAndFileName(Map<String, String> condition) throws ServerException {
- return null;
- }
-
- /**
- * 鍒犻櫎鏃ュ織鏂囦欢
- * @param condition 涓婚敭闆嗗悎
- * @throws ServerException
- */
- @Override
- public void deleteLogFile(Map<String, String> condition) throws ServerException {
-
- }
-
-}
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 4e0bb26..383a2aa 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
@@ -144,7 +144,6 @@
baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
if(revisionseq!=null){
-
baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
}
@@ -157,7 +156,15 @@
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
baseModel.setLastModifier(AuthUtil.getUser().getAccount());
-
+ baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
+ baseModel.setName(dataMap.getOrDefault("NAME",""));
+ baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
+ baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
+ baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
+ Object secretgrade=dataMap.get("SECRETGRADE");
+ if(secretgrade!=null){
+ baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
+ }
}catch (VciBaseException e){
e.printStackTrace();
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index dd02c8d..c596095 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -873,13 +873,13 @@
//涓嶅拷鐣ュぇ灏忓啓銆佷笉鍘荤┖銆佷笉蹇界暐鍏ㄥ崐瑙�
temp = "%s";
}
- queryKey = String.format(temp, "t." + attrId);
+ queryKey = String.format(temp, "nvl("+ "t." + attrId +",'/')");
queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
conditionMap.put(queryKey, queryValue);
} else {
if(StringUtils.isNotBlank(value)) {
//涓虹┖鐨勬椂鍊欎笉浠ｈ〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
- conditionMap.put("t." + attrId, "'" + value + "'");
+ conditionMap.put("nvl("+ "t." + attrId+",'/')", "'" + value + "'");
}else{
conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL);
}
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 c168c16..87cfaee 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
@@ -2102,50 +2102,54 @@
Map<String, List<BaseModel>> indexTodataMap = keyResultVO.getIndexTODataMap();
cboList.stream().forEach(cbo -> {
String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
+ String msg = errorKeyMap.get(rowIndex);
if (indexTodataMap.containsKey(rowIndex)) {
String oid = cbo.getOid();
String sourceOid = oid;
String code = "";
- String groupCode="";
String errorid = "201";
if(codeOidToSystemOidMap.containsKey(oid)){
sourceOid=codeOidToSystemOidMap.get(oid);
}
List<BaseModel> newCboList = indexTodataMap.get(rowIndex);
if (!CollectionUtils.isEmpty(newCboList)) {
- BaseModel newCbo= newCboList.get(0);
- String lcstatus =newCbo.getLcStatus();
- String newOid =newCbo.getOid();
- Date ts =newCbo.getTs();
- code = StringUtils.isBlank(newCbo.getId())?"":newCbo.getId();
- groupCode=newCbo.getData().getOrDefault("GROUPCODE","");
- String lastmodifier=newCbo.getLastModifier();
- if (lcstatus!=null&&!lcstatus.equals(CodeDefaultLC.RELEASED.getValue())) {
- newCbo.setOid(newOid);
- newCbo.setLastModifier(lastmodifier);
- /*if(isCodeOrGroupCode) {
- newCbo.setId(code);
- }else{
- newCbo.getData().put("groupcode",groupCode);
- }*/
- newCbo.setTs(ts);
- cbo.setLastModifier(cbo.getLastModifier());
- editBoList.add(newCbo);
- }
- String mes = errorKeyMap.get(rowIndex);
- XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
- if(isCodeOrGroupCode) {
- if(StringUtils.isBlank(groupCode)){
- errorid="1";
- mes+="锛涚敵璇风殑缂栫爜绫诲瀷涓洪泦鍥㈢爜锛岀瓑寰呴泦鍥㈢紪鐮佽祴鍊�";
+ //澶勭悊鍏抽敭灞炴�ф煡鍑哄鏉＄殑璇濓紝鏍规嵁闆嗘垚璋冪敤鐨勫綋鍓嶅垎绫讳唬鍙峰彇褰撳墠鍒嗙被鐨勭爜鍊笺��
+ Map<String/**缂栫爜**/, BaseModel/**閲嶅缂栫爜鏁版嵁**/> classOidTOBaseModelMap = new HashMap<>();
+ newCboList.stream().forEach(baseModel->{
+ String codeclsfid=baseModel.getData().get(CODE_CLASSIFY_OID_FIELD.toUpperCase(Locale.ROOT));
+ classOidTOBaseModelMap.put(codeclsfid,baseModel);
+ });
+ String codeclsfid= classifyFullInfo.getCurrentClassifyVO().getOid();
+ if(classOidTOBaseModelMap.containsKey(codeclsfid)){
+ BaseModel newCbo= classOidTOBaseModelMap.get(codeclsfid);
+ String lcstatus =newCbo.getLcStatus();
+ String newOid =newCbo.getOid();
+ Date ts =newCbo.getTs();
+ code = StringUtils.isBlank(newCbo.getId())?"":newCbo.getId();
+ if(isCodeOrGroupCode) {
+ code=newCbo.getData().getOrDefault("GROUPCODE","");
+ if(StringUtils.isBlank(code)){
+ errorid="1";
+ msg="锛涚敵璇风殑缂栫爜绫诲瀷涓洪泦鍥㈢爜锛岀瓑寰呴泦鍥㈢紪鐮佽祴鍊�";
+ }
}
- resultDataObjectDetailDO.setCode(groupCode);
+ String lastmodifier=newCbo.getLastModifier();
+ if (lcstatus!=null&&!lcstatus.equals(CodeDefaultLC.RELEASED.getValue())) {
+ newCbo.setOid(newOid);
+ newCbo.setLastModifier(lastmodifier);
+ newCbo.setTs(ts);
+ cbo.setLastModifier(cbo.getLastModifier());
+ editBoList.add(newCbo);
+ }
}else{
- resultDataObjectDetailDO.setCode(code);
+ errorid="205";
+ msg+="锛涚紪鐮佸垯灞炰簬鍏朵粬鍒嗙被銆�";
}
+ XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+ resultDataObjectDetailDO.setCode(code);
resultDataObjectDetailDO.setId(sourceOid);
resultDataObjectDetailDO.setErrorid(errorid);
- resultDataObjectDetailDO.setMsg(mes);
+ resultDataObjectDetailDO.setMsg(msg);
resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
}
@@ -3904,6 +3908,7 @@
newDataList.stream().forEach(stringStringMap -> {
BaseModel baseModel=new BaseModel();
DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel);
+ baseModel.setData(stringStringMap);
newCboList.add(baseModel);
});
// 娣诲姞閿欒鍊�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 3e1bc24..4014bcf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -104,7 +104,6 @@
// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
){
//鏄巻鍙叉暟鎹鍏�
- //鍘嗗彶鏁版嵁鎵ц鐨勬椂鍊欙紝杩欎釜绯荤粺浼氬緢鍗�
//涓昏鏄负浜嗗綍鍏ユ渶澶ф祦姘村彿鍜宎llcode
//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
@@ -419,7 +418,6 @@
allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
s.setLcStatus(statusMap.get(s.getOid()));
});
-
//閫氳繃ID鏉ヨ繘琛屽幓閲�
List<CodeAllCode> distinctCodeAllCOdes = allCodeDOList.stream().collect(Collectors
@@ -772,20 +770,20 @@
/**
* 鎷兼帴鍓嶅悗缂�
- * @param secVO
- * @param secValue
+ * @param secVO 鐮佹
+ * @param secValue 鐮佸��
* @return
*/
private String joinPreffixAndSuffix(CodeBasicSecVO secVO, String secValue){
StringBuilder joinSecValue = new StringBuilder();
// 鎷兼帴鍓嶇紑
- if (Func.isNotEmpty(secVO.getPrefixCode())) {
+ if (Func.isNotEmpty(secVO.getPrefixCode()) && Func.isNotEmpty(secValue)) {
joinSecValue = joinSecValue.append(secVO.getPrefixCode());
}
// 鍦ㄤ腑闂存嫾鎺ュ��
joinSecValue.append(secValue);
// 鎷兼帴鍚庣紑
- if(Func.isNotEmpty(secVO.getSuffixCode())){
+ if(Func.isNotEmpty(secVO.getSuffixCode()) && Func.isNotEmpty(secValue)){
joinSecValue = joinSecValue.append(secVO.getSuffixCode());
}
return joinSecValue.toString();
--
Gitblit v1.9.3