From 5efba25987aefb5d5f37991e87906a88e4b86dfe Mon Sep 17 00:00:00 2001 From: zengwh Date: Wed, 28 Jun 2023 14:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 36 +++++++++++++++++++ .../dto/InterfaceHisCacheDto.java | 32 +++++++++++++++++ .../InterfaceHisCacheDtoRepository.java | 14 ++++++++ .../ann/service/InterfaceHisCacheService.java | 3 +- .../impl/InterfaceHisCacheServiceImpl.java | 9 +++-- .../com/ann/service/impl/QueueService.java | 11 ++++-- 6 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 .gitignore create mode 100644 src/main/java/com/ann/entity/interfaceEntity/dto/InterfaceHisCacheDto.java create mode 100644 src/main/java/com/ann/repository/InterfaceHisCacheDtoRepository.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..edc0d20 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +docus-services/docus-services-system1/ + +### IntelliJ IDEA ### +*.log +.idea +*.iws +*.iml +*.ipr +mvnw* +*.cmd +*.mvn +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ +logs* +rebel.xml \ No newline at end of file diff --git a/src/main/java/com/ann/entity/interfaceEntity/dto/InterfaceHisCacheDto.java b/src/main/java/com/ann/entity/interfaceEntity/dto/InterfaceHisCacheDto.java new file mode 100644 index 0000000..affa2b9 --- /dev/null +++ b/src/main/java/com/ann/entity/interfaceEntity/dto/InterfaceHisCacheDto.java @@ -0,0 +1,32 @@ +package com.ann.entity.interfaceEntity.dto; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description 医嘱 + * @Date 2020/7/1 9:00 + * @Created by ljx + */ + +@Table +@Entity +@Data +public class InterfaceHisCacheDto { + + @Id + private String id; + + private String inpNo; + + private String visitId; + + // 医嘱类型 0代表临时医嘱 1代表长期医嘱 + private String type; + + private String pdfPath; +} diff --git a/src/main/java/com/ann/repository/InterfaceHisCacheDtoRepository.java b/src/main/java/com/ann/repository/InterfaceHisCacheDtoRepository.java new file mode 100644 index 0000000..44293bc --- /dev/null +++ b/src/main/java/com/ann/repository/InterfaceHisCacheDtoRepository.java @@ -0,0 +1,14 @@ +package com.ann.repository; + +import com.ann.entity.interfaceEntity.InterfaceHisCache; +import com.ann.entity.interfaceEntity.dto.InterfaceHisCacheDto; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface InterfaceHisCacheDtoRepository extends JpaRepository { + @Query(value = "select id,inp_no,visit_id,pdf_path,type from Interface_His_Cache where state = 0 and pdf_path is not null",nativeQuery = true) + public List findAllByStateAndPdfPathIsNotNullDto(); + +} diff --git a/src/main/java/com/ann/service/InterfaceHisCacheService.java b/src/main/java/com/ann/service/InterfaceHisCacheService.java index de11d63..235a471 100644 --- a/src/main/java/com/ann/service/InterfaceHisCacheService.java +++ b/src/main/java/com/ann/service/InterfaceHisCacheService.java @@ -2,13 +2,14 @@ package com.ann.service; import com.ann.entity.interfaceEntity.InterfaceHisCache; +import com.ann.entity.interfaceEntity.dto.InterfaceHisCacheDto; import java.util.List; public interface InterfaceHisCacheService { //查询所有未处理的状态 - public List findInterfaceHisCacheByState(); + public List findInterfaceHisCacheByState(); //修改状态 public boolean updateState(Integer state, String id, Integer type); diff --git a/src/main/java/com/ann/service/impl/InterfaceHisCacheServiceImpl.java b/src/main/java/com/ann/service/impl/InterfaceHisCacheServiceImpl.java index 1cd52b5..51f224c 100644 --- a/src/main/java/com/ann/service/impl/InterfaceHisCacheServiceImpl.java +++ b/src/main/java/com/ann/service/impl/InterfaceHisCacheServiceImpl.java @@ -1,6 +1,8 @@ package com.ann.service.impl; import com.ann.entity.interfaceEntity.InterfaceHisCache; +import com.ann.entity.interfaceEntity.dto.InterfaceHisCacheDto; +import com.ann.repository.InterfaceHisCacheDtoRepository; import com.ann.repository.InterfaceHisCacheRepository; import com.ann.service.InterfaceHisCacheService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,9 +17,12 @@ public class InterfaceHisCacheServiceImpl implements InterfaceHisCacheService { private InterfaceHisCacheRepository interfaceHisCacheRepository; + @Autowired + private InterfaceHisCacheDtoRepository interfaceHisCacheDtoRepository; + @Override - public List findInterfaceHisCacheByState() { - return interfaceHisCacheRepository.findAllByStateAndPdfPathIsNotNull("0"); + public List findInterfaceHisCacheByState() { + return interfaceHisCacheDtoRepository.findAllByStateAndPdfPathIsNotNullDto(); } @Override diff --git a/src/main/java/com/ann/service/impl/QueueService.java b/src/main/java/com/ann/service/impl/QueueService.java index b5497ee..4a00681 100644 --- a/src/main/java/com/ann/service/impl/QueueService.java +++ b/src/main/java/com/ann/service/impl/QueueService.java @@ -9,11 +9,14 @@ import com.ann.entity.filing.dto.MessageDto; import com.ann.entity.interfaceEntity.ArchiveMaster; import com.ann.entity.interfaceEntity.InterfaceHisCache; import com.ann.entity.interfaceEntity.MessageLog; +import com.ann.entity.interfaceEntity.dto.InterfaceHisCacheDto; +import com.ann.repository.InterfaceHisCacheDtoRepository; import com.ann.service.*; import com.ann.utils.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,7 +37,6 @@ public class QueueService { @Autowired InterfaceHisCacheService interfaceHisCacheService; - @Autowired MessageSubordinateService messageSubordinateService; @Autowired @@ -377,11 +379,14 @@ public class QueueService { } + public void doSomethingByHIS() { try { //循环开始处理 所有未处理的 - List interfaceHisCaches = interfaceHisCacheService.findInterfaceHisCacheByState(); - for (InterfaceHisCache interfaceHisCache: interfaceHisCaches) { + List interfaceHisCaches = interfaceHisCacheService.findInterfaceHisCacheByState(); + for (InterfaceHisCacheDto interfaceHisCacheDto: interfaceHisCaches) { + InterfaceHisCache interfaceHisCache = new InterfaceHisCache(); + BeanUtils.copyProperties(interfaceHisCacheDto,interfaceHisCache); String type = null,remark = null,title = null,pdfPath = null,state = "2"; ArchiveDetail archiveDetail = null; try{