diff --git a/pom.xml b/pom.xml index 7c04ee9..a43f835 100644 --- a/pom.xml +++ b/pom.xml @@ -1,186 +1,105 @@ - 4.0.0 + org.springframework.boot spring-boot-starter-parent 2.3.8.RELEASE + com.example - springbootDemo + tool_zj 0.0.1-SNAPSHOT + jar springbootDemo springbootDemo + 1.8 - true 3.4.1 1.2.1 - 2.0.9 - 2.0.11 - 2.6.0 - 2.1.7 + + org.springframework.boot spring-boot-starter-web - + - io.springfox - springfox-swagger-ui - 2.9.2 + com.baomidou + mybatis-plus-boot-starter + ${mybatisPlus.version} + - io.springfox - springfox-swagger2 - 2.9.2 + org.apache.commons + commons-lang3 + 3.12.0 - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-data-jpa + - org.projectlombok - lombok + org.apache.httpcomponents + httpclient + 4.5.13 - - - com.baomidou - mybatis-plus-boot-starter - ${mybatisPlus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatisPlus.version} - - - mysql - mysql-connector-java - - + + com.alibaba - druid-spring-boot-starter - ${alibabadruid.version} + fastjson + 1.2.4 - org.apache.commons - commons-collections4 - 4.4 + org.projectlombok + lombok + true com.github.xiaoymin knife4j-spring-boot-starter - ${knife4j.version} + 2.0.9 - + com.alibaba - fastjson - ${fastjson.version} - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.apache.commons - commons-pool2 - ${commons-pool2.version} - - - - - - org.ofdrw - ofdrw-full - 2.3.0 - - - - - org.springframework - spring-test - - - - org.apache.pdfbox - pdfbox - 2.0.24 - - - com.lowagie - itext - 2.1.7 - - - org.eclipse.birt.runtime.3_7_1 - com.lowagie.text - 2.1.7 + druid-spring-boot-starter + ${alibabadruid.version} - - - - org.springframework.boot - spring-boot-starter-quartz - - - + com.microsoft.sqlserver sqljdbc4 4.0 + + + - org.apache.commons - commons-lang3 - 3.10 + org.springframework.boot + spring-boot-starter-test + test - - - wsjz-releases - Releases Repository - http://localhost:8081/nexus/content/repositories/releases/ - - - wsjz-snapshots - Snapshot Repository - http://localhost:8081/nexus/content/repositories/snapshots/ - - + org.springframework.boot spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - + \ No newline at end of file diff --git a/src/main/java/com/example/QuartzConfig.java b/src/main/java/com/example/QuartzConfig.java deleted file mode 100644 index 993dfd2..0000000 --- a/src/main/java/com/example/QuartzConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example; - -import org.quartz.*; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @ClassName QuartzConfig - * @Description - * @Author linjj - * @Date 2023/8/14 15:47 - * @Version 1.0 - */ -@Configuration -public class QuartzConfig { - - @Bean - public JobDetail teatQuartzDetail(){ - - return JobBuilder.newJob(TestQuartz.class).withIdentity("testQuartz").storeDurably().build(); - - } - - @Bean - public Trigger testQuartzTrigger(){ - - return TriggerBuilder.newTrigger().forJob(teatQuartzDetail()) - - .withIdentity("testQuartz") - .withSchedule(CronScheduleBuilder.cronSchedule("0 0 1 * * ?")) - .build(); - - } -} diff --git a/src/main/java/com/example/SpringbootDemoApplication.java b/src/main/java/com/example/SpringbootDemoApplication.java index 5dc3e33..84e5c17 100644 --- a/src/main/java/com/example/SpringbootDemoApplication.java +++ b/src/main/java/com/example/SpringbootDemoApplication.java @@ -12,11 +12,11 @@ import org.springframework.util.FileSystemUtils; import java.io.File; /** - * @author 曾文和 + * @author linjj */ @SpringBootApplication -@MapperScan("com.example.duplicate.infrastructure.dao") +@MapperScan("com.example.db.dao") public class SpringbootDemoApplication { public static void main(String[] args) { SpringApplication.run(SpringbootDemoApplication.class, args); diff --git a/src/main/java/com/example/TestQuartz.java b/src/main/java/com/example/TestQuartz.java deleted file mode 100644 index 782cd98..0000000 --- a/src/main/java/com/example/TestQuartz.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.example; - - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.quartz.QuartzJobBean; - -import java.io.File; - - -public class TestQuartz extends QuartzJobBean { - - - @Value("${waterPicPath}") - private String waterPicPath; - - @Value("${waterPicPathFlag}") - private String waterPicPathFlag; - - - - - @Override - protected void executeInternal(JobExecutionContext jobExecutionContext) { - if (waterPicPathFlag == "0") { - return; - } - String filePath = waterPicPath; - File file = new File(filePath); - if (file.isDirectory()) { - for (File f : file.listFiles()) { - f.delete(); - } - } - } -} diff --git a/src/main/java/com/example/config/Knife4jConfiguration.java b/src/main/java/com/example/config/Knife4jConfiguration.java new file mode 100644 index 0000000..5037cb6 --- /dev/null +++ b/src/main/java/com/example/config/Knife4jConfiguration.java @@ -0,0 +1,57 @@ +package com.example.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.Parameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +import java.util.ArrayList; +import java.util.List; + + +@Configuration +@EnableSwagger2WebMvc +public class Knife4jConfiguration { + /** + * 需要配置controller层包名 + */ + String controllerPackagePath = "com.example"; + @Bean(value = "defaultApi2") + public Docket defaultApi2() { + List pars = new ArrayList<>(); + ParameterBuilder tokenPar = new ParameterBuilder(); + tokenPar.name("token") + .description("用户token") + .defaultValue("") + .modelRef(new ModelRef("string")) + .parameterType("header") + .required(false) + .build(); + pars.add(tokenPar.build()); + //添加head参数end + + Docket docket=new Docket(DocumentationType.SWAGGER_2) + .apiInfo(new ApiInfoBuilder() + //.title("swagger-bootstrap-ui-demo RESTful APIs") + .description("# swagger-bootstrap-ui-demo RESTful APIs") + .termsOfServiceUrl("www.codeleader.top") + .version("1.0") + .build()) + .globalOperationParameters(pars) + //分组名称 + .groupName("2.X版本") + .select() + //这里指定Controller扫描包路径 + .apis(RequestHandlerSelectors.basePackage(controllerPackagePath)) + .paths(PathSelectors.any()) + .build(); + return docket; + } +} diff --git a/src/main/java/com/example/controller/SubordinateController.java b/src/main/java/com/example/controller/SubordinateController.java new file mode 100644 index 0000000..6177908 --- /dev/null +++ b/src/main/java/com/example/controller/SubordinateController.java @@ -0,0 +1,35 @@ +package com.example.controller; + +import com.example.service.SubordinateService; +import com.example.utils.CommonResult; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName ZJYYController + * @Description 湛江医院接口 + * @Author linjj + * @Date 2025/4/8 10:33 + * @Version 1.0 + */ +@RestController +@RequestMapping("/subordinate") +@Api(value = "湛江医院处理消息接口", tags = "湛江医院处理消息接口") +@Slf4j +public class SubordinateController { + @Autowired + private SubordinateService subordinateService; + @PostMapping("/againTask") + @ApiOperation("重新采集文件下载器任务接口") + @ResponseBody + public CommonResult AgainTask() { + return subordinateService.CompensateTask(); + } + +} diff --git a/src/main/java/com/example/db/dao/ArchiveDetailDao.java b/src/main/java/com/example/db/dao/ArchiveDetailDao.java new file mode 100644 index 0000000..c768c9b --- /dev/null +++ b/src/main/java/com/example/db/dao/ArchiveDetailDao.java @@ -0,0 +1,19 @@ +package com.example.db.dao; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName ArchiveDetailDao + * @Description 文件表接口 + * @Author linjj + * @Date 2025/4/8 16:08 + * @Version 1.0 + */ +@Mapper +public interface ArchiveDetailDao { + + List getPdfPath(@Param("masterId") String masterId, @Param("applyId") String applyId); +} diff --git a/src/main/java/com/example/db/dao/ArchiveMasterDao.java b/src/main/java/com/example/db/dao/ArchiveMasterDao.java new file mode 100644 index 0000000..72c6c93 --- /dev/null +++ b/src/main/java/com/example/db/dao/ArchiveMasterDao.java @@ -0,0 +1,19 @@ +package com.example.db.dao; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName ArchiveMasterDao + * @Description 患者基础信息接口 + * @Author linjj + * @Date 2025/4/8 15:54 + * @Version 1.0 + */ +@Mapper +public interface ArchiveMasterDao { + + List getMasterIdByInpNoAndVisitId(@Param("inpNo")String inpNo, @Param("visitId")String visitId); +} diff --git a/src/main/java/com/example/db/dao/MessageSubordinateDao.java b/src/main/java/com/example/db/dao/MessageSubordinateDao.java new file mode 100644 index 0000000..0e59309 --- /dev/null +++ b/src/main/java/com/example/db/dao/MessageSubordinateDao.java @@ -0,0 +1,34 @@ +package com.example.db.dao; + +import com.example.vo.MessageSubordinateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName MessageSubordinateDao + * @Description MessageSubordinate接口 + * @Author linjj + * @Date 2025/4/8 11:02 + * @Version 1.0 + */ +@Mapper +public interface MessageSubordinateDao { + /** + * @Author: linjj + * @Description: 查询需要重新采集的消息体 + * @DateTime: 2025/4/8 11:04 + * @Params: [] + * @Return java.util.List + */ + List getMessageSubordinate(Integer status); + /** + * @Author: linjj + * @Description: 修改文件状态 + * @DateTime: 2025/4/8 16:18 + * @Params: [status] + * @Return java.lang.Boolean + */ + Boolean updateStatus(@Param("status")Integer status, @Param("id")String id); +} diff --git a/src/main/java/com/example/duplicate/common/CommonUtil.java b/src/main/java/com/example/duplicate/common/CommonUtil.java deleted file mode 100644 index 28b7687..0000000 --- a/src/main/java/com/example/duplicate/common/CommonUtil.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.duplicate.common; - -public class CommonUtil { - public static final String USERKEY = "hj:mr:user"; - - public static final int DEFAULTPAGESIZE = 1000; -} diff --git a/src/main/java/com/example/duplicate/common/ResultBody.java b/src/main/java/com/example/duplicate/common/ResultBody.java deleted file mode 100644 index 52c09ec..0000000 --- a/src/main/java/com/example/duplicate/common/ResultBody.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.example.duplicate.common; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author 曾文和 - * @description: XXX类 - * @createTime 2023/5/9 15:25 - */ -@Data -@ApiModel("响应") -public class ResultBody { - @ApiModelProperty("响应码") - private Integer code; - @ApiModelProperty("响应消息") - private String msg; - @ApiModelProperty("响应实体") - private T data; - - private ResultBody(Integer code, String msg,T data) { - this.code = code; - this.msg = msg; - this.data = data; - } - private ResultBody(Integer code, String msg) { - this.code = code; - this.msg = msg; - } - - public static ResultBody success(T data) { - ResultBody result = new ResultBody(200, "success",data); - return result; - } - - public static ResultBody failed(String msg) { - ResultBody result = new ResultBody(500,msg); - return result; - } -} 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/config/SwaggerConfig.java b/src/main/java/com/example/duplicate/config/SwaggerConfig.java deleted file mode 100644 index b2074f0..0000000 --- a/src/main/java/com/example/duplicate/config/SwaggerConfig.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.example.duplicate.config; - - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.ResourceUtils; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * @ClassName SwaggerConfig - * @Description swagger配置类 - * @Author linjj - * @Date 2023/11/13 10:02 - * @Version 1.0 - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig extends WebMvcConfigurationSupport { - - @Bean - public Docket createRestApi() { - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(apiInfo()) - //是否开启 (true 开启 false隐藏。生产环境建议隐藏) - //.enable(false) - .select() - //扫描的路径包,设置basePackage会将包下的所有被@Api标记类的所有方法作为api - .apis(RequestHandlerSelectors.basePackage("com.example.duplicate.controller")) - //指定路径处理PathSelectors.any()代表所有的路径 - .paths(PathSelectors.any()) - .build(); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() -// .title("明阳HR集成AD接口") -// .description("使用RestFul风格, 创建人:白领说事") -// .version("1.0") -// .build(); - //设置文档标题(API名称) - .title("接口测试") - //文档描述 - .description("接口说明") -// //服务条款URL -// .termsOfServiceUrl("http://localhost:8089/") - //版本号 - .version("1.0.0") - .build(); - } - - @Override - protected void addResourceHandlers(ResourceHandlerRegistry registry) { - // 解决静态资源无法访问 - registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); - // 解决swagger无法访问 - registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); - // 解决swagger的js文件无法访问 - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - } - - - - -} diff --git a/src/main/java/com/example/duplicate/controller/DuplicateController.java b/src/main/java/com/example/duplicate/controller/DuplicateController.java deleted file mode 100644 index 45e2110..0000000 --- a/src/main/java/com/example/duplicate/controller/DuplicateController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.example.duplicate.controller; - - -import com.alibaba.fastjson.JSON; - -import com.example.duplicate.common.ResultBody; -import com.example.duplicate.service.DuplicateService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @ClassName DuplicateController - * @Description 医院复印预约接口 - * @Author linjj - * @Date 2023/5/12 11:22 - * @Version 1.0 - */ -@RestController -@RequestMapping("/duplicate") -@Api(value="测试",tags = "对外接口") -public class DuplicateController { - - - - @Autowired - DuplicateService duplicateService; - - @RequestMapping(value = "getFilePath", method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value="微信接口") - public ResultBody getFilePath(String inpatientNo, Integer admissTimes) { - if (StringUtils.isEmpty(inpatientNo)) { - return ResultBody.failed("住院号不得为空"); - } - if (null == admissTimes) { - return ResultBody.failed("住院次数不得为空"); - } - return ResultBody.success(duplicateService.getFilePath(inpatientNo, admissTimes)); - } - - - /** - * @description: 高级检查 - * @params: startRange - * @params: endRange - * @return: String - * @author linjj - * @date: 2023/4/14 9:32 - */ - @RequestMapping(value = "SeniorExamine", method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value="文件质检接口") - public String SeniorExamine(String startRange, String endRange) { - if (StringUtils.isEmpty(startRange) && StringUtils.isEmpty(endRange)) { - return "开始范围,结束范围不能全部为空"; - } - if (StringUtils.isNotEmpty(startRange) && StringUtils.isNotEmpty(endRange)) { - if (startRange.compareTo(endRange) > 0) { - return "开始范围不能小于结束范围"; - } - } - String s = duplicateService.SeniorExamine(startRange, endRange); - return JSON.toJSONString(s); - } - - - -} diff --git a/src/main/java/com/example/duplicate/controller/LzRmController.java b/src/main/java/com/example/duplicate/controller/LzRmController.java deleted file mode 100644 index 7642349..0000000 --- a/src/main/java/com/example/duplicate/controller/LzRmController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.duplicate.controller; - - -import com.example.duplicate.common.ResultBody; -import com.example.duplicate.service.LzRmService; -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; - -/** - * @ClassName LzRmController - * @Description 连州人民接口 - * @Author linjj - * @Date 2023/11/10 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/LzRm") -@Api(value = "连州人民接口", tags = "连州人民相关接口", description = "连州人民相关接口") -public class LzRmController { - @Autowired - private LzRmService lzRmService; - @ResponseBody - @RequestMapping(value = "splitFile", method = RequestMethod.POST) - @ApiOperation(value = "拆分影像信息", notes = "拆分影像信息") - public ResultBody LzRmSplit(){ - int i = lzRmService.LzRmSplit(); - if (i==1){ - return ResultBody.success("完成"); - } - 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/controller/param/Package.java b/src/main/java/com/example/duplicate/controller/param/Package.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/duplicate/controller/vo/AddLzRmCommVo.java b/src/main/java/com/example/duplicate/controller/vo/AddLzRmCommVo.java deleted file mode 100644 index a695d02..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/AddLzRmCommVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName addLzRmCommVo - * @Description 连州人民新增commomtableVo - * @Author linjj - * @Date 2023/11/17 9:14 - * @Version 1.0 - */ -@Data -public class AddLzRmCommVo { - - private String patientId; - - private String admissId; - - private String admissTimes; - - private String inpatientNo; - - private String name; - - private String disDate; - - private String disDeptName; - - private String ph; - - private String gdh; - - private String splitName; - - -} diff --git a/src/main/java/com/example/duplicate/controller/vo/AddMessageLogVo.java b/src/main/java/com/example/duplicate/controller/vo/AddMessageLogVo.java deleted file mode 100644 index 1bf0705..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/AddMessageLogVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.example.duplicate.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @ClassName MessageLog - * @Description - * @Author linjj - * @Date 2023/10/13 15:15 - * @Version 1.0 - */ -@Data -@TableName("message_log") -public class AddMessageLogVo { - - @TableField("id") - private String id; - @TableField("create_time") - private String createTime; - @TableField("end_time") - private String endTime; - @TableField("execution_time") - private int executionTime; - @TableField("input_content") - private String inputContent; - @TableField("interface_name") - private String interfaceName; - @TableField("out_content") - private String outContent; - @TableField("out_json") - private String outJson; - @TableField("remark") - private String remark; - @TableField("result") - private int result; - @TableField("type") - private String type; - @TableField("xml_create_time") - private String xmlCreateTime; - @TableField("xml_execution_time") - private int xml_execution_time; - @TableField("master_id") - private String masterId; - @TableField("webservice_info") - private String webserviceInfo; - @TableField("discharge_date_time") - private String dischargeDateTime; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/ArchiveMasterVo.java b/src/main/java/com/example/duplicate/controller/vo/ArchiveMasterVo.java deleted file mode 100644 index 9349a4c..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/ArchiveMasterVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName ArchiveMasterVo - * @Description - * @Author linjj - * @Date 2023/10/17 10:15 - * @Version 1.0 - */ -@Data -public class ArchiveMasterVo { - - private String id; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java b/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java deleted file mode 100644 index 11d0eaa..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName CommomtableCopy - * @Author linjj - * @Date 2023/11/10 16:01 - * @Version 1.0 - */ -@Data -public class CommomtableCopyVo { - - private String id; - //患者姓名 - private String name; - //住院号 - private String inpatientNo; - //住院次数 - private String admissTimes; - //出院时间 - private String disDate; - //图像号 - private String pageNumber; - //旧病案号 - private String inpatientNoPast; - //出院科室 - private String disDept; - //盘号 - private String ph; - //盘号格式 - private String phString; - //拆分状态 - private int spilStatic; - -} diff --git a/src/main/java/com/example/duplicate/controller/vo/CommomtableVo.java b/src/main/java/com/example/duplicate/controller/vo/CommomtableVo.java deleted file mode 100644 index e0351f5..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/CommomtableVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.duplicate.controller.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * @ClassName commomtableVo - * @Description commomtable表 - * @Author linjj - * @Date 2023/5/12 15:57 - * @Version 1.0 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="commomtable表对象", description="查询路径返回参数实体") -public class CommomtableVo { - - @ApiModelProperty(value = "文件保存目录地址") - private String filePath; - @ApiModelProperty(value = "图片类型") - private String assortName; - @ApiModelProperty(value = "文件类型id") - private String assortId; - - -} diff --git a/src/main/java/com/example/duplicate/controller/vo/DuplicateVo.java b/src/main/java/com/example/duplicate/controller/vo/DuplicateVo.java deleted file mode 100644 index 46fa2e2..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/DuplicateVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.duplicate.controller.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * @ClassName commomtableVo - * @Description 返回给第三方路径参数 - * @Author linjj - * @Date 2023/5/12 15:57 - * @Version 1.0 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class DuplicateVo { - - @ApiModelProperty(value = "标题") - private String title; - @ApiModelProperty(value = "文件分类") - private String assortName; - @ApiModelProperty(value = "页数") - private String pageCount; - @ApiModelProperty(value = "路径") - private String pdfUrl; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/FliePath.java b/src/main/java/com/example/duplicate/controller/vo/FliePath.java deleted file mode 100644 index 427a1c5..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/FliePath.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.duplicate.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @ClassName fliePath - * @Description - * @Author linjj - * @Date 2023/6/6 15:45 - * @Version 1.0 - */ - -@Data -@TableName("fliePath") -public class FliePath { - - @TableField("ph") - private String patientId; - - @TableField("fliePath") - private String fliePath; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/MessageLog.java b/src/main/java/com/example/duplicate/controller/vo/MessageLog.java deleted file mode 100644 index b073ee7..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/MessageLog.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.example.duplicate.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @ClassName MessageLog - * @Description - * @Author linjj - * @Date 2023/10/13 15:15 - * @Version 1.0 - */ -@Data -public class MessageLog { - -// @TableField("id") -// private String id; -// @TableField("create_time") -// private String createTime; -// @TableField("end_time") -// private String endTime; -// @TableField("execution_time") -// private int executionTime; -// @TableField("input_content") -// private String inputContent; -// @TableField("interface_name") -// private String interfaceName; -// @TableField("out_content") -// private String outContent; -// @TableField("out_json") -// private String outJson; -// @TableField("remark") -// private String remark; -// @TableField("result") -// private int result; -// @TableField("type") -// private String type; -// @TableField("xml_create_time") -// private String xmlCreateTime; -// @TableField("xml_execution_time") -// private int xmlExecutionTime; -// @TableField("master_id") -// private String masterId; -// @TableField("webservice_info") -// private String webserviceInfo; -// @TableField(exist = false) -// private String dischargeDateTime; - - - - - private String id; - - private String createTime; - - private String endTime; - - private int executionTime; - - private String inputContent; - - private String interfaceName; - - private String outContent; - - private String outJson; - - private String remark; - - private int result; - - private String type; - - private String xmlCreateTime; - - private int xmlExecutionTime; - - private String masterId; - private String webserviceInfo; - private String dischargeDateTime; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/MessageLogVo.java b/src/main/java/com/example/duplicate/controller/vo/MessageLogVo.java deleted file mode 100644 index 566f759..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/MessageLogVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName MessageLogVo - * @Description 返回实体 - * @Author linjj - * @Date 2023/10/13 15:25 - * @Version 1.0 - */ -@Data -public class MessageLogVo { - private String id; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/MessageSubordinate.java b/src/main/java/com/example/duplicate/controller/vo/MessageSubordinate.java deleted file mode 100644 index 524ec5c..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/MessageSubordinate.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example.duplicate.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -/** - * @ClassName MessageSubordinate - * @Description - * @Author linjj - * @Date 2023/10/13 15:00 - * @Version 1.0 - */ -@Data -public class MessageSubordinate { -// @TableField("id") -// private String id; -// @TableField("content_json") -// private String contentJson; -// @TableField("message_id") -// private String messageId; -// @TableField("patient_main") -// private String patientMain; -// @TableField("status") -// private int status; -// @TableField("remark") -// private String remark; -// @TableField("runs") -// private int runs; - - - private String id; - - private String contentJson; - - private String messageId; - - private String patientMain; - - private int status; - - private String remark; - private int runs; - private String dischargeDateTime; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/MessageSubordinateVo.java b/src/main/java/com/example/duplicate/controller/vo/MessageSubordinateVo.java deleted file mode 100644 index 97aa5f0..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/MessageSubordinateVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName MessageSubordinateVo - * @Author linjj - * @Date 2023/10/13 14:03 - * @Version 1.0 - */ -@Data -public class MessageSubordinateVo { - private String id; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/PageCountVo.java b/src/main/java/com/example/duplicate/controller/vo/PageCountVo.java deleted file mode 100644 index 2bc2a6c..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/PageCountVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.duplicate.controller.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * @ClassName commomtableVo - * @Description commomtable表 - * @Author linjj - * @Date 2023/5/12 15:57 - * @Version 1.0 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="commomtable表对象", description="查询路径返回参数实体") -public class PageCountVo { - - @ApiModelProperty(value = "文件类型") - private String assortName; - @ApiModelProperty(value = "文件数量") - private String pageCount; - - -} diff --git a/src/main/java/com/example/duplicate/controller/vo/PhVo.java b/src/main/java/com/example/duplicate/controller/vo/PhVo.java deleted file mode 100644 index 4f72fae..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/PhVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName phVo - * @Description - * @Author linjj - * @Date 2023/6/5 16:21 - * @Version 1.0 - */ -@Data -public class PhVo { - - private String ph; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/TscanAssort.java b/src/main/java/com/example/duplicate/controller/vo/TscanAssort.java deleted file mode 100644 index 00b8958..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/TscanAssort.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName TscanAssort - * @Description - * @Author linjj - * @Date 2023/6/6 13:43 - * @Version 1.0 - */ -@Data -public class TscanAssort { - private String patientId; - private String assortId; - private String scanPage; - - private Integer source; - - private Integer isDel; -} diff --git a/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java b/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java deleted file mode 100644 index 3022ae4..0000000 --- a/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.duplicate.controller.vo; - -import lombok.Data; - -/** - * @ClassName ZdAssortVo - * @Author linjj - * @Date 2023/11/13 9:31 - * @Version 1.0 - */ -@Data -public class ZdAssortVo { - //分段id - private String assortId; - //分段名称 - private String assortName; - //分段排序 - private String assortSort; - //打印标识 - private String printFlag; - //病案id - private String patientId; - private String DISCHARGEDISPOSITION; - //文件路径 - private String PDFPATH; - //标识 - private String flag; - //来源 - private String Sys; - //最近更新时间 - private String UpLoadDateTime; -} diff --git a/src/main/java/com/example/duplicate/infrastructure/cache/Package.java b/src/main/java/com/example/duplicate/infrastructure/cache/Package.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/duplicate/infrastructure/client/Package.java b/src/main/java/com/example/duplicate/infrastructure/client/Package.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java deleted file mode 100644 index 5fa8842..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveDetailMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - -import com.example.duplicate.controller.vo.AddArchiveDetail; -import org.apache.ibatis.annotations.Mapper; - -/** - * @InterfaceName ArchiveDetailMapper - * @Description 文件表实体 - * @Author linjj - * @Date 2023/11/13 16:04 - * @Version 1.0 - */ -@Mapper -public interface ArchiveDetailMapper { - - int addArchiveDetail(AddArchiveDetail addArchiveDetail); -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java deleted file mode 100644 index 9860e6d..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/ArchiveMasterMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - -import com.example.duplicate.controller.vo.AddArchiveMasterVo; -import com.example.duplicate.controller.vo.ArchiveMasterVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @InterfaceName ArchiveMasterMapper - * @Author linjj - * @Date 2023/10/16 19:36 - * @Version 1.0 - */ -@Mapper -public interface ArchiveMasterMapper { - - List getMasterId(String dateTime); - - int masterIdNum(String dateTime); - - int add(@Param("idList") List idList); - - - int addArchiveMaster(AddArchiveMasterVo addArchiveMasterVo); - - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java deleted file mode 100644 index 9af54ed..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/CommomtableMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - - -import com.example.duplicate.controller.vo.AddLzRmCommVo; -import com.example.duplicate.controller.vo.CommomtableCopyVo; -import com.example.duplicate.controller.vo.CommomtableVo; -import com.example.duplicate.controller.vo.PageCountVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @InterfaceName CommomtableMapper - * @Description 路径信息Mapper接口 - * @Author linjj - * @Date 2023/5/12 16:30 - * @Version 1.0 - */ -@Mapper -public interface CommomtableMapper { - - List getCommomtable(@Param("inpatientNo")String inpatientNo, @Param("admissTimes")Integer admissTimes,@Param("assortId") String assortId); - - - List getZdAssort(@Param("inpatientNo")String inpatientNo, @Param("admissTimes")Integer admissTimes); - - - PageCountVo getPageCount(@Param("inpatientNo")String inpatientNo, @Param("admissTimes")Integer admissTimes, @Param("assortId") String assortId); - - int addAddLzRmComm(AddLzRmCommVo addLzRmCommVo); - - Listcom(); - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java deleted file mode 100644 index c15eb33..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/LzRmMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - -import com.example.duplicate.controller.vo.CommomtableCopyVo; -import com.example.duplicate.controller.vo.ZdAssortVo; -import org.apache.ibatis.annotations.Param; -import org.mapstruct.Mapper; - -import java.util.List; - -/** - * @InterfaceName LzRmMapper - * @Description - * @Author linjj - * @Date 2023/11/10 15:59 - * @Version 1.0 - */ -@Mapper -public interface LzRmMapper { - - List getCommomtableCopyInfo(); - - int updateSynchronousTime(@Param("spilStatic") int spilStatic,@Param("inpatientNoPast") String inpatientNoPast,@Param("phString") String phString,@Param("pageNumber") String pageNumber); - - - List getZdAssortInfo(@Param("inpNo") String inpNo, @Param("LockInfo") String LockInfo,@Param("assortName")String assortName); - - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java deleted file mode 100644 index 357a3bc..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageLogMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - - -import com.example.duplicate.controller.vo.MessageLog; -import com.example.duplicate.controller.vo.MessageLogVo; -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 MessageLogMapper { - - int getMessageLogNum(String dateTime); - - ListgetAllByIds(String dateTime); - - String getSynchronousTime(); - - int updateSynchronousTime(String dischargeDateTime); - - ListgetAllBy(String synchronousTime); - int del(@Param(value = "messageLogIds")String messageLogIds); - - ListgetAllByMasterId(@Param(value = "masterIds")String masterIds); -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java deleted file mode 100644 index f01871b..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MessageSubordinateMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - - -import com.example.duplicate.controller.vo.MessageSubordinate; -import com.example.duplicate.controller.vo.MessageSubordinateVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @ClassName messageSubordinateMapper - * @Description - * @Author linjj - * @Date 2023/10/13 13:58 - * @Version 1.0 - */ -@Mapper -public interface MessageSubordinateMapper { - - int getMessageNum(String dateTime); - - - ListgetAllByIds(); - - int del(@Param(value = "messageLogIds")String messageLogIds); - - String getSynchronousTime(); - - int updateSynchronousTime(String dischargeDateTime); - - - ListgetAllByTime(String synchronousTime); - - ListgetAllByMessageLogId(@Param(value = "messageLogIds")String messageLogIds); - - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java deleted file mode 100644 index 848b36c..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/MidMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - -import com.example.duplicate.controller.vo.AddArchiveDetail; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface MidMapper { - - List getMid(); - -} diff --git a/src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java b/src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java deleted file mode 100644 index 713ca32..0000000 --- a/src/main/java/com/example/duplicate/infrastructure/configOneDao/QualityMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.duplicate.infrastructure.configOneDao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.example.duplicate.controller.vo.FliePath; -import com.example.duplicate.controller.vo.PhVo; -import com.example.duplicate.controller.vo.TscanAssort; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @ClassName QualityMapper - * @Description 文件质检 - * @Author linjj - * @Date 2023/4/13 15:29 - * @Version 1.0 - */ -@Mapper -public interface QualityMapper extends BaseMapper { - - Integer getPhNum(@Param("startRange")String startRange, @Param("endRange")String endRange); - - Integer getFileNum(@Param("startRange")String startRange, @Param("endRange")String endRange); - - List getFliePath(@Param("ph")String ph); - List getFliePaths(@Param("phs")List phs); - ListgetPh(@Param("startRange")String startRange, @Param("endRange")String endRange); - - ListgetPhAndFliePath(@Param("startRange")String startRange, @Param("endRange")String endRange); - - int addPh(@Param("list")Listlist); - - int addFliePath(@Param("ph")String ph,@Param("fliePath")String fliePath); - - int addTscanAssort(TscanAssort tscanAssort); -} 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/service/DuplicateService.java b/src/main/java/com/example/duplicate/service/DuplicateService.java deleted file mode 100644 index 66aa533..0000000 --- a/src/main/java/com/example/duplicate/service/DuplicateService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.duplicate.service; - - - -import com.example.duplicate.controller.vo.DuplicateVo; - -import java.util.List; - -/** - * @InterfaceName DuplicateService - * @Description 174查询影响图片地址 服务 - * @Author linjj - * @Date 2023/5/12 15:55 - * @Version 1.0 - */ -public interface DuplicateService { - - List getFilePath(String inpatientNo, Integer admissTimes); - - - String SeniorExamine(String startRange,String endRange); -} \ No newline at end of file diff --git a/src/main/java/com/example/duplicate/service/LzRmService.java b/src/main/java/com/example/duplicate/service/LzRmService.java deleted file mode 100644 index 8b20279..0000000 --- a/src/main/java/com/example/duplicate/service/LzRmService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.duplicate.service; - -/** - * @InterfaceName LzRmService - * @Description - * @Author linjj - * @Date 2023/11/10 15:42 - * @Version 1.0 - */ -public interface LzRmService { - - int LzRmSplit(); -} 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 deleted file mode 100644 index df90e29..0000000 --- a/src/main/java/com/example/duplicate/service/impl/DuplicateServiceImpl.java +++ /dev/null @@ -1,183 +0,0 @@ -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.service.DuplicateService; -import com.lowagie.text.Document; -import com.lowagie.text.DocumentException; -import com.lowagie.text.Image; -import com.lowagie.text.PageSize; -import com.lowagie.text.pdf.PdfWriter; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.swing.*; -import java.io.*; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName DuplicateServiceImpl - * @Description 174查询影响图片地址实现类 - * @Author linjj - * @Date 2023/5/12 15:55 - * @Version 1.0 - */ -@Service -public class DuplicateServiceImpl extends ServiceImpl implements DuplicateService { - @Autowired - CommomtableMapper commomtableMapper; - @Value("${waterPicPath}") - private String waterPicPath; - - @Value("${EMR_RECORD_JSP}") - private String EMRRECORDJSP; - - @Autowired - QualityMapper qualityMapper; - - @Override - public List getFilePath(String inpatientNo, Integer admissTimes) { - //定义返回数据集合 - List list = new ArrayList<>(); - //根据住院号住院次数查询分段 - List zdAssort = commomtableMapper.getZdAssort(inpatientNo, admissTimes); - //根据分段查询路径 - for (CommomtableVo assortIdList : zdAssort) { - String assortId = assortIdList.getAssortId(); - //查询对应分类文件路径 - List commomtable = commomtableMapper.getCommomtable(inpatientNo, admissTimes, assortId); - //获取该分类标题、页数 - PageCountVo pageCount = commomtableMapper.getPageCount(inpatientNo, admissTimes, assortId); - String join = StringUtils.join(commomtable, ","); - List imageUrllist = Arrays.asList(join.split(",")); - //使用yyyyMMddHHmmssSSS格式作为文件名 - Date date = new Date(); - SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - String newDate = format.format(date); - imageToPdf(imageUrllist, waterPicPath, newDate); - String outSrc = EMRRECORDJSP + newDate + ".pdf"; - DuplicateVo duplicateVo = new DuplicateVo(); - duplicateVo.setTitle(pageCount.getAssortName()); - duplicateVo.setAssortName(pageCount.getAssortName()); - duplicateVo.setPageCount(pageCount.getPageCount()); - duplicateVo.setPdfUrl(outSrc); - list.add(duplicateVo); - } - return list; - } - - - /** - * imageUrllist：图片路径集合， - * mOutputPdfFileName：pdf输出位置 - * - * @param imageUrllist - * @param waterPicPath - * @return - */ - public static File imageToPdf(List imageUrllist, String waterPicPath, String newDate) { - if (!new File(waterPicPath).isDirectory()) { - new File(waterPicPath).mkdirs(); - } - Document document = new Document(PageSize.A4, 0, 0, 0, 0); //创建文档容器 - try { - PdfWriter.getInstance(document, new FileOutputStream(waterPicPath + "\\" + newDate + ".pdf")); - document.open(); - for (int i = 0; i < imageUrllist.size(); i++) { - document.newPage(); -// doc.add(new Paragraph("简单使用iText")); - Image png1 = Image.getInstance(imageUrllist.get(i)); - float heigth = png1.getHeight(); - float width = png1.getWidth(); - int percent = getPercent2(heigth, width); - png1.setAlignment(Image.MIDDLE); - png1.scalePercent(percent + 3);// 表示是原来图像的比例; - document.add(png1); - } - - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (DocumentException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - document.close(); - } - File mOutputPdfFile = new File(waterPicPath); - if (!mOutputPdfFile.exists()) { - mOutputPdfFile.deleteOnExit(); - return null; - } - return mOutputPdfFile; - } - - private static int getPercent2(float h, float w) { - int p = 0; - float p2 = 0.0f; - p2 = 530 / w * 100; - p = Math.round(p2); - return p; - } - - private String selectRootByNotWater(String srcPath) { - //获取盘符 - String str = srcPath.substring(0, 1).toUpperCase(); - switch (str) { - case "C": - return "reloadC\\"; - case "D": - return "reloadD\\"; - case "E": - return "reloadE\\"; - case "F": - return "reloadF\\"; - case "G": - return "reloadG\\"; - case "H": - return "reloadH\\"; - case "I": - return "reloadI\\"; - case "J": - return "reloadJ\\"; - case "K": - return "reloadK\\"; - default: - ; - } - return null; - } - - - @Override - public String SeniorExamine(String startRange, String endRange) { - //获取时间段内的病例 - //查600w条 - List fliePaths = qualityMapper.getPhAndFliePath(startRange, endRange); - //将600w根据patientId进行分组，key=10w个 - Map> collect = fliePaths.stream().collect(Collectors.groupingBy(FliePath::getPatientId)); - //保存错误信息 - List errors = new ArrayList<>(); - for (String k : collect.keySet()) { - List v = collect.get(k);//总共600w图片路径 - v.forEach(p -> { - ImageIcon imageIcon = new ImageIcon(p.getFliePath()); - //获取图片宽度无法获取图片损坏 - if (imageIcon.getIconHeight() == -1) { - errors.add(p);//损坏的图片路径存放 - } - }); - } - super.saveBatch(errors, 1); - return "完成"; - } - - -} diff --git a/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java deleted file mode 100644 index c0c790d..0000000 --- a/src/main/java/com/example/duplicate/service/impl/LzRmServiceImpl.java +++ /dev/null @@ -1,193 +0,0 @@ -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.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.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * @ClassName LzRmServiceImpl - * @Description - * @Author linjj - * @Date 2023/11/10 15:42 - * @Version 1.0 - */ -@Service -@Slf4j -public class LzRmServiceImpl implements LzRmService { - - - @Resource - private LzRmMapper lzRmMapper; - @Resource - private ArchiveMasterMapper archiveMasterMapper; - @Resource - private ArchiveDetailMapper archiveDetailMapper; - @Resource - private CommomtableMapper commomtableMapper; - - private static SimpleDateFormat inSDF = new SimpleDateFormat("yyyy.mm.dd"); - private static SimpleDateFormat outSDF = new SimpleDateFormat("yyyy-mm-dd"); - - @Override - public int LzRmSplit() { - //新增状态 - int addStatic = 0; - //查询需要处理记录 - List CommomtableCopyList = lzRmMapper.getCommomtableCopyInfo(); - //根据住院号盘号查询影像信息 - for (CommomtableCopyVo list : CommomtableCopyList) { - String LockInfo = list.getPh(); - String phString = list.getPhString(); - String pageNumber = list.getPageNumber(); - String inpatientNoPast = String.format("%010d", Integer.parseInt(list.getInpatientNoPast())); - //页码不存在跳出当前循环 - if (StringUtils.isBlank(pageNumber)) { - log.info("-------旧住院号：" + inpatientNoPast + "盘号:" + LockInfo + "新住院号:" + list.getInpatientNo() + "的病案页码为空-----------------"); - lzRmMapper.updateSynchronousTime(2,list.getInpatientNoPast(), phString, pageNumber); - continue; - } - //截取第一个数 - String assortName = intercept(list.getPageNumber()); - List zdAssorList = lzRmMapper.getZdAssortInfo(inpatientNoPast, LockInfo, assortName); - if (zdAssorList.isEmpty()) { - log.info("----------------旧住院号：" + inpatientNoPast + "盘号:" + LockInfo + "页码:" + assortName + "的病案不存在---------------------"); - lzRmMapper.updateSynchronousTime(3,list.getInpatientNoPast(), phString, pageNumber); - continue; - } - //插入一条数据到Archive_Master表跟Archive_Detail表 - addStatic = add(list, zdAssorList); - //修改状态 - lzRmMapper.updateSynchronousTime(1,list.getInpatientNoPast(), phString, pageNumber); - } - - return addStatic; - } - - /** - * @description: 插入一条数据到Archive_Master表 - * @params: commomtableCopyVo - * @params: zdAssorList - * @return: addArchiveMasterVo - * @author linjj - * @date: 2023/11/13 14:58 - */ - private int add(CommomtableCopyVo commomtableCopyVo, List zdAssorList) { - //新增文件表状态 - int addDetailStatic = 0; - //新增comm表状态 - int addAddLzRmCommStatic = 0; - //使用时间生成一个id - SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - //获取今天日期 - String id = fmt.format(new Date()); - //转换不规则时间字符串 - String s = formatDate(commomtableCopyVo.getDisDate()); - ZdAssortVo zdAssortVo = zdAssorList.get(0); - AddArchiveMasterVo addArchiveMasterVo = new AddArchiveMasterVo(); - addArchiveMasterVo.setID(id); - addArchiveMasterVo.setPatientId(commomtableCopyVo.getInpatientNo()); - addArchiveMasterVo.setInpNo(commomtableCopyVo.getInpatientNo()); - addArchiveMasterVo.setVisitId(commomtableCopyVo.getAdmissTimes()); - addArchiveMasterVo.setName(commomtableCopyVo.getName()); - addArchiveMasterVo.setDeptName(commomtableCopyVo.getDisDept()); - addArchiveMasterVo.setDischargeDateTime(s); - addArchiveMasterVo.setArchiveState("缩微"); - addArchiveMasterVo.setAdmissionDateTime(s); - addArchiveMasterVo.setLockInfo(commomtableCopyVo.getPh()); - addArchiveMasterVo.setDISCHARGEDISPOSITION(zdAssortVo.getDISCHARGEDISPOSITION()); - addArchiveMasterVo.setSplitName("Ljj"); - int i = archiveMasterMapper.addArchiveMaster(addArchiveMasterVo); - //插入文件表数据 - if (i == 1) { - AddArchiveDetail addArchiveDetail = new AddArchiveDetail(); - //使用时间生成一个id - SimpleDateFormat detailFmt = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - //获取今天日期 - String detailId = detailFmt.format(new Date()); - addArchiveDetail.setID(detailId); - addArchiveDetail.setPDFPATH(zdAssortVo.getPDFPATH()); - addArchiveDetail.setMasterID(id); - addArchiveDetail.setUpLoadDateTime(zdAssortVo.getUpLoadDateTime()); - addArchiveDetail.setAssortID(zdAssortVo.getAssortId()); - addArchiveDetail.setSource("缩微"); - addArchiveDetail.setFlag(zdAssortVo.getFlag()); - addArchiveDetail.setSys(zdAssortVo.getSys()); - addArchiveDetail.setSplitName("Ljj"); - addDetailStatic = archiveDetailMapper.addArchiveDetail(addArchiveDetail); - //向commomtable表增加数据 - if (addDetailStatic == 1) { - AddLzRmCommVo addLzRmCommVo = new AddLzRmCommVo(); - addLzRmCommVo.setPatientId(id); - addLzRmCommVo.setAdmissId(commomtableCopyVo.getInpatientNo()); - addLzRmCommVo.setAdmissTimes(commomtableCopyVo.getAdmissTimes()); - addLzRmCommVo.setInpatientNo(commomtableCopyVo.getInpatientNo()); - addLzRmCommVo.setName(commomtableCopyVo.getName()); - addLzRmCommVo.setDisDate(s); - addLzRmCommVo.setDisDeptName(commomtableCopyVo.getDisDept()); - addLzRmCommVo.setPh(commomtableCopyVo.getPh()); - addLzRmCommVo.setGdh(commomtableCopyVo.getPh()); - addLzRmCommVo.setSplitName("Ljj"); - addAddLzRmCommStatic = commomtableMapper.addAddLzRmComm(addLzRmCommVo); - } - - } - return addAddLzRmCommStatic; - } - - /** - * @description: 按照规则截取 - * @params: pageNumber - * @return: assortName - * @author linjj - * @date: 2023/11/13 14:57 - */ - private String intercept(String pageNumber) { - //如果包含--就截取--前 - if (pageNumber.contains("--")) { - pageNumber = pageNumber.substring(0, pageNumber.indexOf("--")); - return pageNumber; - } - //如果包含-就截取-前 - if (pageNumber.contains("-")) { - pageNumber = pageNumber.substring(0, pageNumber.indexOf("-")); - return pageNumber; - } - return pageNumber; - } - - - /** - * @description: 转换不规则时间字符串 - * @params: inDate - * @return: outDate - * @author linjj - * @date: 2023/11/13 15:13 - */ - public static String formatDate(String inDate) { - String outDate = ""; - if (inDate != null) { - try { - Date date = inSDF.parse(inDate); - outDate = outSDF.format(date); - } catch (ParseException ex) { - } - } - return outDate; - } - -} 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/java/com/example/service/SubordinateService.java b/src/main/java/com/example/service/SubordinateService.java new file mode 100644 index 0000000..b54b026 --- /dev/null +++ b/src/main/java/com/example/service/SubordinateService.java @@ -0,0 +1,22 @@ +package com.example.service; + +import com.example.utils.CommonResult; + +/** + * @ClassName SubordinateService + * @Description 处理消息接口 + * @Author linjj + * @Date 2025/4/8 10:46 + * @Version 1.0 + */ +public interface SubordinateService { + + /** + * @Author: linjj + * @Description: 补偿下载失败消息 + * @DateTime: 2025/4/8 11:02 + * @Params: [] + * @Return com.example.utils.CommonResult + */ + CommonResult CompensateTask(); +} diff --git a/src/main/java/com/example/service/serviceImpl/SubordinateServiceImpl.java b/src/main/java/com/example/service/serviceImpl/SubordinateServiceImpl.java new file mode 100644 index 0000000..8b9204e --- /dev/null +++ b/src/main/java/com/example/service/serviceImpl/SubordinateServiceImpl.java @@ -0,0 +1,175 @@ +package com.example.service.serviceImpl; + +import com.alibaba.fastjson.JSON; +import com.example.db.dao.ArchiveDetailDao; +import com.example.db.dao.ArchiveMasterDao; +import com.example.db.dao.MessageSubordinateDao; +import com.example.service.SubordinateService; +import com.example.utils.CommonResult; +import com.example.vo.MessageDto; +import com.example.vo.MessageLog; +import com.example.vo.MessageSubordinateVo; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + + +/** + * @ClassName SubordinateServiceImpl + * @Description 处理消息接口 + * @Author linjj + * @Date 2025/4/8 10:46 + * @Version 1.0 + */ +@Service +@Slf4j +public class SubordinateServiceImpl implements SubordinateService { + + @Autowired + private MessageSubordinateDao messageSubordinateDao; + @Autowired + private ArchiveMasterDao archiveMasterDao; + @Autowired + private ArchiveDetailDao archiveDetailDao; + + @Override + public CommonResult CompensateTask() { + //查询哪些消息需要补偿0为未开始状态 + List list = messageSubordinateDao.getMessageSubordinate(0); + if (CollectionUtils.isEmpty(list)) { + log.info("当前没有需要补偿的数据"); + return CommonResult.success("当前没有需要补偿的数据"); + } + for (MessageSubordinateVo messageSubordinate : list) { + //解析json返回患者基础信息 + MessageDto messageDto = parseMessage(messageSubordinate); + if (messageDto == null) { + //不存在数据时,将该记录状态改为4 + messageSubordinateDao.updateStatus(4, messageSubordinate.getMessageId()); + continue; + } + //采集失败将状态该为2,成功将状态改为1 + if (!compensate(messageDto)){ + log.info("采集失败："+messageSubordinate.getMessageId()); + messageSubordinateDao.updateStatus(2, messageSubordinate.getMessageId()); + }else { + log.info("采集成功："+messageSubordinate.getMessageId()); + messageSubordinateDao.updateStatus(1, messageSubordinate.getMessageId()); + } + } + return CommonResult.success("采集完成"); + } + + private Boolean compensate(MessageDto messageDto) { + //获取下载地址 + String reportAddress = messageDto.getReportAddress(); + //查询该患者主键id + List ids = archiveMasterDao.getMasterIdByInpNoAndVisitId(messageDto.getInpNo(), messageDto.getVisitId()); + if (CollectionUtils.isEmpty(ids)) { + return false; + } + //根据患者id查询文件表该文件的保存路径 + List pdfPaths = archiveDetailDao.getPdfPath(ids.get(0), messageDto.getApplyId()); + //删除原地址文件 + if (!delPdf(pdfPaths)) { + return false; + } + if (!DownloadFile(reportAddress, pdfPaths.get(0))) { + return false; + } + return true; + } + + /** + * @Author: linjj + * @Description: 删除原地址文件 + * @DateTime: 2025/4/8 16:26 + * @Params: [pdfPaths] + * @Return java.lang.Boolean + */ + private Boolean delPdf(List pdfPaths) { + //删除原地址文件 + File file = new File(pdfPaths.get(0)); + try { + file.delete(); // 删除照片 + } catch (Exception e) { + log.error("删除图像失败地址:" + pdfPaths.get(0) + e.getMessage(), e); + return false; + } + return true; + } + + /** + * @Author: linjj + * @Description: 解析json返回患者基础信息 + * @DateTime: 2025/4/8 12:03 + * @Params: [messageSubordinate] + * @Return com.example.vo.MessageDto + */ + private MessageDto parseMessage(MessageSubordinateVo messageSubordinate) { + MessageDto messageDto = null; + String id = messageSubordinate.getId(); + //判断消息中是否包含甲亢核医学PET-CT门诊不包含直接跳过不需要采集 + if (!messageSubordinate.getContentJson().contains("甲亢核医学PET-CT门诊")) { + log.info("消息id为:" + id + "不包含甲亢核医学PET-CT门诊"); + return messageDto; + } + // 解析内容 + MessageLog messageLog = JSON.parseObject(messageSubordinate.getContentJson(), MessageLog.class); + if (messageLog == null) { + log.info("消息id为:" + id + "messageLog为空"); + return messageDto; + } + //获取患者基本信息 + String outJson = messageLog.getOutJson(); + if (outJson == null) { + log.info("消息id为:" + id + "outJson"); + return messageDto; + } + messageDto = JSON.parseObject(outJson, MessageDto.class); + return messageDto; + } + + + /** + * @Author: linjj + * @Description: 文件下载 + * @DateTime: 2025/4/08 14:50 + * @Params: [fileURL, savePath] + * @Return java.lang.Boolean + */ + private Boolean DownloadFile(String fileURL, String savePath) { + try { + CloseableHttpClient httpClient = HttpClients.createDefault(); + try (CloseableHttpResponse response = httpClient.execute(new HttpGet(fileURL))) { + HttpEntity entity = response.getEntity(); + try (InputStream in = entity.getContent(); + FileOutputStream fileOutputStream = new FileOutputStream(savePath)) { + byte[] buffer = new byte[1024]; + int bytesRead; + while ((bytesRead = in.read(buffer)) != -1) { + fileOutputStream.write(buffer, 0, bytesRead); + } + return true; + } + } + } catch (Exception e) { + log.error("文件下载失败" + e.getMessage(), e); + return false; + } + } +} diff --git a/src/main/java/com/example/utils/CommonResult.java b/src/main/java/com/example/utils/CommonResult.java new file mode 100644 index 0000000..4f54577 --- /dev/null +++ b/src/main/java/com/example/utils/CommonResult.java @@ -0,0 +1,152 @@ +package com.example.utils; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author docus + * @date 2020/3/28 16:23 + */ +@Data +@ApiModel("响应") +@AllArgsConstructor +@NoArgsConstructor +public class CommonResult { + @ApiModelProperty("响应码") + private Integer code; + @ApiModelProperty("响应消息") + private String msg; + @ApiModelProperty("响应实体") + private T data; + + public CommonResult(Integer code, String msg) { + this.code = code; + this.msg = msg; + } + + /** + * 成功返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult success(T data) { + return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); + } + + /** + * 成功返回结果 + * + * @param data 获取的数据 + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult success(T data, String message) { + return new CommonResult(ResultCode.SUCCESS.getCode(), message, data); + } + + /** + * 失败返回结果 + * + * @param errorCode 错误码 + * @param + * @return + */ + public static CommonResult failed(IErrorCode errorCode) { + return new CommonResult(errorCode.getCode(), errorCode.getMessage(), null); + } + + /** + * 失败返回结果 + * + * @param errorCode 错误码 + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult failed(IErrorCode errorCode, String message) { + return new CommonResult(errorCode.getCode(), message, null); + } + + /** + * 失败返回结果 + * + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult failed(String message) { + return new CommonResult(ResultCode.FAILED.getCode(), message, null); + } + + + /** + * 失败返回结果 + * + * @param + * @return + */ + public static CommonResult failed() { + return failed(ResultCode.FAILED); + } + + /** + * 参数验证失败返回结果 + * + * @param + * @return + */ + public static CommonResult validateFailed() { + return failed(ResultCode.VALIDATE_FAILED); + } + + /** + * 提示信息 + * + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult validateFailed(String message) { + return new CommonResult(ResultCode.VALIDATE_FAILED.getCode(), message, null); + } + + /** + * 未登录返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult unauthorized(T data) { + return new CommonResult(ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage(), data); + } + + /** + * 重防及重复请求 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult preventreplay(T data) { + return new CommonResult(ResultCode.PREVENT_REPLAY.getCode(), ResultCode.PREVENT_REPLAY.getMessage(), data); + } + + /** + * 未授权返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult forbidden(T data) { + return new CommonResult(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getMessage(), data); + } +} diff --git a/src/main/java/com/example/utils/ExceptionCode.java b/src/main/java/com/example/utils/ExceptionCode.java new file mode 100644 index 0000000..293c213 --- /dev/null +++ b/src/main/java/com/example/utils/ExceptionCode.java @@ -0,0 +1,26 @@ +package com.example.utils; + + +public enum ExceptionCode { + /** + * 服务器开小差了，请稍后再试 + */ + WRONG_PARAMS("参数不对", 1001); + + + private final String message; + private final Integer code; + + ExceptionCode(String message, int code) { + this.message = message; + this.code = code; + } + + public String getMessage() { + return message; + } + + public Integer getCode() { + return code; + } +} diff --git a/src/main/java/com/example/utils/FieldSelector.java b/src/main/java/com/example/utils/FieldSelector.java deleted file mode 100644 index 5ca9623..0000000 --- a/src/main/java/com/example/utils/FieldSelector.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.utils; - -/** - * @InterfaceName FieldSelector - * @Description - * @Author linjj - * @Date 2023/6/29 16:41 - * @Version 1.0 - */ -public interface FieldSelector { - FieldType select(Type type); -} diff --git a/src/main/java/com/example/utils/IErrorCode.java b/src/main/java/com/example/utils/IErrorCode.java new file mode 100644 index 0000000..d1852ac --- /dev/null +++ b/src/main/java/com/example/utils/IErrorCode.java @@ -0,0 +1,12 @@ +package com.example.utils; + +/** + * @Description 封装API的错误码 + * @Author JacksonTu + * @Date 2020/3/28 16:26 + */ +public interface IErrorCode { + Integer getCode(); + + String getMessage(); +} diff --git a/src/main/java/com/example/utils/IpUtil.java b/src/main/java/com/example/utils/IpUtil.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/utils/ListUtilsNew.java b/src/main/java/com/example/utils/ListUtilsNew.java deleted file mode 100644 index ac2798d..0000000 --- a/src/main/java/com/example/utils/ListUtilsNew.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.example.utils; - -import org.springframework.util.CollectionUtils; - -import java.util.*; - -public final class ListUtilsNew { - public static Map toMap(List list, FieldSelector selector) { - if (CollectionUtils.isEmpty(list)) return Collections.emptyMap(); - Map map = new HashMap<>(list.size()); - for (T t : list) { - K key = selector.select(t); - if (key != null) map.put(key, t); - } - return map; - } - - public static Map> groupBy(List list, FieldSelector selector) { - if (CollectionUtils.isEmpty(list)) return Collections.emptyMap(); - Map> map = new HashMap<>(); - for (T t : list) { - K key = selector.select(t); - if (key == null) continue; - if (!map.containsKey(key)) { - map.put(key, new ArrayList()); - } - map.get(key).add(t); - } - return map; - } - - public static List select(List list, FieldSelector selector) { - if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); - List filedList = new ArrayList<>(list.size()); - for (T t : list) { - K key = selector.select(t); - if (key != null) filedList.add(key); - } - return filedList; - } - - public static List distinctSelect(List list, FieldSelector selector) { - if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); - Set filedSet = new HashSet<>(); - for (T t : list) { - K key = selector.select(t); - if (key != null) filedSet.add(key); - } - return new ArrayList<>(filedSet); - } - - @SafeVarargs - public static List unionWithoutDuplicate(List... values) { - if (null == values || values.length <= 0) return Collections.emptyList(); - Set unionFiledSet = new HashSet<>(); - for (List value : values) { - if (!CollectionUtils.isEmpty(value)) { - unionFiledSet.addAll(value); - } - } - return new ArrayList<>(unionFiledSet); - } - - public static List skipDuplicateKey(List list, FieldSelector selector) { - if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); - List filedList = new ArrayList<>(list.size()); - Map map = toMap(list, selector); - for (K key : map.keySet()) { - filedList.add(map.get(key)); - } - return filedList; - } -} diff --git a/src/main/java/com/example/utils/Md5Util.java b/src/main/java/com/example/utils/Md5Util.java deleted file mode 100644 index a357057..0000000 --- a/src/main/java/com/example/utils/Md5Util.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.utils; - -import java.security.MessageDigest; - -public class Md5Util { - public static String encrypt(String dataStr) { - try { - MessageDigest m = MessageDigest.getInstance("MD5"); - m.update(dataStr.getBytes("UTF8")); - byte[] s = m.digest(); - StringBuilder result = new StringBuilder(); - for (int i = 0; i < s.length; i++) { - result.append(Integer.toHexString((0x000000FF & s[i]) | 0xFFFFFF00).substring(6)); - } - return result.toString(); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } -} diff --git a/src/main/java/com/example/utils/ResultCode.java b/src/main/java/com/example/utils/ResultCode.java new file mode 100644 index 0000000..d2b5446 --- /dev/null +++ b/src/main/java/com/example/utils/ResultCode.java @@ -0,0 +1,42 @@ +package com.example.utils; + + +/** + * @Description 枚举一些常用API操作码 + * @Author JacksonTu + * @Date 2020/3/28 16:26 + */ +public enum ResultCode implements IErrorCode { + + SUCCESS(0, "操作成功"), + FAILED(500, "操作失败"), + VALIDATE_FAILED(404, "参数检验失败"), + UNAUTHORIZED(401, "暂未登录或token已经过期"), + FORBIDDEN(403, "没有相关权限"), + PREVENT_REPLAY(405,"重复请求"), + NOT_EXIST(601,"数据不存在"), + NOT_ENABLE(600,"数据未启用"); + + + + + private Integer code; + private String message; + + private ResultCode(Integer code, String message) { + this.code = code; + this.message = message; + } + + @Override + public Integer getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } + + +} diff --git a/src/main/java/com/example/utils/SnowflakeIdWorker.java b/src/main/java/com/example/utils/SnowflakeIdWorker.java deleted file mode 100644 index fef3202..0000000 --- a/src/main/java/com/example/utils/SnowflakeIdWorker.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.example.utils; - -public class SnowflakeIdWorker { - /** - * 开始时间截 (2015-01-01) - */ - private final long twepoch = 1420041600000L; - /** - * 机器id所占的位数 - */ - private final long workerIdBits = 5L; - /** - * 数据标识id所占的位数 - */ - private final long datacenterIdBits = 5L; - /** - * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) - */ - private final long maxWorkerId = -1L ^ (-1L << workerIdBits); - /** - * 支持的最大数据标识id，结果是31 - */ - private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); - /** - * 序列在id中占的位数 - */ - private final long sequenceBits = 12L; - /** - * 机器ID向左移12位 - */ - private final long workerIdShift = sequenceBits; - /** - * 数据标识id向左移17位(12+5) - */ - private final long datacenterIdShift = sequenceBits + workerIdBits; - /** - * 时间截向左移22位(5+5+12) - */ - private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; - /** - * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) - */ - private final long sequenceMask = -1L ^ (-1L << sequenceBits); - /** - * 工作机器ID(0~31) - */ - private long workerId; - /** - * 数据中心ID(0~31) - */ - private long datacenterId; - /** - * 毫秒内序列(0~4095) - */ - private long sequence = 0L; - /** - * 上次生成ID的时间截 - */ - private long lastTimestamp = -1L; - /** - * 构造函数 - * @param workerId 工作ID (0~31) - * @param datacenterId 数据中心ID (0~31) - */ - public SnowflakeIdWorker(long workerId, long datacenterId) { - if (workerId > maxWorkerId || workerId < 0) { - throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId)); - } - if (datacenterId > maxDatacenterId || datacenterId < 0) { - throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); - } - this.workerId = workerId; - this.datacenterId = datacenterId; - } - /** - * 获得下一个ID (该方法是线程安全的) - * @return SnowflakeId - */ - public synchronized long nextId() { - long timestamp = timeGen(); - // 如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常 - if (timestamp < lastTimestamp) { - throw new RuntimeException( - String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp)); - } - // 如果是同一时间生成的，则进行毫秒内序列 - if (lastTimestamp == timestamp) { - sequence = (sequence + 1) & sequenceMask; - // 毫秒内序列溢出 - if (sequence == 0) { - //阻塞到下一个毫秒,获得新的时间戳 - timestamp = tilNextMillis(lastTimestamp); - } - } - // 时间戳改变，毫秒内序列重置 - else { - sequence = 0L; - } - // 上次生成ID的时间截 - lastTimestamp = timestamp; - // 移位并通过或运算拼到一起组成64位的ID - return ((timestamp - twepoch) << timestampLeftShift) // - | (datacenterId << datacenterIdShift) // - | (workerId << workerIdShift) // - | sequence; - } - /** - * 阻塞到下一个毫秒，直到获得新的时间戳 - * @param lastTimestamp 上次生成ID的时间截 - * @return 当前时间戳 - */ - protected long tilNextMillis(long lastTimestamp) { - long timestamp = timeGen(); - while (timestamp <= lastTimestamp) { - timestamp = timeGen(); - } - return timestamp; - } - /** - * 返回以毫秒为单位的当前时间 - * @return 当前时间(毫秒) - */ - protected long timeGen() { - return System.currentTimeMillis(); - } - - public static void main(String[] args) throws InterruptedException { - SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0); - for (int i = 0; i < 10; i++) { - long id = idWorker.nextId(); - Thread.sleep(1); - System.out.println(id); - } - } - - -} - - diff --git a/src/main/java/com/example/utils/SplitDataProcessor.java b/src/main/java/com/example/utils/SplitDataProcessor.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/utils/StopWatch.java b/src/main/java/com/example/utils/StopWatch.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/com/example/duplicate/controller/vo/AddArchiveDetail.java b/src/main/java/com/example/vo/AddArchiveDetail.java similarity index 93% rename from src/main/java/com/example/duplicate/controller/vo/AddArchiveDetail.java rename to src/main/java/com/example/vo/AddArchiveDetail.java index 2161780..e8e8811 100644 --- a/src/main/java/com/example/duplicate/controller/vo/AddArchiveDetail.java +++ b/src/main/java/com/example/vo/AddArchiveDetail.java @@ -1,4 +1,4 @@ -package com.example.duplicate.controller.vo; +package com.example.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java b/src/main/java/com/example/vo/AddArchiveMasterVo.java similarity index 84% rename from src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java rename to src/main/java/com/example/vo/AddArchiveMasterVo.java index 96cbb5d..2fc4762 100644 --- a/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java +++ b/src/main/java/com/example/vo/AddArchiveMasterVo.java @@ -1,7 +1,5 @@ -package com.example.duplicate.controller.vo; +package com.example.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; /** diff --git a/src/main/java/com/example/vo/MessageDto.java b/src/main/java/com/example/vo/MessageDto.java new file mode 100644 index 0000000..1ecc3aa --- /dev/null +++ b/src/main/java/com/example/vo/MessageDto.java @@ -0,0 +1,74 @@ +package com.example.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName AddArchiveMasterVo + * @Description 连州人民医院Archive_Master表实体 + * @Author linjj + * @Date 2023/11/13 14:48 + * @Version 1.0 + */ +@Data +public class MessageDto { + + private String entity; + + private T object; + + private Date xmlCreateTime; + + private String type; + + private String inpNo; + + private String visitId; + + private String propertiesPath; + + private String reportAddress; + + // 2019-7-26 新增报告单号 考虑会传多次报告 但地址一样 + private String checkReportId; + + /** + * 如果是入院信息 那么就会有新增 修改 + */ + private String addFlag; + + /** + * 扩展字段： 用于进行更新状态、与报告进行匹配 + * 2019-9-4 + */ + private String applyId; + + // 2019-9-16 新增来源 + private String source; + + // 2019-10-21 新增排序时间 + private String captionDateTime; + + // 2019-11-28 新增三级标题 + private String detailType; + + //20200609 0是老数据 1是新数据 + private String isOld; + + /** + * 电子病历最后提交时间 + * */ + private Date emrCommitTime; + + + public MessageDto() { + } + + public MessageDto(String entity, T object, String type, String propertiesPath) { + this.entity = entity; + this.object = object; + this.type = type; + this.propertiesPath = propertiesPath; + } +} diff --git a/src/main/java/com/example/vo/MessageLog.java b/src/main/java/com/example/vo/MessageLog.java new file mode 100644 index 0000000..95ddd73 --- /dev/null +++ b/src/main/java/com/example/vo/MessageLog.java @@ -0,0 +1,102 @@ +package com.example.vo; + +import lombok.Data; + +import javax.persistence.Lob; +import java.util.Date; + +/** + * @ClassName MessageLog + * @Description 解析 患者基础信息 + * @Author linjj + * @Date 2025/4/8 11:12 + * @Version 1.0 + */ +@Data +public class MessageLog { + private String id; + + @Lob + /** + * 输入内容 + * */ + private String inputContent; + + /** + * 输出内容 + */ + @Lob + private String outContent; + + /** + * 类型 与 字典表匹配 + */ + private String type; + + /** + * 备注 + */ + private String remark; + + /** + * 消息结果 0 未成功 1是成功 + */ + private Integer result; + + /** + * 返回json + */ + @Lob + private String outJson; + + /** + * 接口名称 + */ + private String interfaceName; + + /** + * xml创建时间 + */ + private Date xmlCreateTime; + + /** + * 执行时间 + */ + private Long executionTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * xml执行时间 + */ + private Long xmlExecutionTime; + + public MessageLog(String inputContent, String interfaceName, Date createTime) { + this.inputContent = inputContent; + this.interfaceName = interfaceName; + this.createTime = createTime; + } + + public MessageLog() { + + } + + public void setValue(String outContent, Integer result, String outJson, Date xmlCreateTime, Long executionTime, Date endTime, String type) { + this.outContent = outContent; + this.result = result; + this.outJson = outJson; + this.xmlCreateTime = xmlCreateTime; + this.executionTime = executionTime; + this.endTime = endTime; + this.type = type; + } + +} diff --git a/src/main/java/com/example/vo/MessageSubordinateVo.java b/src/main/java/com/example/vo/MessageSubordinateVo.java new file mode 100644 index 0000000..64f8390 --- /dev/null +++ b/src/main/java/com/example/vo/MessageSubordinateVo.java @@ -0,0 +1,29 @@ +package com.example.vo; + +import lombok.Data; + +/** + * @ClassName MessageSubordinate + * @Description MessageSubordinate表 + * @Author linjj + * @Date 2023/10/13 15:00 + * @Version 1.0 + */ +@Data +public class MessageSubordinateVo { + + + private String id; + + private String contentJson; + + private String messageId; + + private String patientMain; + + private int status; + + private String remark; + private int runs; + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ffebfd6..9c89774 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,60 +1,19 @@ server: - port: 3391 - - + port: 3291 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://127.0.0.1:1433;DatabaseName=zj_record_new - username: sa - password: admin123 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - type: com.alibaba.druid.pool.DruidDataSource - db2: #数据源2 - jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=qf_record - username: sa - password: admin123 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:sqlserver://10.6.1.127:1433;DatabaseName=DB_PrivilegeManagement_GYFY + username: sa + password: docus@702 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + type: com.alibaba.druid.pool.DruidDataSource #加快springboot初始化，延缓初始化加载 main: lazy-initialization: true #加快springboot初始化，关闭jmx监控 jmx: enabled: false -# redis: -# # Redis 服务器地址 -# host: localhost -# # 连接端口号 -# port: 6379 -# # 数据库索引（0 - 15） -# database: 0 -# # 连接超时时间（毫秒） -# timeout: 10000 -# # lettuce 参数 -# lettuce: -# pool: -# # 最大连接数(使用负值表示没有限制) 默认为 8 -# max-active: 10 -# # 最大阻塞等待时间(使用负值表示没有限制) 默认为 -1 ms -# max-wait: -1 -# # 最大空闲连接 默认为 8 -# max-idle: 5 -# # 最小空闲连接 默认为 0 -# min-idle: 0 application: name: service-swagger mybatis: @@ -68,14 +27,3 @@ logging: level: com.example.mapper: debug -waterPicPath: D:/jiashi/reload/ - -#厦门174医院清空文件及开发0.关闭 1.开启 -waterPicPathFlag: 0 - -EMR_RECORD_JSP: http://192.0.21.8:8887/ - -ZJ_DATE_TIME_LOG : 2022-12-31 23:59:59 - - -ZJ_DATE_TIME_MESSAGE : 2022-12-31 23:59:59 \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2dd4c69..a3af570 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -14,7 +14,7 @@ - D:\logs\springbootDemo.log + D:\tool_zj\tool.log diff --git a/src/main/resources/mapper/ArchiveDetailMapper.xml b/src/main/resources/mapper/ArchiveDetailMapper.xml index 7e1bde5..7253797 100644 --- a/src/main/resources/mapper/ArchiveDetailMapper.xml +++ b/src/main/resources/mapper/ArchiveDetailMapper.xml @@ -1,11 +1,11 @@ - - - + + + - - insert into Archive_Detail (ID, PDF_PATH, MasterID, UpLoadDateTime, AssortID, Source, flag, - Sys, splitName) - values (#{ID}, #{PDFPATH}, #{MasterID}, #{UpLoadDateTime}, #{AssortID}, #{Source}, #{flag}, #{Sys},#{splitName}) - + + \ No newline at end of file diff --git a/src/main/resources/mapper/ArchiveMasterMapper.xml b/src/main/resources/mapper/ArchiveMasterMapper.xml index 657ee54..4c0e1e9 100644 --- a/src/main/resources/mapper/ArchiveMasterMapper.xml +++ b/src/main/resources/mapper/ArchiveMasterMapper.xml @@ -1,31 +1,11 @@ - - - - insert into master_id (masterId) - values - (#{item}) - - - - insert into Archive_Master (ID, patient_id, inp_no, visit_id, name, dept_name, discharge_date_time, - ArchiveState, admission_date_time, LockInfo, - DISCHARGE_DISPOSITION,split_name) - values (#{ID}, #{patientId}, #{inpNo}, #{visitId}, #{name}, #{deptName}, #{dischargeDateTime}, #{ArchiveState}, - #{admissionDateTime}, #{LockInfo}, #{DISCHARGEDISPOSITION}, #{splitName}) - + - - + select ID from Archive_Master where inp_no=#{inpNo} AND visit_id=#{visitId} \ No newline at end of file diff --git a/src/main/resources/mapper/CommomtableMapper.xml b/src/main/resources/mapper/CommomtableMapper.xml deleted file mode 100644 index 774a502..0000000 --- a/src/main/resources/mapper/CommomtableMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - insert into CommonTable (patient_id, admiss_id, admiss_times, inpatient_no, name, dis_date, dis_dept_name, - ph, gdh,splitName) - values (#{patientId}, #{admissId}, #{admissTimes}, #{inpatientNo}, #{name}, #{disDate}, #{disDeptName}, #{ph},#{gdh},#{splitName}) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/LzRmMapper.xml b/src/main/resources/mapper/LzRmMapper.xml deleted file mode 100644 index 03f06b7..0000000 --- a/src/main/resources/mapper/LzRmMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - update commomtable_copy - set spilStatic=#{spilStatic} - where inpatientNoPast = #{inpatientNoPast} - and ph = #{phString} - and pageNumber=#{pageNumber} - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/MessageLogMapper.xml b/src/main/resources/mapper/MessageLogMapper.xml deleted file mode 100644 index 1ec934e..0000000 --- a/src/main/resources/mapper/MessageLogMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - update synchronous_time set addTime=#{dischargeDateTime} - - - delete from message_log where id in - - #{item} - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/MessageSubordinateMapper.xml b/src/main/resources/mapper/MessageSubordinateMapper.xml index aee8bd8..f6387fc 100644 --- a/src/main/resources/mapper/MessageSubordinateMapper.xml +++ b/src/main/resources/mapper/MessageSubordinateMapper.xml @@ -1,72 +1,14 @@ - - - - - - - - - - - - - - - update synchronous_time1 set addTime=#{dischargeDateTime} + + + update message_subordinate_20250407 set status=#{status} where id=#{id} - - delete from message_subordinate where message_id in - - #{item} - - - - - - - - - - + select * from message_subordinate_20250407 where status=#{status} \ No newline at end of file diff --git a/src/main/resources/mapper/MidMapper.xml b/src/main/resources/mapper/MidMapper.xml deleted file mode 100644 index 91eba26..0000000 --- a/src/main/resources/mapper/MidMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/QualityMapper.xml b/src/main/resources/mapper/QualityMapper.xml deleted file mode 100644 index b4e789c..0000000 --- a/src/main/resources/mapper/QualityMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - insert into ph (ph - ) - values (#{item.ph} - ) - - - insert into fliePath (ph,fliePath - ) - values (#{ph},#{fliePath} - ) - - - insert into t_scan_assort (patient_id,assort_id,scan_page,source,is_del - ) - values (#{patientId},#{assortId},#{scanPage},#{source},#{isDel} - ) - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper2/MessageLogTwoMapper.xml b/src/main/resources/mapper2/MessageLogTwoMapper.xml deleted file mode 100644 index 46caf55..0000000 --- a/src/main/resources/mapper2/MessageLogTwoMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - insert into message_log (id,create_time,end_time,execution_time,input_content, - interface_name,out_content,out_json,remark,result,type,xml_create_time,xml_execution_time, - master_id,webservice_info) - values - (#{item.id},#{item.createTime},#{item.endTime}, - #{item.executionTime},#{item.inputContent},#{item.interfaceName},#{item.outContent}, - #{item.outJson},#{item.remark},#{item.result},#{item.type},#{item.xmlCreateTime},#{item.xmlExecutionTime}, - #{item.masterId},#{item.webserviceInfo} - ) - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper2/MessageSubordinateTwoMapper.xml b/src/main/resources/mapper2/MessageSubordinateTwoMapper.xml deleted file mode 100644 index e1a54cc..0000000 --- a/src/main/resources/mapper2/MessageSubordinateTwoMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - insert into message_subordinate (id,content_json,message_id,patient_main,status,remark,runs) - values - (#{item.id},#{item.contentJson},#{item.messageId}, - #{item.patientMain},#{item.status},#{item.remark},#{item.runs} - ) - - - \ No newline at end of file diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml deleted file mode 100644 index aced2d6..0000000 --- a/src/main/resources/rebel.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - mr-file - - - - - - - diff --git a/src/test/java/com/example/DemoApplicationTests.java b/src/test/java/com/example/DemoApplicationTests.java deleted file mode 100644 index b5758bf..0000000 --- a/src/test/java/com/example/DemoApplicationTests.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.example; - - - - -import com.example.duplicate.infrastructure.configOneDao.MidMapper; -import com.example.duplicate.infrastructure.configOneDao.QualityMapper; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ofdrw.converter.ofdconverter.ImageConverter; -import org.ofdrw.layout.OFDDoc; -import org.ofdrw.layout.PageLayout; -import org.ofdrw.layout.element.Img; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; - -import javax.imageio.ImageIO; - - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = com.example.SpringbootDemoApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Slf4j -public class DemoApplicationTests { - - private static SimpleDateFormat inSDF = new SimpleDateFormat("yyyy.mm.dd"); - private static SimpleDateFormat outSDF = new SimpleDateFormat("yyyy-mm-dd"); - - @Autowired - QualityMapper qualityMapper; - @Autowired - MidMapper midMapper; - - - @Test - public void getPic() { - List mid = midMapper.getMid(); - String curl = " curl -X POST http://10.36.116.108:3391/makeUp/makeUpPacsByMasterId -d"; - String param = "masterId="; - for (String masterId:mid){ - log.info(curl+" "+param+masterId); - } - - } - - - @Test - public void ImageConverterTest() throws IOException { - String directoryPath = "D:\\tmp1\\004624"; // 替换为你的目录路径 - List imagePaths = findImageFiles(directoryPath); - for (int i=0;i findImageFiles(String directoryPath) { - List jpgPath = new ArrayList<>(); - List imgPaths=new ArrayList<>(); - File directory = new File(directoryPath); - - // 遍历目录 - File[] files = directory.listFiles((dir, name) -> name.toLowerCase().matches(".*\\.(jpg)$")); - if (files != null) { - for (File file : files) { - if (file.isFile()) { - jpgPath.add(file.getAbsolutePath()); - } - } - } - for (String path:jpgPath){ - imgPaths.add(Paths.get(path)); - } - return imgPaths; - } - - - - - - @Test - public void intercept() { - String pageNumber = "66"; - //如果包含--就截取--前 - if (pageNumber.contains("--")) { - pageNumber = pageNumber.substring(0, pageNumber.indexOf("--")); - } - //如果包含--就截取-前 - if (pageNumber.contains("-")) { - pageNumber = pageNumber.substring(0, pageNumber.indexOf("-")); - } - System.out.println("pageNumber:" + pageNumber); - } - - @Test - public void intercept1() { - String a = "0000000002"; - String s = String.format("%010d", Integer.parseInt(a)); - System.out.println("s:" + s); - } - - - public static String bytesToHexString(byte[] src) { - StringBuilder stringBuilder = new StringBuilder(); - if (src == null || src.length <= 0) { - return null; - } - for (int i = 0; i < src.length; i++) { - int v = src[i] & 0xFF; - String hv = Integer.toHexString(v); - if (hv.length() < 2) { - stringBuilder.append(0); - } - stringBuilder.append(hv); - } - return stringBuilder.toString(); - } - - -}