From c176d20e59d15d137ab783e260d704b864b6ced0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 05 二月 2025 19:28:46 +0800
Subject: [PATCH] zjh20250205
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 15 +++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/AwsServiceImpl.java | 18 ++++++
ltkj-admin/pom.xml | 10 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/AwsMapper.java | 16 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/Aws.java | 25 ++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 9 +++
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 6 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 15 +++-
ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java | 2
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java | 15 -----
ltkj-hosp/pom.xml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/AwsService.java | 15 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java | 1
13 files changed, 116 insertions(+), 33 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 37de661..1df69ce 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -114,11 +114,11 @@
<version>4.0</version>
</dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>10.2.0.jre8</version> <!-- 浣跨敤鏈�鏂扮増鏈� -->
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.sqlserver</groupId>-->
+<!-- <artifactId>mssql-jdbc</artifactId>-->
+<!-- <version>6.4.0.jre8</version> <!– 浣跨敤鏈�鏂扮増鏈� –>-->
+<!-- </dependency>-->
<!-- Mysql椹卞姩鍖� -->
diff --git a/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java b/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
index 3bb1b28..1e1b725 100644
--- a/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
+++ b/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
@@ -24,7 +24,7 @@
public static void main(String[] args) {
//spring-boot-devtools鐨勬ā鍧椾娇Spring Boot搴旂敤鏀寔鐑儴缃诧紝鏃犻渶鎵嬪姩閲嶅惎Spring Boot搴旂敤銆�
System.setProperty("spring.devtools.restart.enabled", "false");
-
+// System.setProperty("https.protocols", "TLSv1");
SpringApplication.run(LtkjApplication.class, args);
System.out.println("椤圭洰鍚姩鎴愬姛!!!\n" +
" \n" +
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 31b3ce1..e3f677a 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
@@ -4,10 +4,7 @@
import com.ltkj.hosp.domain.TjJcycxm;
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 jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -59,6 +56,8 @@
private TjAsyncService asyncService;
@Autowired
private TjJcycxmService jcycxmService;
+ @Autowired
+ private AwsService awsService;
private final ReentrantLock reentrantLock = new ReentrantLock();
@@ -188,6 +187,14 @@
private void extractedjianyan(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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
index 0632612..c5b1479 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
@@ -17,7 +17,6 @@
import com.ltkj.mall.domain.MallTimeConfig;
import com.ltkj.mall.service.IMallTimeConfigService;
import com.ltkj.system.service.ISysConfigService;
-import com.ltkj.web.config.redis.OrderDelayService;
import com.ltkj.web.config.task.TjReservationTask;
import com.ltkj.web.wxUtils.WxUtil;
import io.swagger.annotations.Api;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 0ddb2b2..3f4bde8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -454,4 +454,13 @@
}
+ @GetMapping("/getWsxmLtkjHysqdByLisViBySLAVEWS")
+ @ApiOperation(value = "鏌ヨ澶栭�侀」鐩甋qlServer鎺ュ彛")
+ public AjaxResult getWsxmLtkjHysqdByLisViBySLAVEWS(@RequestParam String s) {
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisViBySLAVEWS(s);
+// log.info(wsbg.toString());
+ return AjaxResult.success(testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s));
+ }
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
index 4409769..f87b6f4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
@@ -1,9 +1,6 @@
package com.ltkj.web.jmreport;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.AjaxResult;
-import com.ltkj.hosp.mapper.TestMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -13,14 +10,11 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.List;
-import java.util.Map;
import java.util.Properties;
import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
@@ -40,8 +34,6 @@
private static String CONFIG_PATH;
- @Autowired
- private TestMapper testMapper;
@Value ("${config.properties}")
public void setConfigPath(String path) {
@@ -108,11 +100,4 @@
// public int view(){
// return 1;
// }
-
- @GetMapping("/getBingZhong")
- public String getBingZhongInfo(@RequestParam("start") String start, @RequestParam("end") String end){
- JSONObject object = JSONUtil.createObj();
- object.putOpt("data",testMapper.getBingZhongInfo(start,end));
- return JSONUtil.toJsonStr(object);
- }
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index 796a281..a3924ad 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -42,6 +42,7 @@
@Slf4j
public class DruidConfig {
+
@Value ("${config.properties}")
private String url;
@@ -259,6 +260,7 @@
}
+
@Bean
// @ConfigurationProperties("spring.datasource.druid.slavepacs")
// @ConditionalOnProperty(prefix = "spring.datasource.druid.slavepacs", name = "enabled", havingValue = "true")
@@ -276,7 +278,7 @@
props.load(fis);
fis.close();
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
- String pacsenabled = props.getProperty("pacsenabled");
+ String pacsenabled = props.getProperty("wsenabled");
if (pacsenabled.equals("false"))
return null;
String pacsdbtype = props.getProperty("wsdbtype");
@@ -313,7 +315,7 @@
properties.setProperty("druid.enabled", enabled);
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
properties.setProperty("druid.url","jdbc:sqlserver://"+ ip+":"+ port+";DatabaseName="+ db+
- ";encrypt=true;trustServerCertificate=true;sslProtocol=TLSv1.2;");
+ ";&characterEncoding=utf8");
properties.setProperty("druid.username", user);
properties.setProperty("druid.password", password);
dataSource.restart(properties);
diff --git a/ltkj-hosp/pom.xml b/ltkj-hosp/pom.xml
index b1af7c6..1c4d722 100644
--- a/ltkj-hosp/pom.xml
+++ b/ltkj-hosp/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
- <version>1.6.6</version>
+ <version>1.5.4</version>
</dependency>
</dependencies>
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/AwsMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/AwsMapper.java
new file mode 100644
index 0000000..f2218c3
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/AwsMapper.java
@@ -0,0 +1,16 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.sqlDomain.Aws;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ClassName: AwsMapper <br/>
+ * Description: <br/>
+ * date: 2025/2/5 17:56<br/>
+ *
+ * @author zjh<br />
+ */
+@Mapper
+public interface AwsMapper extends BaseMapper<Aws> {
+}
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 ce9e022..c81fc79 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
@@ -3,6 +3,7 @@
import com.ltkj.common.annotation.DataSource;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.*;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -342,6 +343,16 @@
+ @DataSource(value = DataSourceType.SLAVE_WS)
+ @Select("SELECT * from lis_result a where a.brid=#{tjNum}")
+ List<Aws> getWsxmLtkjHysqdByLisViBySLAVEWS(String tjNum);
+
+
+// @Delete("delete from aws where brid=#{tjNum}")
+ @Delete("DELETE FROM aws WHERE brid=#{tjNum}")
+ void delWsxmjg(String tjNum);
+
+
@DataSource(value = DataSourceType.SLAVE_PACS)
@Select("SELECT * FROM ris.V_TJ_JCBGXX_NEWTJ")
List<Map<String, Object>> getCcXZxYyPacsJgSt();
@@ -433,8 +444,4 @@
"FROM\n" +
" LTEMR.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}")
List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd1(String tjNum);
-
- @DataSource(value = DataSourceType.MASTER)
- @Select("call tj_bingzhongtongji(#{p_start,mode=IN},#{p_end,mode=IN})")
- List<Map<String ,Object>> getBingZhongInfo(@Param("p_start") String start,@Param("p_end") String end);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/AwsService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/AwsService.java
new file mode 100644
index 0000000..a0ea079
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/AwsService.java
@@ -0,0 +1,15 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.sqlDomain.Aws;
+
+/**
+ * ClassName: AwsService <br/>
+ * Description: <br/>
+ * date: 2025/2/5 17:56<br/>
+ *
+ * @author zjh<br />
+ */
+
+public interface AwsService extends IService<Aws> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/AwsServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/AwsServiceImpl.java
new file mode 100644
index 0000000..cf43c06
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/AwsServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.mapper.AwsMapper;
+import com.ltkj.hosp.service.AwsService;
+import com.ltkj.hosp.sqlDomain.Aws;
+import org.springframework.stereotype.Service;
+
+/**
+ * ClassName: AwsServiceImpl <br/>
+ * Description: <br/>
+ * date: 2025/2/5 17:56<br/>
+ *
+ * @author zjh<br />
+ */
+@Service
+public class AwsServiceImpl extends ServiceImpl<AwsMapper, Aws> implements AwsService {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/Aws.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/Aws.java
new file mode 100644
index 0000000..bdafd1c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/Aws.java
@@ -0,0 +1,25 @@
+package com.ltkj.hosp.sqlDomain;
+
+import lombok.Data;
+
+/**
+ * ClassName: Aws <br/>
+ * Description: <br/>
+ * date: 2025/2/5 17:48<br/>
+ *
+ * @author zjh<br />
+ */
+
+@Data
+public class Aws {
+ private String brid;
+ private String xmbm;
+ private String xmmc;
+ private String result;
+ private String gdpd;
+ private String xmckz;
+ private String dw;
+ private String bgsj;
+ private String bgys;
+
+}
--
Gitblit v1.8.0