From 5978bf12f908c76e18dd229293bdedd729e1183c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 31 七月 2024 14:38:39 +0800
Subject: [PATCH] zjh 2024/07/31-1
---
/dev/null | 242 ------------------------------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 34 ++++--
ltkj-admin/src/main/resources/application.yml | 3
4 files changed, 23 insertions(+), 259 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index d85acb7..88568db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -203,7 +203,7 @@
}
}
- @Transactional(propagation = Propagation.REQUIRES_NEW)
+// @Transactional
public AjaxResult getHISDataNew(String type, Map<String, Object> params){
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
@@ -375,6 +375,7 @@
* @param jsonObject
* @throws SQLException
*/
+ @Transactional
private void insertDataNew(Connection connection, JSONObject jsonObject,HisApiConfig hisApiConfig,String paramsJson) throws SQLException {
List<String> primaryKesList = Arrays.stream(hisApiConfig.getPrimaryKeys().split(",")).map(String::toLowerCase).collect(Collectors.toList());
StringBuilder deleteSqlBuilder = new StringBuilder();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index f2e774a..ab97ccf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1402,7 +1402,7 @@
* @param tjNumber
* @return
*/
- @Transactional
+// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1446,23 +1446,12 @@
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
if (sfsf > 0){
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId,tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ extracted(tjOrder, tjFlowingWater);
}else {
log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
@@ -1559,6 +1548,23 @@
return AjaxResult.error();
}
+ @Transactional
+ private void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ }
+
/**
* 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
*
diff --git a/ltkj-admin/src/main/resources/application-xiaochengxu.yml b/ltkj-admin/src/main/resources/application-xiaochengxu.yml
deleted file mode 100644
index f7d5fa7..0000000
--- a/ltkj-admin/src/main/resources/application-xiaochengxu.yml
+++ /dev/null
@@ -1,242 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-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
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /ltkj-admin
- 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: ehcache
-
- # 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
-
-# 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: D:\Tjreport
- # nginx鍥剧墖鏈嶅姟鍣�
- reportServer: https://ltpeis.xaltjdkj.cn:5516/
-
-
-# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: D:\AppPhoto\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://127.0.0.1:5011/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: D:\ltkjprojectconf\config.properties
- path: D:\ltkjprojectconf
\ No newline at end of file
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 967aa1c..074b323 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -1,8 +1,7 @@
# Spring閰嶇疆
#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
-#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�
+#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤)
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
-#xiaochengxu 娉惧窛鍘块儴缃插皬绋嬪簭鐜浣跨敤
spring:
profiles:
active: dev
\ No newline at end of file
--
Gitblit v1.8.0