From f22002d5aaa03e54b3a8ffdb2a0e56e4d8ab473b Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期三, 07 六月 2023 19:46:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- product-server-web/src/main/java/com/product/Application.java | 5 +++++ home-server-admin/src/main/java/com/home/xining/service/FlowEndCreateSerialNumber.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) 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 new file mode 100644 index 0000000..f2398d4 --- /dev/null +++ b/home-server-admin/src/main/java/com/home/xining/service/FlowEndCreateSerialNumber.java @@ -0,0 +1,44 @@ +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/product-server-web/src/main/java/com/product/Application.java b/product-server-web/src/main/java/com/product/Application.java index b103b59..b79b3b9 100644 --- a/product-server-web/src/main/java/com/product/Application.java +++ b/product-server-web/src/main/java/com/product/Application.java @@ -2,6 +2,8 @@ import com.product.core.spring.context.SpringBeanUtil; import com.product.customer.service.CreateSignatureFile; +import com.product.file.util.PdfConcurrenceUtil; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -40,6 +42,7 @@ RegistValidate.getInstance().registValidateParameter(); boolean connFlat = DataSourceManager.getInstance().initClientConnectionPool(); InitialLoad.runInitialization(); + PdfConcurrenceUtil.init(); String rootPath = ResourceUtils.getURL("classpath:").getPath(); Global.setPropertyValue("root.path", rootPath); Global.setPropertyValue("jdk.home", System.getProperties().getProperty("java.home")); @@ -53,6 +56,8 @@ } } catch (Exception e) { e.printStackTrace(); + SpringMVCContextHolder.getSystemLogger().error("System startup failed:"+e.getMessage()); + SpringMVCContextHolder.getSystemLogger().error("System startup failed, Please contact the administrator!"); } } } -- Gitblit v1.9.2