From 95604975d26071d55e270e73784af4787b042d98 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 12 二月 2025 17:32:45 +0800
Subject: [PATCH] zjh20250212
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 35 ++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 126 ++++++++++++++++++++++++++++++-
ltkj-admin/src/test/java/zwxTest.java | 21 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 14 ++-
5 files changed, 164 insertions(+), 34 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 4066028..4d0a7f7 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,5 +1,6 @@
package com.ltkj.web.config.timer;
+import cn.hutool.core.date.DateUtil;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.mapper.TestMapper;
@@ -89,6 +90,7 @@
String dsqjssj = configService.selectConfigByKey("dsqjssj");
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
+ log.info("瀹氭椂鍣ㄨ嚜鍔ㄥ悓姝ユ楠屾鏌ョ粨鏋�");
log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian);
String dsrwsjjg = configService.selectConfigByKey("dsrwsjjg");
boolean lock = reentrantLock.tryLock();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 496186e..729bdf1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -1,8 +1,7 @@
package com.ltkj.web.controller.system;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
+import java.text.SimpleDateFormat;
+import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -11,15 +10,21 @@
import cn.hutool.extra.pinyin.PinyinUtil;
import com.ltkj.common.core.domain.entity.SysMenu;
import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
-import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
+import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.system.service.ISysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Case;
+import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,6 +48,7 @@
@RestController
@RequestMapping("/system/config")
@Api(tags = "A---PC绔弬鏁伴厤缃帴鍙ｉ泦")
+@Slf4j
public class SysConfigController extends BaseController {
@Autowired
private ISysConfigService configService;
@@ -60,6 +66,16 @@
private TjJcycxmService jcycxmService;
@Resource
private LtkjExamJcsqdService jcsqdService;
+ @Resource
+ private LtkjExamJcbgdService jcbgdService;
+ @Resource
+ private LtkjHybgdService ltkjHybgdService;
+ @Resource
+ private LtkjHysqdService ltkjHysqdService;
+ @Resource
+ private TestMapper testMapper;
+ @Autowired
+ private AwsService awsService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
@@ -172,6 +188,107 @@
}
+ @GetMapping ("/shoudongtbjyjcwsxmjg")
+ @ApiOperation(value = "鎵嬪姩鍚屾妫�楠屾鏌ュ閫侀」鐩粨鏋滄帴鍙�")
+ public AjaxResult shoudongtbjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjh) {
+
+ log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ try {
+
+ switch (tblx){
+ case "jy":
+ tbjianyan(tjh);
+ log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠�");
+ break;
+ case "jc":
+ tbjiancha(tjh);
+ log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�鏌�");
+ break;
+ case "jyjc":
+ tbjianyan(tjh);
+ tbjiancha(tjh);
+ log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠屾鏌�");
+ break;
+ default:
+ log.info("娌℃湁鎵惧埌鎵�鍖归厤鐨勫悓姝ョ被鍨�");
+ return AjaxResult.error("娌℃湁鎵惧埌鎵�鍖归厤鐨勫悓姝ョ被鍨�!");
+ }
+ Map<String, Object> map = new HashMap<>();
+ testMapper.tjplUpdateDetatilByVi(map);
+ Integer object = (Integer) map.get("total");
+ log.info("鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}", object);
+ log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滅粨鏉�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ return AjaxResult.success("鍚屾鎴愬姛");
+
+ } catch (Exception e) {
+ log.error(String.valueOf(e));
+ }
+ return AjaxResult.success();
+ }
+
+ private void tbjianyan(String s) {
+ try {
+ 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> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
+ if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
+ 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());
+ List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
+ if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
+ ltkjHybgdService.saveBatch(hybgdList);
+ }
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ } catch (Exception e) {
+ log.info("鍚屾妫�楠屾暟鎹け璐�");
+// throw new RuntimeException(e);
+ log.error(String.valueOf(e));
+ }
+
+ }
+
+
+ private void tbjiancha(String s) {
+
+ 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);
+ log.error(String.valueOf(e));
+ }
+ }
+
+
+
+
@GetMapping ("/zxsq")//鎵ц
@ApiOperation(value = "zxsq")
public AjaxResult zx(@RequestParam int day) {
@@ -257,4 +374,5 @@
}
return AjaxResult.success();
}
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a360ec8..fbf5621 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -39,6 +39,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
@@ -114,18 +115,21 @@
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
- reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
- TjReportTemplate tem = new TjReportTemplate();
- tem.setName("浣撴鎶ュ憡妯℃澘5");
- tem.setRemark("浣撴鎶ュ憡妯℃澘5");
- tem.setTemplate(base64String);
- tem.setFlag("1");
- tem.setOpen("0");
- tem.setCreateTime(DateUtil.date());
- final boolean save = reportTemplateService.save(tem);
- if (save) {
- return AjaxResult.success("淇濆瓨鎴愬姛");
+ if(StringUtil.isNotBlank(base64String)){
+ reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
+ TjReportTemplate tem = new TjReportTemplate();
+ tem.setName("浣撴鎶ュ憡妯℃澘5");
+ tem.setRemark("浣撴鎶ュ憡妯℃澘5");
+ tem.setTemplate(base64String);
+ tem.setFlag("1");
+ tem.setOpen("0");
+ tem.setCreateTime(DateUtil.date());
+ final boolean save = reportTemplateService.save(tem);
+ if (save) {
+ return AjaxResult.success("淇濆瓨鎴愬姛");
+ }
}
+
return AjaxResult.success("淇濆瓨澶辫触");
// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�1.pdf");
// TjReport tem2 = new TjReport();
@@ -1711,7 +1715,7 @@
we.eq(TjReport::getType, "浣撴鎶ュ憡");
TjReport one = tjReportService.getOne(we);
if (one == null) {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡");
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
}
if ("pdf".equals(one.getPrint())) {
res.put("flag", "0");
@@ -1721,7 +1725,7 @@
res.put("url", one.getPath());
return AjaxResult.success(res);
} else {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡");
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
}
}
@@ -2146,7 +2150,7 @@
// 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
if (i == 0) {
- return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
}
}
@@ -2169,11 +2173,10 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
-// ycxmService.delOrderYcXmJyByTjh(tjNumber);
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
- return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ return AjaxResult.error("璇ヤ汉鍛樹綋妫�璁板綍涓嶅瓨鍦�,璇锋牳瀹炰汉鍛樹俊鎭�!");
}
diff --git a/ltkj-admin/src/test/java/zwxTest.java b/ltkj-admin/src/test/java/zwxTest.java
index 2c2a0ea..0869032 100644
--- a/ltkj-admin/src/test/java/zwxTest.java
+++ b/ltkj-admin/src/test/java/zwxTest.java
@@ -61,10 +61,11 @@
private ITjReportTemplateService reportTemplateService;
@Autowired
private HisPDFUtil hisPDFUtil;
- @Autowired
- private RedisCache redisCache;
- @Autowired
- private RedisTemplate<String,Object> redisTemplate;
+
+// @Autowired
+// private RedisCache redisCache;
+// @Autowired
+// private RedisTemplate<String,Object> redisTemplate;
public static String generateId() {
String id;
@@ -115,11 +116,11 @@
template.setOpen("1");
reportTemplateService.save(template);
}
-
- @Test
- public void test11(){
- redisCache.setCacheList("list1",new ArrayList<>());
- redisTemplate.opsForList().set("list2",0,new ArrayList<>());
- }
+//
+// @Test
+// public void test11(){
+// redisCache.setCacheList("list1",new ArrayList<>());
+// redisTemplate.opsForList().set("list2",0,new ArrayList<>());
+// }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index b12c3f2..c577c8a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -310,7 +310,7 @@
// @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT aa.tjh,ws.pro_id tmh,aa.bbbh,aa.bbmc,ws.pro_id xmid,aa.xmmc,aa.sqsj,aa.sqys,aa.jgsj,aa.sqdh,aa.sqrxm,aa.sqrdm,aa.jybgjg,aa.create_time FROM tj_wsxm ws LEFT JOIN (\n" +
+ @Select("SELECT aa.tjh,CONCAT(aa.tjh,RIGHT(ws.pro_id, 6)) tmh,aa.bbbh,aa.bbmc,ws.pro_id xmid,aa.xmmc,aa.sqsj,aa.sqys,aa.jgsj,aa.sqdh,aa.sqrxm,aa.sqrdm,aa.jybgjg,aa.create_time FROM tj_wsxm ws LEFT JOIN (\n" +
" SELECT\n" +
" a.brid tjh,\n" +
" a.brid tmh,\n" +
@@ -333,7 +333,7 @@
List<LtkjHysqd> getWsxmLtkjHysqdByLisVi(String tjNum);
// @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT ws.pro_id tmh,aa.jcxmid,aa.jcxm,NULL tdh,aa.jyjg,null jgdw,null fwzdz,null fwzgz,aa.jysj,aa.shsj,NULL shys,aa.shysmc,NULL tpurl,NULL ycbz,aa.create_time\n" +
+ @Select("SELECT CONCAT(aa.tmh,RIGHT(ws.pro_id, 6)) tmh,aa.jcxmid,aa.jcxm,NULL tdh,aa.jyjg,null jgdw,null fwzdz,null fwzgz,aa.jysj,aa.shsj,NULL shys,aa.shysmc,NULL tpurl,NULL ycbz,aa.create_time\n" +
" FROM tj_wsxm ws \n" +
" LEFT JOIN (\n" +
" SELECT distinct a.brid tmh,a.xmbm jcxmid,a.xmmc jcxm,NULL tdh,a.result jyjg,null jgdw,null fwzdz,null fwzgz,null fwz,a.bgsj jysj,a.bgys jyys,a.bgsj shsj," +
@@ -343,8 +343,14 @@
- @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT * from lis_result a where a.brid=#{tjNum}")
+// @DataSource(value = DataSourceType.SLAVE_WS)
+// @Select("SELECT * from lis_result a where a.brid=#{tjNum}")
+// List<Aws> getWsxmLtkjHysqdByLisViBySLAVEWS(String tjNum);
+
+ @DataSource(value = DataSourceType.SLAVE_WS)
+ @Select("select t.brid,t.xmbm,t.xmmc,t.result,t.gdpd ,t.xmckz,t.dw,t.bgys,max(bgsj) bgsj\n" +
+ " from lis_result t WHERE t.brid=#{tjNum} \n" +
+ " group by t.brid,t.xmbm,t.xmmc,t.result,t.gdpd,t.xmckz,t.dw,t.bgys")
List<Aws> getWsxmLtkjHysqdByLisViBySLAVEWS(String tjNum);
--
Gitblit v1.8.0