From cd5a0765ea6a842852e460cc1bde6ad2b2fd6e93 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 22:23:55 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java | 1
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java | 12 ++++++
Source/UBCS/ubcs-ops/ubcs-log/pom.xml | 6 +++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java | 18 +++++++++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java | 21 ++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 6 ---
6 files changed, 56 insertions(+), 8 deletions(-)
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
index 2452f3a..70fd153 100644
--- 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
@@ -1,5 +1,7 @@
package com.vci.ubcs.log.entity;
+import java.util.Date;
+
/**
* @author ludc
* @date 2023/10/31 15:43
@@ -31,4 +33,14 @@
*/
private String logType;
+ /**
+ * 鏃ュ織鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ /**
+ * 鏃ュ織鐨勬渶鍚庝慨鏀规椂闂�
+ */
+ private Date lastmodifier;
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
index 767979f..fe4d4a3 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -44,6 +44,12 @@
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-resource-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
index 1d4ed75..e713ec1 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
@@ -1,8 +1,13 @@
package com.vci.ubcs.core.log.service;
import com.vci.ubcs.log.entity.SystemLog;
+import com.vci.ubcs.resource.bo.FileObjectBO;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import java.rmi.ServerException;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
@@ -12,8 +17,22 @@
public interface ILogSystemService {
/**
- * 鑾峰彇鏈湴鏃ュ織鍒楄〃
+ * 鏌ョ湅锛屾湰鍦扮郴缁熸棩蹇楀垪琛�
*/
List<SystemLog> getSystemLogList();
+ /**
+ * 涓嬭浇锛屾牴鎹湇鍔″悕鎵�鍦ㄦ枃浠跺悕鍜屾枃浠跺悕涓嬭浇鏂囦欢
+ * @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/core/log/service/impl/LogSystemServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
index 90dbe91..135554e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
@@ -2,16 +2,24 @@
import com.vci.ubcs.core.log.service.ILogSystemService;
import com.vci.ubcs.log.entity.SystemLog;
+import com.vci.ubcs.resource.bo.FileObjectBO;
+import org.springframework.stereotype.Service;
+import java.rmi.ServerException;
import java.util.List;
+import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
* @author ludc
* @date 2023/10/31 15:39
*/
+@Service
public class LogSystemServiceImpl implements ILogSystemService {
+ /**
+ * 鑾峰彇鏈湴鏃ュ織鍒楄〃
+ */
@Override
public List<SystemLog> getSystemLogList() {
@@ -19,5 +27,15 @@
return null;
}
+ @Override
+ public FileObjectBO downloadLogByServiceNameAndFileName(Map<String, String> condition) throws ServerException {
+ return null;
+ }
+
+ @Override
+ public void deleteLogFile(Map<String, String> condition) throws ServerException {
+
+ }
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
index eecdaa7..b81f862 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
@@ -44,7 +44,6 @@
@Autowired
private IFileService fileService;
-
/**
* 鏍规嵁鏂囦欢涓婚敭涓嬭浇鏂囦欢
* @param fileOids 鏂囦欢鐨勪富閿�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 2878287..e330d07 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -537,12 +537,6 @@
VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
tableName
);
- // 璇佹槑鏄煡椤跺眰鑺傜偣
- if(StringUtils.isNotBlank(id)){
- // 鏈夋椂鍊欐煡璇otal杩囨參浼氬鑷存棤娉曞姞杞斤紝鐜板湪淇敼鏌ヨ鎬绘暟涓鸿繛琛ㄦ煡璇絾鏄氨瀵艰嚧椤跺眰鑺傜偣鏃犳硶鏌ヨ鍑烘�绘暟
- String total = commonsMapper.selectCountByTableName(tableName);
- doList.get(0).setTotal(total);
- }
}else{
// 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
doList =codeClassifyMapper.selectCodeClassifyVOByTree(
--
Gitblit v1.9.3