From 308359fcfb427f08c745880bf63353eb00dd8219 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 08 六月 2023 18:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 44 ----------------------
product-server-web/pom.xml | 15 +++++++
home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java | 24 ++++++++----
pom.xml | 12 +++++-
product-server-web/src/main/resources/application-dev.properties | 9 ++--
5 files changed, 46 insertions(+), 58 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
index 3d9f2bc..2129ace 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/AdvanceNoticeService.java
@@ -17,6 +17,8 @@
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormat;
+import java.text.Format;
import java.text.ParseException;
/**
@@ -86,13 +88,19 @@
@Transactional
public void addTypeSize(FieldSetEntity fs) throws BaseException {
String tableName = fs.getTableName();
- String year = fs.getString("no01");
- DataTableEntity dataTableEntity = baseDao.listTable("SELECT IFNULL(MAX(no02),0) no02 FROM "+tableName+" where no01=?", new String[]{year});
- String no02 = String.valueOf(Integer.parseInt(dataTableEntity.getFieldSetEntity(0).getString("no02")) + 1);
- while (no02.length() < 3){
- no02 = "0" + no02;
- }
- fs.setValue("no02",no02);
- baseDao.update(fs);
+ String yearNo = fs.getString("no01");
+
+ //鏌ヨ鍚屽瓧鏁版嵁涓渶澶х殑鍙�
+ FieldSetEntity fseMax =baseDao.getFieldSetEntityBySQL("SELECT IFNULL(MAX(no02),0)+1 no02 FROM "+tableName+" WHERE no01=?", new Object[] {yearNo}, false);
+ if (fseMax!=null) {
+ Integer maxNo = fseMax.getInteger("no02");
+
+ //鏍煎紡鍖栧彿
+ Format format = new DecimalFormat("000");
+ String finalNo= format.format(maxNo);
+
+ //淇敼鏁版嵁
+ baseDao.executeUpdate("UPDATE "+ tableName +" SET no02 =? WHERE uuid=?", new Object[] {finalNo, fs.getUUID()});
+ }
}
}
diff --git a/home-server-admin/src/main/java/com/home/xining/service/FlowEndCreateSerialNumber.java b/home-server-admin/src/main/java/com/home/xining/service/FlowEndCreateSerialNumber.java
deleted file mode 100644
index f2398d4..0000000
--- a/home-server-admin/src/main/java/com/home/xining/service/FlowEndCreateSerialNumber.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.home.xining.service;
-
-import java.text.DecimalFormat;
-import java.text.Format;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.product.core.dao.BaseDao;
-import com.product.core.entity.FieldSetEntity;
-import com.product.core.service.support.AbstractBaseService;
-
-/**
- * 娴佺▼缁撴潫鍓嶅鐞嗗櫒璋冪敤锛岃嚜鍔ㄧ粰琛屾斂澶勭綒鐩稿叧涓氬姟娣诲姞瀛楀彿
- * @author 86151
- *
- */
-@Component
-public class FlowEndCreateSerialNumber extends AbstractBaseService{
-
- @Autowired
- BaseDao baseDao;
-
- /**
- * 鑷姩鐢熸垚瀛楀彿
- * @param tableName 琛ㄥ悕
- * @param serviceUUID 涓氬姟UUID
- * @param yearNo 瀹佹埧瀛�
- */
- public synchronized void autoCreateSerialNumber(FieldSetEntity fse, String serviceUUID, String yearNo) {
- //鏌ヨ鍚屽瓧鏁版嵁涓渶澶х殑鍙�
- FieldSetEntity fseMax =baseDao.getFieldSetEntityBySQL("SELECT IFNULL(MAX(no02),0)+1 no02 FROM "+fse.getTableName()+" WHERE no01=?", new Object[] {yearNo}, false);
- if (fseMax!=null) {
- Integer maxNo = fseMax.getInteger("no02");
-
- //鏍煎紡鍖栧彿
- Format format = new DecimalFormat("000");
- String finalNo= format.format(maxNo);
-
- //淇敼鏁版嵁
- baseDao.executeUpdate("UPDATE "+ fse.getTableName() +" SET no02 =? WHERE uuid=?", new Object[] {finalNo, serviceUUID});
- }
- }
-}
diff --git a/pom.xml b/pom.xml
index 2319de1..0b803ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,6 @@
<twelvemonkeys.version>3.4.1</twelvemonkeys.version>
<poi.version>3.16</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version>
- <mybatis.version>3.4.6</mybatis.version>
- <mybatis-spring.version>1.3.2</mybatis-spring.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.version>2.0.0-release</project.build.version>
@@ -788,5 +786,15 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource</groupId>
+ <artifactId>sigar</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>2.2.6</version>
+ </dependency>
</dependencies>
</project>
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 8032b07..94b6a3d 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -164,6 +164,21 @@
<groupId>com.lx</groupId>
<artifactId>product-server-xining</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>cells-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>slides-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>words-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/product-server-web/src/main/resources/application-dev.properties b/product-server-web/src/main/resources/application-dev.properties
index a3db447..b0e7100 100644
--- a/product-server-web/src/main/resources/application-dev.properties
+++ b/product-server-web/src/main/resources/application-dev.properties
@@ -79,7 +79,7 @@
data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://localhost:3306/product_db_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://192.168.0.200:3306/product_db_xn2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://222.209.31.230:9092/product_db_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://64.145.32.26:3306/product_db_picc?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://222.209.52.59:9092/lx_product_db-dev?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
@@ -203,15 +203,16 @@
ftp.server.password=082600..
ftp.server.encode=utf-8
# \u5728\u7ebf\u9884\u89c8\u8f6c\u6362\u670d\u52a1
-open.office.home=D:/worksoft/openoffice/home
+open.office.isEnable=false
+open.office.home=E:/openoffice
open.office.port.info=8100,8101
# \u5355\u4e2a\u4efb\u52a1\u6267\u884c\u8d85\u65f6\u65f6\u95f4\uff0c\u5355\u4f4d\uff1a\u6beb\u79d2
open.office.task.timeout=300000
# \u5355\u4e2a\u4efb\u52a1\u6392\u961f\u8d85\u65f6\u65f6\u95f4\uff0c\u5355\u4f4d\uff1a\u6beb\u79d2
open.office.queue.timeout=86400000
-# \u672C\u5730\u4E34\u65F6\u8DEF\u5F84
+# \u672c\u5730\u4e34\u65f6\u8def\u5f84
temp.dir=./attachment/temp
-# \u672C\u5730\u5B58\u653E\u8DEF\u5F84
+# \u672c\u5730\u5b58\u653e\u8def\u5f84
local.dir=./attachment/upload
# \u80fd\u591f\u8f6c\u6362\u7684\u683c\u5f0f
--
Gitblit v1.9.2