From 1c30ab054c3d5c3585325d6123be7aaf84eeae20 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 08 一月 2025 10:35:50 +0800
Subject: [PATCH] 20250108
---
ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java | 22 ++++
ltkj-admin/src/main/resources/application-linux-dev.yaml | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 1
3 files changed, 275 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/resources/application-linux-dev.yaml b/ltkj-admin/src/main/resources/application-linux-dev.yaml
new file mode 100644
index 0000000..90c9bbd
--- /dev/null
+++ b/ltkj-admin/src/main/resources/application-linux-dev.yaml
@@ -0,0 +1,252 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ltkj:
+ # 鍚嶇О
+ name: ltkj
+ # 鐗堟湰
+ version: 1.0.1
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2022
+ # 瀹炰緥婕旂ず寮�鍏�
+ demoEnabled: true
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
+ # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
+ #profile: D:/ltkj/uploadPath
+ # profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+ profile: http://192.168.0.5:5502/uploadPath
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 5011
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+#logging:
+# level:
+# com.ltkj: debug
+# org.springframework: warn
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 2GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: true
+ cache:
+ type: redis
+
+ # redis 閰嶇疆
+ # redis:
+ # # 鍦板潃
+ ## host: 101.42.27.146
+ # host: localhost
+ # # 绔彛锛岄粯璁や负6379
+ # port: 6379
+ # # 鏁版嵁搴撶储寮�
+ # database: 0
+ # # 瀵嗙爜
+ ## password: 654321
+ # password: 123456
+ # # 杩炴帴瓒呮椂鏃堕棿
+ # timeout: 120s
+ # lettuce:
+ # pool:
+ # # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ # min-idle: 0
+ # # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ # max-idle: 8
+ # # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ # max-active: 8
+ # # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ # max-wait: -1ms
+ # 閭欢
+ mail:
+ # from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
+ from: 1138758025@qq.com
+ # 閭欢鏈嶅姟鍦板潃
+ host: smtp.qq.com
+ # 鐢ㄦ埛鍚�
+ username: 1138758025@qq.com
+ # 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
+ password: lwsbmlbqgpaqfgdb
+ # QQ閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ port: 465
+ properties:
+ mail:
+ smtp:
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ ssl:
+ trust: smtp.qq.com
+ # 鏄惁闇�瑕佺敤鎴疯璇�
+ auth: true
+ starttls:
+ # 鍚敤TLS鍔犲瘑
+ enable: true
+ required: true
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: true
+ url-pattern: /druid/*
+ login-username: 10001
+ login-password: admin123
+ reset-enable: true
+ allow:
+ filters: stat,wall,log4j # 鍚敤鏃ュ織鍜岀洃鎺ц繃婊ゅ櫒
+ stat:
+ mergeSql: true # 鍚堝苟SQL缁熻淇℃伅
+ slowSqlMillis: 3000 # 閰嶇疆 SQL 鎱㈡煡璇㈤槇鍊硷紝鍗曚綅鏄绉掞紝3绉掑嵆 3000ms
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: xaltjdkjyxgs_sjh&1987
+
+ secret_key: ltkj_xaltjdkjsjh
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 180
+ # 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
+ soloLogin: true
+ #鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
+ secret_key_login: true
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚�
+ typeAliasesPackage: com.ltkj.**.domain
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ db-config:
+ logic-not-delete-value: 0
+ logic-delete-value: 1
+ update-strategy: not_null
+
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice,/system/package
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
+path:
+ filePath: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/Tjreport
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
+
+# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
+photoPath: /ltkj/uploadPath/
+# nginx鍥剧墖鏈嶅姟鍣�
+#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+photoServer: http://192.168.0.5:5502/uploadPath/
+
+
+
+# 寰俊灏忕▼搴廰ppid secret
+xcx:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msgDataFormat: JSON
+ token: token # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨則oken
+ aesKey: aesKey # 寰俊灏忕▼搴忔秷鎭湇鍔″櫒閰嶇疆鐨凟ncodingAESKey
+# 寮�鍙戣�呭簲璇ヨ缃垚鑷繁鐨剋x鐩稿叧淇℃伅
+wx:
+ # 灏忕▼搴�
+ miniapp:
+ appid: wx40a545f1a8eb1d9d
+ secret: c86c1ff7f91c16380111878e9a259237
+ msg-data-format: XML
+ pay:
+ #appid
+ app-id: wx40a545f1a8eb1d9d
+ mch-id: 1642930999 #鍟嗘埛鍙�
+ mch-key: Xianlutaikeji666888999shijihongL #瀵嗛挜
+ #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
+ key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
+ # pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ # pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+
+#绉湪鎶ヨ〃璁块棶鍦板潃
+jimu:
+ # path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+ # path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+ path: http://192.168.0.5:5000/ltkj-admin
+# path: http://10.168.0.9:5011
+# path: http://192.168.0.105:5011
+# path: http://192.168.1.113:5011
+
+
+jeecg :
+ jmreport:
+ # 鎵撳嵃绾稿紶閰嶇疆 title鎻忚堪 size瀹介珮
+ printPaper:
+ - title: 灏忕エ鎵撳嵃
+ size:
+ - 40
+ - 60
+# ip = 101.42.27.146
+# prot = 3306
+# name = ltkjpeis10
+# username = root
+# password = Root_ltkj123
+config:
+ properties: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkjprojectconf/gspljcxyyconfig.properties
+ path: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkjprojectconf
diff --git a/ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java b/ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java
index f681ca0..5d88fd1 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java
@@ -1,5 +1,6 @@
package com.ltkj.common.utils;
+import cn.hutool.core.util.StrUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
@@ -17,6 +18,7 @@
public class IdUtils {
private static final String LIS_LAST_ID_KEY = "id:generate:lis:id";
+ private static final String LIS_LAST_ID_INCR_KEY = "id:generate:lis:id:incr";
private static final String LIS_CURRENT_DATE_KEY = "id:generate:lis:currentDate";
// private static final UidGenerator uidGenerator = new DefaultUidGenerator(); // 浣跨敤榛樿鐨凷nowflake鐢熸垚鍣�
@@ -41,6 +43,26 @@
return String.format(prefix+"%s%05d", yyMMdd, lastId);
}
+ /**
+ * 鐢熸垚鏃犻檺閫掑鏉＄爜鍙�
+ * @param prefix
+ * @return
+ */
+ public synchronized String generateLisNextId(String prefix){
+ String lastIdStr = stringRedisTemplate.opsForValue().get(LIS_LAST_ID_INCR_KEY);
+ int current;
+ if (StrUtil.isBlank(lastIdStr)) {
+ current = 1;
+ }else {
+ current = Integer.parseInt(lastIdStr);
+ }
+ int numberLength = String.valueOf(99999).length();
+ String result = prefix + String.format("%0" + numberLength + "d", current);
+ current++;
+ stringRedisTemplate.opsForValue().set(LIS_LAST_ID_INCR_KEY,String.valueOf(current));
+ return result;
+ }
+
//鐢熸垚浣撴鍙风敤
private static long lastTimestamp = -1;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index 45806dc..d177ce4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -291,6 +291,7 @@
.append("proStandard", getProStandard())
.append("proType", getProType())
.append("ischeck", getIscheck())
+ .append("specimenType", getSpecimenType())
.toString();
}
}
--
Gitblit v1.8.0