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驱动包 --> 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" + 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); 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; ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -454,4 +454,13 @@ } @GetMapping("/getWsxmLtkjHysqdByLisViBySLAVEWS") @ApiOperation(value = "查询外送项目SqlServer接口") public AjaxResult getWsxmLtkjHysqdByLisViBySLAVEWS(@RequestParam String s) { // List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisViBySLAVEWS(s); // log.info(wsbg.toString()); return AjaxResult.success(testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s)); } } 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); } } 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(); // 这里是测试写法，具体的value可以通过请求参数传递过来 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); 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> ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/AwsMapper.java
New file @@ -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> { } 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); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/AwsService.java
New file @@ -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> { } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/AwsServiceImpl.java
New file @@ -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 { } ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/Aws.java
New file @@ -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; }
