From 15fd75c395784afa2cc3e805774e2c8cbc5a3eb7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 06 五月 2023 13:50:39 +0800
Subject: [PATCH] 部署打包时jar中没有主清单属性问题
---
Source/UBCS/pom.xml | 1 +
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 4 ++--
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java | 23 +++++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 8 +++-----
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java | 4 ++++
Source/UBCS/ubcs-common/pom.xml | 6 ++++++
Source/UBCS/ubcs-service/ubcs-ddl/pom.xml | 1 +
7 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 2f05c8e..f8735c7 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -19,6 +19,7 @@
<spring.boot.version>2.7.1</spring.boot.version>
<spring.cloud.version>2021.0.3</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
+ <maven.plugin.version>3.8.1</maven.plugin.version>
<!-- 鎺ㄨ崘浣跨敤Harbor -->
<docker.registry.url>192.168.0.157</docker.registry.url>
diff --git a/Source/UBCS/ubcs-common/pom.xml b/Source/UBCS/ubcs-common/pom.xml
index 2be5184..7e63c7b 100644
--- a/Source/UBCS/ubcs-common/pom.xml
+++ b/Source/UBCS/ubcs-common/pom.xml
@@ -28,6 +28,12 @@
<artifactId>blade-core-auto</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-core</artifactId>
+ <version>3.5.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index 67eb1ab..38a5faf 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -40,8 +40,8 @@
/**
* nacos dev 鍦板潃
*/
- String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- //String NACOS_DEV_ADDR = "192.168.93.185:38848";
+ //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
+ String NACOS_DEV_ADDR = "192.168.93.185:38848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
index 2ded4e0..6b81915 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
@@ -23,4 +23,8 @@
*/
public class CommonUtil {
+
+
+
+
}
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java
new file mode 100644
index 0000000..4b0ef32
--- /dev/null
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/PageDO2PageVO.java
@@ -0,0 +1,23 @@
+package com.vci.ubcs.common.utils;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+public class PageDO2PageVO {
+
+ /**
+ * pagedo杞负pagevo锛岄噷闈㈢殑鍒嗛〉鍙傛暟闇�瑕佽浆鎹�
+ * @param doList pageDO瀵硅薄
+ * @param pageList pageVO瀵硅薄
+ * @param <T> DO瀵硅薄绫诲瀷
+ * @param <R> VO瀵硅薄绫诲瀷
+ * @return
+ */
+ public static <T,R> IPage<R> pageDO2PageVO(IPage<T> doList,IPage<R> pageList){
+ pageList.setTotal(doList.getTotal());
+ pageList.setSize(doList.getSize());
+ pageList.setCurrent(doList.getCurrent());
+ pageList.setPages(doList.getPages());
+ return pageList;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index fca0d69..f8f8a53 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -16,6 +16,7 @@
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -60,7 +61,6 @@
@Autowired
private RevisionModelUtil revisionModelUtil;
-
/**
* 鏌ヨ鎵�鏈夌殑鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
* @param conditionMap 鏌ヨ鏉′欢
@@ -87,10 +87,8 @@
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
- pageList.setTotal(doList.getTotal());
- pageList.setSize(doList.getSize());
- pageList.setCurrent(doList.getCurrent());
- pageList.setPages(doList.getPages());
+ //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
+ pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
}
return pageList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml b/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
index 997e105..498158c 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
@@ -50,4 +50,5 @@
</dependency>
</dependencies>
+
</project>
--
Gitblit v1.9.3