diff --git a/pom.xml b/pom.xml index 7c04ee9..3cbb173 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ 2.0.11 2.6.0 2.1.7 + 1.18.30 @@ -56,6 +57,8 @@ org.projectlombok lombok + ${lombok.version} + provided diff --git a/src/main/java/com/example/SpringbootDemoApplication.java b/src/main/java/com/example/SpringbootDemoApplication.java index 5dc3e33..63147f4 100644 --- a/src/main/java/com/example/SpringbootDemoApplication.java +++ b/src/main/java/com/example/SpringbootDemoApplication.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; @@ -19,7 +20,13 @@ import java.io.File; @MapperScan("com.example.duplicate.infrastructure.dao") public class SpringbootDemoApplication { public static void main(String[] args) { - SpringApplication.run(SpringbootDemoApplication.class, args); + + ConfigurableApplicationContext ctx = + SpringApplication.run(SpringbootDemoApplication.class, args); + + // ① 看 Environment 里有没有 spring.datasource.url + String url = ctx.getEnvironment().getProperty("spring.datasource.url"); + System.out.println(">>> 实际读取的 url = " + url); } diff --git a/src/main/java/com/example/duplicate/config/ConfigOne.java b/src/main/java/com/example/duplicate/config/ConfigOne.java deleted file mode 100644 index 491fffc..0000000 --- a/src/main/java/com/example/duplicate/config/ConfigOne.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.duplicate.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; - -import javax.sql.DataSource; - -/** - * @ClassName RecordConfig - * @Description Pacs数据数据源配置 - * @Author linjj - * @Date 2023/8/2 16:48 - * @Version 1.0 - */ -@Configuration -// 指定主数据库扫描对应的Mapper文件，生成代理对象 -@MapperScan(basePackages ="com.example.duplicate.infrastructure.configOneDao" ,sqlSessionFactoryRef = "configOneSqlSessionFactory") -public class ConfigOne { - - // mapper.xml所在地址 - private static final String MAPPER_LOCATION = "classpath*:mapper/*.xml"; - - - /** - * 主数据源，Primary注解必须增加，它表示该数据源为默认数据源 - * 项目中还可能存在其他的数据源，如获取时不指定名称，则默认获取这个数据源，如果不添加，则启动时候回报错 - */ - @Bean(name = "configOneDataSource") - // 读取spring.datasource.master前缀的配置文件映射成对应的配置对象 - @ConfigurationProperties(prefix = "spring.datasource.db1") - public DataSource dataSource() { - DataSource build = DataSourceBuilder.create().build(); - return build; - } - - /** - * 事务管理器，Primary注解作用同上 - */ - @Bean(name = "configOneTransactionManager") - public PlatformTransactionManager dataSourceTransactionManager(@Qualifier("configOneDataSource") DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - /** - * session工厂，Primary注解作用同上 - */ - - @Bean(name = "configOneSqlSessionFactory") - public SqlSessionFactory sqlSessionFactory(@Qualifier("configOneDataSource") DataSource dataSource) throws Exception { - final SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean(); - sessionFactoryBean.setDataSource(dataSource); - sessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(ConfigOne.MAPPER_LOCATION)); - return sessionFactoryBean.getObject(); - } -} diff --git a/src/main/java/com/example/duplicate/config/ConfigTwo.java b/src/main/java/com/example/duplicate/config/ConfigTwo.java deleted file mode 100644 index f33b7d4..0000000 --- a/src/main/java/com/example/duplicate/config/ConfigTwo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.example.duplicate.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; - -import javax.sql.DataSource; - -/** - * @ClassName RecordConfig - * @Description 归档数据数据源配置 - * @Author linjj - * @Date 2023/8/2 16:48 - * @Version 1.0 - */ -@Configuration -// 指定主数据库扫描对应的Mapper文件，生成代理对象 -@MapperScan(basePackages ="com.example.duplicate.infrastructure.configTwoDao" ,sqlSessionFactoryRef = "configTwoSqlSessionFactory") -public class ConfigTwo { - - // mapper.xml所在地址 - private static final String MAPPER_LOCATION = "classpath*:mapper2/*.xml"; - - - /** - * 主数据源，Primary注解必须增加，它表示该数据源为默认数据源 - * 项目中还可能存在其他的数据源，如获取时不指定名称，则默认获取这个数据源，如果不添加，则启动时候回报错 - */ - @Primary - @Bean(name = "configTwoDataSource") - // 读取spring.datasource.master前缀的配置文件映射成对应的配置对象 - @ConfigurationProperties(prefix = "spring.datasource.db2") - public DataSource dataSource() { - DataSource build = DataSourceBuilder.create().build(); - return build; - } - - /** - * 事务管理器，Primary注解作用同上 - */ - @Bean(name = "configTwoTransactionManager") - @Primary - public PlatformTransactionManager dataSourceTransactionManager(@Qualifier("configTwoDataSource") DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - /** - * session工厂，Primary注解作用同上 - */ - - @Bean(name = "configTwoSqlSessionFactory") - @Primary - public SqlSessionFactory sqlSessionFactory(@Qualifier("configTwoDataSource") DataSource dataSource) throws Exception { - final SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean(); - sessionFactoryBean.setDataSource(dataSource); - sessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(ConfigTwo.MAPPER_LOCATION)); - return sessionFactoryBean.getObject(); - } - - -} diff --git a/src/main/java/com/example/duplicate/controller/LzRmController.java b/src/main/java/com/example/duplicate/controller/LzRmController.java index c6d9863..1005643 100644 --- a/src/main/java/com/example/duplicate/controller/LzRmController.java +++ b/src/main/java/com/example/duplicate/controller/LzRmController.java @@ -46,4 +46,15 @@ public class LzRmController { return ResultBody.success("完成"); } + + + + @ResponseBody + @RequestMapping(value = "getPath", method = RequestMethod.POST) + @ApiOperation(value = "检查错误目录", notes = "检查错误目录") + public ResultBody getPath(){ + lzRmService.getPath(); + return ResultBody.success("完成"); + + } } diff --git a/src/main/java/com/example/duplicate/controller/ZJYYController.java b/src/main/java/com/example/duplicate/controller/ZJYYController.java deleted file mode 100644 index f74af0d..0000000 --- a/src/main/java/com/example/duplicate/controller/ZJYYController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.example.duplicate.controller; - -import com.example.duplicate.controller.vo.CommomtableCopyVo; -import com.example.duplicate.infrastructure.configOneDao.CommomtableMapper; -import com.example.duplicate.service.MessageLogService; -import com.example.duplicate.service.MessageLogTwoService; -import com.example.duplicate.service.MessageSubordinateService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @ClassName ZJYYController - * @Description 湛江医院接口 - * @Author linjj - * @Date 2023/10/13 13:49 - * @Version 1.0 - */ -@RestController -@Api(value = "湛江医院接口", tags = "湛江医院相关接口", description = "湛江医院相关接口") -@RequestMapping("/ZJYY") -@Slf4j -public class ZJYYController { - - @Autowired - MessageSubordinateService messageSubordinateService; - @Autowired - MessageLogService messageLogService; - @Autowired - MessageLogTwoService messageLogTwoService; - @Autowired - CommomtableMapper commomtableMapper; - @RequestMapping(value = "delMessage" , method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "删除messageSubordinate内容" , notes = "删除messageSubordinate内容") - public int delMessage() { - return messageSubordinateService.delMessage(); - } - - - - @RequestMapping(value = "delMessageLog" , method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "删除messageLog内容" , notes = "删除messageLog内容") - public int delMessageLog() { - return messageLogService.delMessageLog(); - } - - @RequestMapping(value = "addMessageLog" , method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "移动messageLog内容" , notes = "移动messageLog内容") - public int addMessageLog(){ - return messageLogTwoService.addMessageLog(); - } - - - @RequestMapping(value = "addMessage" , method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "移动messageScanning表数据" , notes = "移动messageScanning表数据") - public int addMessage(){ - return messageSubordinateService.addMessage(); - } - - - @RequestMapping(value = "com" , method = RequestMethod.GET) - @ResponseBody - public String com(){ - List com = commomtableMapper.com(); - for (CommomtableCopyVo list:com){ - StringBuffer sb=new StringBuffer(); - sb.append("(inp_no =' "+list.getInpatientNo()+" 'and visit_id = '"+list.getAdmissTimes()+" ' ) or"); - log.info(sb.toString()); - } - return""; - } - - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageLogTwoMapper.java b/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageLogTwoMapper.java deleted file mode 100644 index 8e7140f..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageLogTwoMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.duplicate.infrastructure.configTwoDao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.example.duplicate.controller.vo.MessageLog; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @ClassName MessageLogMapper - * @Description - * @Author linjj - * @Date 2023/10/13 13:58 - * @Version 1.0 - */ -@Mapper -public interface MessageLogTwoMapper { - - int addAll(@Param("list")List list); - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageSubordinateTwoMapper.java b/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageSubordinateTwoMapper.java deleted file mode 100644 index c2d9f70..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configTwoDao/MessageSubordinateTwoMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.duplicate.infrastructure.configTwoDao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.example.duplicate.controller.vo.MessageLog; -import com.example.duplicate.controller.vo.MessageSubordinate; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @ClassName MessageLogMapper - * @Description - * @Author linjj - * @Date 2023/10/13 13:58 - * @Version 1.0 - */ -@Mapper -public interface MessageSubordinateTwoMapper { - - int addAll(@Param("list")List list); - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/ArchiveDetailMapper.java similarity index 85% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/ArchiveDetailMapper.java index 5fa8842..a6c5d45 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/ArchiveDetailMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.AddArchiveDetail; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/ArchiveMasterMapper.java similarity index 91% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/ArchiveMasterMapper.java index 9860e6d..1a51cff 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/ArchiveMasterMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.AddArchiveMasterVo; import com.example.duplicate.controller.vo.ArchiveMasterVo; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/CommomtableMapper.java similarity index 94% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/CommomtableMapper.java index d336a08..5a5f1c9 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/CommomtableMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.*; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/LzRmMapper.java similarity index 92% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/LzRmMapper.java index c15eb33..36c45f5 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/LzRmMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.CommomtableCopyVo; import com.example.duplicate.controller.vo.ZdAssortVo; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/MessageLogMapper.java similarity index 93% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/MessageLogMapper.java index 357a3bc..ab806a2 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/MessageLogMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.MessageLog; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/MessageSubordinateMapper.java similarity index 93% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/MessageSubordinateMapper.java index f01871b..41eb46e 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/MessageSubordinateMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.example.duplicate.controller.vo.MessageSubordinate; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/MidMapper.java similarity index 53% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/MidMapper.java index 848b36c..eb0325d 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/MidMapper.java @@ -1,6 +1,5 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; -import com.example.duplicate.controller.vo.AddArchiveDetail; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java b/src/main/java/com/example/duplicate/infrastructure/dao/QualityMapper.java similarity index 95% rename from src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java rename to src/main/java/com/example/duplicate/infrastructure/dao/QualityMapper.java index 713ca32..eb23cb4 100644 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java +++ b/src/main/java/com/example/duplicate/infrastructure/dao/QualityMapper.java @@ -1,4 +1,4 @@ -package com.example.duplicate.infrastructure.configOneDao; +package com.example.duplicate.infrastructure.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.example.duplicate.controller.vo.FliePath; diff --git a/src/main/java/com/example/duplicate/service/LzRmService.java b/src/main/java/com/example/duplicate/service/LzRmService.java index 9a765eb..8c21626 100644 --- a/src/main/java/com/example/duplicate/service/LzRmService.java +++ b/src/main/java/com/example/duplicate/service/LzRmService.java @@ -12,4 +12,6 @@ public interface LzRmService { int LzRmSplit(); void Batch(); + + void getPath(); } diff --git a/src/main/java/com/example/duplicate/service/MessageLogService.java b/src/main/java/com/example/duplicate/service/MessageLogService.java deleted file mode 100644 index a6b87ec..0000000 --- a/src/main/java/com/example/duplicate/service/MessageLogService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.duplicate.service; - -/** - * @ClassName MessageLogService - * @Description MessageLog接口 - * @Author linjj - * @Date 2023/10/13 15:19 - * @Version 1.0 - */ -public interface MessageLogService { - - int delMessageLog(); - - -} diff --git a/src/main/java/com/example/duplicate/service/MessageLogTwoService.java b/src/main/java/com/example/duplicate/service/MessageLogTwoService.java deleted file mode 100644 index 8d3ab8e..0000000 --- a/src/main/java/com/example/duplicate/service/MessageLogTwoService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.duplicate.service; - -/** - * @ClassName MessageLogService - * @Description MessageLog接口 - * @Author linjj - * @Date 2023/10/13 15:19 - * @Version 1.0 - */ -public interface MessageLogTwoService { - - int addMessageLog(); -} diff --git a/src/main/java/com/example/duplicate/service/MessageSubordinateService.java b/src/main/java/com/example/duplicate/service/MessageSubordinateService.java deleted file mode 100644 index 716ba5d..0000000 --- a/src/main/java/com/example/duplicate/service/MessageSubordinateService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.duplicate.service; - - - -/** - * @ClassName ZJYYService - * @Description 湛江医院接口 - * @Author linjj - * @Date 2023/10/13 13:49 - * @Version 1.0 - */ - -public interface MessageSubordinateService { - int delMessage(); - - int addMessage(); - - - -} diff --git a/src/main/java/com/example/duplicate/service/impl/DuplicateServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/DuplicateServiceImpl.java index df90e29..e99628e 100644 --- a/src/main/java/com/example/duplicate/service/impl/DuplicateServiceImpl.java +++ b/src/main/java/com/example/duplicate/service/impl/DuplicateServiceImpl.java @@ -3,8 +3,8 @@ package com.example.duplicate.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.example.duplicate.controller.vo.*; -import com.example.duplicate.infrastructure.configOneDao.CommomtableMapper; -import com.example.duplicate.infrastructure.configOneDao.QualityMapper; +import com.example.duplicate.infrastructure.dao.CommomtableMapper; +import com.example.duplicate.infrastructure.dao.QualityMapper; import com.example.duplicate.service.DuplicateService; import com.lowagie.text.Document; import com.lowagie.text.DocumentException; diff --git a/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java index cd300b9..10d12bf 100644 --- a/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java +++ b/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java @@ -1,20 +1,20 @@ package com.example.duplicate.service.impl; import com.example.duplicate.controller.vo.*; -import com.example.duplicate.infrastructure.configOneDao.ArchiveDetailMapper; -import com.example.duplicate.infrastructure.configOneDao.ArchiveMasterMapper; -import com.example.duplicate.infrastructure.configOneDao.CommomtableMapper; -import com.example.duplicate.infrastructure.configOneDao.LzRmMapper; +import com.example.duplicate.infrastructure.dao.ArchiveDetailMapper; +import com.example.duplicate.infrastructure.dao.ArchiveMasterMapper; +import com.example.duplicate.infrastructure.dao.CommomtableMapper; +import com.example.duplicate.infrastructure.dao.LzRmMapper; import com.example.duplicate.service.LzRmService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -47,7 +47,7 @@ public class LzRmServiceImpl implements LzRmService { /* 日期解析工具 */ private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyyMMdd"); - + private static final String ROOT_DIR = "F:\\连州人民2期 已丢图像"; @Override public int LzRmSplit() { //新增状态 @@ -85,7 +85,7 @@ public class LzRmServiceImpl implements LzRmService { @Override public void Batch() { - File root = new File("D:/tmp"); + File root = new File("F://连州人民2期 已丢图像"); File[] firstLevelFolders = root.listFiles(File::isDirectory); if (firstLevelFolders == null) return; @@ -124,6 +124,67 @@ public class LzRmServiceImpl implements LzRmService { } } + @Override + public void getPath() { + try { + Files.walk(Paths.get(ROOT_DIR)) + .filter(Files::isDirectory) + .filter(p -> !p.toString().equals(ROOT_DIR)) + .forEach(p -> checkFolder(p.toFile())); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + + private static void checkFolder(File dir) { + String name = dir.getName(); + if (!name.contains("-")) return; + + String[] p = name.split("-", -1); + StringBuilder err = new StringBuilder(); + + /* 0. 参数个数 */ + if (p.length != 7) { + err.append("参数个数=").append(p.length).append("（应为7）；"); + // 长度不足直接报，后面不再校验 + log.info("【不合规】" + dir + " 原因：" + err); + return; + } + + /* 1. 顺序反：病案号≤3位 且 住院次数≥5位 */ + if (p[1].matches("\\d{1,3}") && p[2].matches("\\d{5,}")) { + err.append("病案号与住院次数位置反（病案号≤3位且住院次数≥5位）；"); + } + + /* 2. 基本格式校验（允许 数字 | 无 | - | 空串） */ + if (!p[0].matches("^(\\d+|无|-)?$")) err.append("盘号格式错误；"); + if (!p[1].matches("^(\\d+|无|-)?$")) err.append("病案号格式错误；"); + if (!p[2].matches("^(\\d+|无|-)?$")) err.append("住院次数格式错误；"); + /* 3. 日期：yyyyMMdd 或 无/- */ + if (!p[4].matches("(\\d{8}|无|-)")) { + // 如果是纯数字但长度不对 → 格式错 + if (p[4].matches("\\d+") && p[4].length() != 8) { + err.append("出院日期格式错误；"); + } else if (!p[4].equals("无") && !p[4].equals("-")) { + // 非数字、非无、非- → 格式错 + err.append("出院日期格式错误；"); + } + } + + /* 4. 旧病案号：数字 或 无/- */ + /* 旧病案号：数字 | 无 | - | 空串 */ + if (!p[6].matches("^(\\d+|无|-|)$")) { + err.append("旧病案号格式错误；"); + } + + /* 5. 输出结果 */ + if (err.length() > 0) { + log.info("【不合规】" + dir + " 原因：" + err); + } + } + + /** * @description: 插入一条数据到Archive_Master表 * @params: commomtableCopyVo diff --git a/src/main/java/com/example/duplicate/service/impl/MessageLogServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/MessageLogServiceImpl.java deleted file mode 100644 index 011a87e..0000000 --- a/src/main/java/com/example/duplicate/service/impl/MessageLogServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.example.duplicate.service.impl; - -import com.example.duplicate.controller.vo.MessageLogVo; -import com.example.duplicate.infrastructure.configOneDao.MessageLogMapper; -import com.example.duplicate.service.MessageLogService; -import com.example.utils.ListUtilsNew; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * @ClassName MessageLogServiceImpl - * @Description 湛江医院接口 - * @Author linjj - * @Date 2023/10/13 15:19 - * @Version 1.0 - */ -@Service -public class MessageLogServiceImpl implements MessageLogService { - @Autowired - MessageLogMapper messageLogMapper; - @Value("${ZJ_DATE_TIME_LOG}") - private String dateTime; - @Override - public int delMessageLog() { - //查询需要删除数据条数 - int messageLogNum = messageLogMapper.getMessageLogNum(dateTime); - //需要次数 - double num = ((double) messageLogNum) / 100; - int circulateNum= (int) Math.ceil(num); - for (int i=0;i list = messageLogMapper.getAllByIds(dateTime); - //id集合 - List idList = ListUtilsNew.distinctSelect(list, MessageLogVo::getId); - //转成逗号拼接 - String ids = String.join(",", idList); - messageLogMapper.del(ids); - } - return 1; - } - - -} diff --git a/src/main/java/com/example/duplicate/service/impl/MessageLogTwoServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/MessageLogTwoServiceImpl.java deleted file mode 100644 index bd8e489..0000000 --- a/src/main/java/com/example/duplicate/service/impl/MessageLogTwoServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.example.duplicate.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.example.duplicate.controller.vo.MessageLog; -import com.example.duplicate.infrastructure.configOneDao.MessageLogMapper; -import com.example.duplicate.infrastructure.configTwoDao.MessageLogTwoMapper; -import com.example.duplicate.service.MessageLogTwoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * @ClassName MessageLogServiceImpl - * @Description 湛江医院接口 - * @Author linjj - * @Date 2023/10/13 15:19 - * @Version 1.0 - */ -@Service -public class MessageLogTwoServiceImpl implements MessageLogTwoService { - @Autowired - private MessageLogMapper messageLogMapper; - @Autowired - private MessageLogTwoMapper messageLogTwoMapper; - @Value("${ZJ_DATE_TIME_LOG}") - private String dateTime; - - - @Override - public int addMessageLog() { - //查询需要移动数据条数 - int messageLogNum = messageLogMapper.getMessageLogNum(dateTime); - //需要次数 - double num = ((double) messageLogNum) / 100; - int circulateNum= (int) Math.ceil(num); - for (int i=0;i allBy = messageLogMapper.getAllBy(synchronousTime); - //插入新数据库 - messageLogTwoMapper.addAll(allBy); - //记录更新时间 - String dischargeDateTime = allBy.get(allBy.size() - 1).getDischargeDateTime(); - messageLogMapper.updateSynchronousTime(dischargeDateTime); - } - return 1; - } -} diff --git a/src/main/java/com/example/duplicate/service/impl/MessageSubordinateServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/MessageSubordinateServiceImpl.java deleted file mode 100644 index 8d850fa..0000000 --- a/src/main/java/com/example/duplicate/service/impl/MessageSubordinateServiceImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.example.duplicate.service.impl; - - -import com.example.duplicate.controller.vo.ArchiveMasterVo; -import com.example.duplicate.controller.vo.MessageLog; -import com.example.duplicate.controller.vo.MessageSubordinate; -import com.example.duplicate.controller.vo.MessageSubordinateVo; -import com.example.duplicate.infrastructure.configOneDao.ArchiveMasterMapper; -import com.example.duplicate.infrastructure.configOneDao.MessageLogMapper; -import com.example.duplicate.infrastructure.configOneDao.MessageSubordinateMapper; -import com.example.duplicate.infrastructure.configTwoDao.MessageLogTwoMapper; -import com.example.duplicate.infrastructure.configTwoDao.MessageSubordinateTwoMapper; -import com.example.duplicate.service.MessageSubordinateService; -import com.example.utils.ListUtilsNew; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.ListUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * @ClassName ZJYYServiceImpl - * @Description 湛江医院接口实现类 - * @Author linjj - * @Date 2023/10/13 13:50 - * @Version 1.0 - */ -@Service -@Slf4j -public class MessageSubordinateServiceImpl implements MessageSubordinateService { - - static final Logger logger = LoggerFactory.getLogger(MessageSubordinateServiceImpl.class); - - @Value("${ZJ_DATE_TIME_MESSAGE}") - private String dateTime; - @Autowired - MessageSubordinateMapper messageSubordinateMapper; - @Autowired - MessageSubordinateTwoMapper messageSubordinateTwoMapper; - @Autowired - ArchiveMasterMapper archiveMasterMapper; - @Autowired - MessageLogMapper messageLogMapper; - @Autowired - MessageLogTwoMapper messageLogTwoMapper; - - - @Override - public int delMessage() { - //查询需要删除数据条数 - int messageNum = messageSubordinateMapper.getMessageNum(dateTime); - //需要次数 - double num = ((double) messageNum) / 100; - int circulateNum = (int) Math.ceil(num); - for (int i = 0; i < circulateNum; i++) { - //查询需要删除数据的id每次查100条 - List list = messageSubordinateMapper.getAllByIds(); - //id集合 - List idList = ListUtilsNew.distinctSelect(list, MessageSubordinateVo::getId); - //转成逗号拼接 - String ids = String.join(",", idList); - messageSubordinateMapper.del(ids); - } - return 1; - } - - @Override - public int addMessage() { - //查询一共有多少份病历需要同步 - int masterIdNum = archiveMasterMapper.masterIdNum(dateTime); - //需要次数 - double num = ((double) masterIdNum) / 100; - //少数往前进1确保不丢失数据 - int circulateNum = (int) Math.ceil(num); - for (int i = 0; i < circulateNum; i++) { - //每次查询100份病历 - List masterId = archiveMasterMapper.getMasterId(dateTime); - if (masterId.size() == 0) { - return 0; - } - //masterId集合 - List idList = ListUtilsNew.distinctSelect(masterId, ArchiveMasterVo::getId); - //转成逗号拼接 - String masterIds = String.join(",", idList); - //根据masterId查询message_log表 - List messageLogList = messageLogMapper.getAllByMasterId(masterIds); - //获取message_log表id集合 - List messageLogId = ListUtilsNew.distinctSelect(messageLogList, MessageLog::getId); - //如果档次100条记录没有messageLogId那么保存记录后结束本次循环 - if (messageLogId.size() == 0) { - //保存处理过的masterId - archiveMasterMapper.add(idList); - continue; - } - //根据message_log表id操作message_subordinate表 - messageSubordinate(messageLogId); - //操作完message_subordinate表操作message_log表 - messageLog(messageLogList); - //保存处理过的masterId - archiveMasterMapper.add(idList); - } - return 0; - } - - private void messageSubordinate(List messageLogId) { - //分批次 - List> newList = ListUtils.partition(messageLogId, 100); - for (List messageList : newList) { - //转成字符串类型逗号拼接 - String messageLogIds = String.join(",", messageList); - //查询100条 - List list = messageSubordinateMapper.getAllByMessageLogId(messageLogIds); - if (list.size()==0){ - continue; - } - //往新表插入 - messageSubordinateTwoMapper.addAll(list); - //新表插入完成删除旧表 - messageSubordinateMapper.del(messageLogIds); - } - } - - private void messageLog(List messageLogList) { - List> newList = ListUtils.partition(messageLogList, 100); - for (List messageList : newList) { - //往新表中拆入数据 - messageLogTwoMapper.addAll(messageList); - //获取这100条message_log表id集合 - List ids = ListUtilsNew.distinctSelect(messageList, MessageLog::getId); - //移除旧表数据 - String messageLogIds = String.join(",", ids); - messageLogMapper.del(messageLogIds); - } - - - } - -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2c4ed94..3d925bd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,30 +5,10 @@ server: spring: datasource: -# db1: #数据源1 -# jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=DB_PrivilegeManagement_LZRMYY -# username: sa -# password: docus@904 -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# type: com.alibaba.druid.pool.DruidDataSource -# db2: #数据源2 -# jdbc-url: jdbc:sqlserver://10.6.1.125:1433;DatabaseName=beifen -# username: sa -# password: Sql@2012 -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# type: com.alibaba.druid.pool.DruidDataSource - db1: #数据源1 - jdbc-url: jdbc:sqlserver://192.168.2.22:1433;DatabaseName=qf_record_lin - username: sa - password: 123456 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - type: com.alibaba.druid.pool.DruidDataSource - db2: #数据源2 - jdbc-url: jdbc:sqlserver://192.168.2.22:1433;DatabaseName=gzsrm - username: sa - password: 123456 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:mysql://127.0.0.1:3306/docus_archivefile?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8 + username: root + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver #加快springboot初始化，延缓初始化加载 main: lazy-initialization: true diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2dd4c69..baf0a53 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -14,7 +14,7 @@ - D:\logs\springbootDemo.log + ./logs/springbootDemo.log @@ -31,7 +31,7 @@ - [%d{yyyy-MM-dd' 'HH:mm:ss.sss}] [%C] [%t] [%X{traceId}] [%L] [%-5p] %m%n + [%L] [%-5p] %m%n utf-8 diff --git a/src/main/resources/mapper/ArchiveDetailMapper.xml b/src/main/resources/mapper/ArchiveDetailMapper.xml index 7e1bde5..aae248c 100644 --- a/src/main/resources/mapper/ArchiveDetailMapper.xml +++ b/src/main/resources/mapper/ArchiveDetailMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/ArchiveMasterMapper.xml b/src/main/resources/mapper/ArchiveMasterMapper.xml index 657ee54..e6f8c3e 100644 --- a/src/main/resources/mapper/ArchiveMasterMapper.xml +++ b/src/main/resources/mapper/ArchiveMasterMapper.xml @@ -2,7 +2,7 @@ - + insert into master_id (masterId) values diff --git a/src/main/resources/mapper/CommomtableMapper.xml b/src/main/resources/mapper/CommomtableMapper.xml index 87d755c..cc12cea 100644 --- a/src/main/resources/mapper/CommomtableMapper.xml +++ b/src/main/resources/mapper/CommomtableMapper.xml @@ -2,7 +2,7 @@ - + insert into CommonTable (patient_id, admiss_id, admiss_times, inpatient_no, name, dis_date, dis_dept_name, ph, gdh,splitName) diff --git a/src/main/resources/mapper/LzRmMapper.xml b/src/main/resources/mapper/LzRmMapper.xml index 03f06b7..f34f3b8 100644 --- a/src/main/resources/mapper/LzRmMapper.xml +++ b/src/main/resources/mapper/LzRmMapper.xml @@ -1,6 +1,6 @@ - + update commomtable_copy set spilStatic=#{spilStatic} diff --git a/src/main/resources/mapper/MessageLogMapper.xml b/src/main/resources/mapper/MessageLogMapper.xml index 1ec934e..f0516b6 100644 --- a/src/main/resources/mapper/MessageLogMapper.xml +++ b/src/main/resources/mapper/MessageLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/MessageSubordinateMapper.xml b/src/main/resources/mapper/MessageSubordinateMapper.xml index aee8bd8..a5f9dcb 100644 --- a/src/main/resources/mapper/MessageSubordinateMapper.xml +++ b/src/main/resources/mapper/MessageSubordinateMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mapper/MidMapper.xml b/src/main/resources/mapper/MidMapper.xml index 91eba26..3875627 100644 --- a/src/main/resources/mapper/MidMapper.xml +++ b/src/main/resources/mapper/MidMapper.xml @@ -1,6 +1,6 @@ - +