From 404fa9ff4331d6bb5037dbec466022fade5e82bc Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 18 十二月 2024 18:11:46 +0800 Subject: [PATCH] zjh202412018 --- ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 108 +++++++++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 49 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 60d1ec7..8a4043e 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 @@ -12,6 +12,7 @@ import com.ltkj.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -34,6 +35,7 @@ */ @Slf4j @Component +@Profile("!dev") public class DefaultScheduled { @@ -94,79 +96,87 @@ List<String> jc = orderService.getDingShiTongBuJianChaTjNum(); + if(null !=jy && !jy.isEmpty()){ + log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size()); for (String s : jy) { - TjOrder order = orderService.getOrderByTjNum(s); - extractedjianyan(s,order); +// TjOrder order = orderService.getOrderByTjNum(s); + extractedjianyan(s); } } + if(null !=jc && !jc.isEmpty()){ + log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size()); for (String s : jc) { - TjOrder order = orderService.getOrderByTjNum(s); - extractedjiancha(s,order); +// TjOrder order = orderService.getOrderByTjNum(s); + extractedjiancha(s); } } - - long end = System.currentTimeMillis(); - log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000); - // 鍔ㄦ�佽幏鍙栦笅娆′换鍔$殑闂撮殧 - int minute = Integer.parseInt(dsrwsjjg); - if (minute < 5) minute = 5; - if (minute > 59) minute = 59; - scheduleNextTask(minute); + Map<String,Object> map=new HashMap<>(); + testMapper.tjplUpdateDetatilByVi(map); + Integer object = (Integer) map.get("total"); + log.info("鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}",object); + if(null !=object && object.equals(1)){ + long end = System.currentTimeMillis(); + log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000); + // 鍔ㄦ�佽幏鍙栦笅娆′换鍔$殑闂撮殧 + int minute = Integer.parseInt(dsrwsjjg); + if (minute < 5) minute = 5; + if (minute > 59) minute = 59; + scheduleNextTask(minute); + } } } catch (Exception e) { + log.error("瀹氭椂鍣ㄦ墽琛屾姤閿�"); e.printStackTrace(); } finally { + scheduleNextTask(Long.parseLong(dsrwsjjg)); reentrantLock.unlock(); } } - private void extractedjianyan(String s,TjOrder order) { - List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber()); - if(null != hysqdList && !hysqdList.isEmpty()){ - for (LtkjHysqd hysqd : hysqdList) { - LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); - if (null != jybgid) { - ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); - ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh()); + private void extractedjianyan(String s) { + try { + List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s); + if(null != hysqdList && !hysqdList.isEmpty()){ + for (LtkjHysqd hysqd : hysqdList) { + 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> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh()); + ltkjHybgdService.saveBatch(hybgdList); + } } - if (ltkjHysqdService.save(hysqd)) { - List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh()); - ltkjHybgdService.saveBatch(hybgdList); - } + DynamicDataSourceContextHolder.clearDataSourceType(); } - DynamicDataSourceContextHolder.clearDataSourceType(); + } catch (Exception e) { + log.info("鍚屾妫�楠屾暟鎹け璐�"); + throw new RuntimeException(e); } -// String tjNumber1 = order.getTjNumber(); -// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1); -// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s); - Map<String,Object> map=new HashMap<>(); - map.put("tjnum", s); - testMapper.tjUpdateDetatilByVi(map); -// asyncService.tjUpdateDetatilByVi(s); - log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!"); } - private void extractedjiancha(String s,TjOrder order) { + private void extractedjiancha(String s) { - List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber()); - if(null !=jcsqdList && !jcsqdList.isEmpty()){ - jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId()); - jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId()); - jcsqdService.saveBatch(jcsqdList); - List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId()); - if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList); - DynamicDataSourceContextHolder.clearDataSourceType(); + try { + List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s); + if(null !=jcsqdList && !jcsqdList.isEmpty()){ + DynamicDataSourceContextHolder.clearDataSourceType(); + jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s); + jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s); + jcsqdService.saveBatch(jcsqdList); + List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s); + DynamicDataSourceContextHolder.clearDataSourceType(); + if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } catch (Exception e) { + log.info("鍚屾妫�鏌ユ暟鎹け璐�"); + throw new RuntimeException(e); } -// String tjNumber1 = order.getTjNumber(); -// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1); -// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s); - Map<String,Object> map=new HashMap<>(); - map.put("tjnum", s); - testMapper.tjUpdateDetatilByVi(map); - log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!"); } } -- Gitblit v1.8.0