From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 84 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 19 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 0761070..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,14 +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.LtkjExamJcbgd;
-import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
-import com.ltkj.hosp.sqlDomain.LtkjHybgd;
-import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+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;
@@ -37,7 +38,7 @@
*/
@Slf4j
@Component
-@Profile("!dev")
+@Profile("!dev & !prod & !test & !win-xamjyytest & !win-chkwyytest")
public class DefaultScheduled {
@@ -59,6 +60,12 @@
private TjAsyncService asyncService;
@Autowired
private TjJcycxmService jcycxmService;
+ @Autowired
+ private AwsService awsService;
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private TjXdPictureController pictureController;
private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -88,8 +95,10 @@
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("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian);
String dsrwsjjg = configService.selectConfigByKey("dsrwsjjg");
boolean lock = reentrantLock.tryLock();
@@ -108,7 +117,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,dqyyyqbm);
}
}
@@ -116,7 +125,15 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ 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<>();
@@ -130,15 +147,15 @@
List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
- if(jcsqd.getJgbx().contains("銆�")){
- String[] split = jcsqd.getJgzt().split("銆�");
+ if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+ 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("鏈鏄庢樉")&& !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());
@@ -173,7 +190,8 @@
} catch (Exception e) {
scheduleNextTask(Long.parseLong(dsrwsjjg));
log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�");
- e.printStackTrace();
+ log.error(String.valueOf(e));
+// e.printStackTrace();
} finally {
reentrantLock.unlock();
}
@@ -186,9 +204,32 @@
return time.isAfter(LocalTime.of(Integer.parseInt(kssj), 0)) && time.isBefore(LocalTime.of(Integer.parseInt(jssj), 0));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String dqyyyqbm) {
try {
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
+ if(null !=awsList && !awsList.isEmpty()){
+ log.info(awsList.toString());
+ testMapper.delWsxmjg(s);
+ log.info("鍒犻櫎澶栭�侀」鐩垚鍔�");
+ awsService.saveBatch(awsList);
+ log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
+ }
+ List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
+ if(null !=wssq && !wssq.isEmpty()){
+ for (LtkjHysqd hysqd : wssq) {
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ if (null != jybgid) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
+ }
+ if (ltkjHysqdService.save(hysqd)) {
+ List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+ ltkjHybgdService.saveBatch(wsbg);
+ }
+ }
+ }
+
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -198,6 +239,8 @@
}
if (ltkjHysqdService.save(hysqd)) {
List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+// if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
ltkjHybgdService.saveBatch(hybgdList);
}
}
@@ -205,15 +248,17 @@
}
} catch (Exception e) {
log.info("鍚屾妫�楠屾暟鎹け璐�");
- throw new RuntimeException(e);
+// throw new RuntimeException(e);
+ log.error(String.valueOf(e));
}
+
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String dqyyyqbm) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
@@ -226,7 +271,8 @@
}
} catch (Exception e) {
log.info("鍚屾妫�鏌ユ暟鎹け璐�");
- throw new RuntimeException(e);
+// throw new RuntimeException(e);
+ log.error(String.valueOf(e));
}
}
}
--
Gitblit v1.8.0