From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 113b0d7..f3fdf6d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -1,12 +1,15 @@
package com.ltkj.web.config.timer;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjJcycxm;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.controller.system.TjXdPictureController;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +38,7 @@
*/
@Slf4j
@Component
-@Profile("!dev & !prod & !test")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
public class DefaultScheduled {
@@ -59,6 +62,10 @@
private TjJcycxmService jcycxmService;
@Autowired
private AwsService awsService;
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private TjXdPictureController pictureController;
private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -88,7 +95,7 @@
private void exec() {
String dsqkssj = configService.selectConfigByKey("dsqkssj");
String dsqjssj = configService.selectConfigByKey("dsqjssj");
- String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
+// String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm");
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
@@ -119,6 +126,14 @@
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
extractedjiancha(s,dqyyyqbm);
+// LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+// wq.eq(TjXdtgmdjg::getTjh,s);
+// List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
+// if(null !=list && !list.isEmpty()){
+// for (TjXdtgmdjg xdtgmdjg : list) {
+// pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+// }
+// }
}
}
Map<String, Object> map = new HashMap<>();
@@ -133,14 +148,14 @@
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
- jcycxm.setYqid(yqbm);
+ jcycxm.setYqid(dqyyyqbm);
String[] split1 = jcsqd.getJcxmid().split(";");
jcycxm.setProId(split1[0]);
jcycxm.setProName(jcsqd.getJcxmmc());
--
Gitblit v1.8.0