From 6a632c18c769014c945a597c26a03c099d5677cf Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 7 Jan 2026 16:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E6=9D=A1=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E8=B4=A8=E6=8E=A7=E6=89=B9=E5=8F=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/lis/QcBatchno.java | 25 +++++++ .../czlis/common/core/redis/RedisCache.java | 20 ++++++ .../jasperreports_extension.properties | 3 +- .../controller/qc/QcBatchnoController.java | 44 +++++++++++++ .../controller/qc/QualitySetController.java | 3 +- .../czlis/liswork/mapper/QcBatchnoMapper.java | 14 ++++ .../liswork/service/QcBatchnoService.java | 13 ++++ .../service/impl/qc/QcBatchnoServiceImpl.java | 33 ++++++++++ .../main/resources/mapper/QcBatchnoMapper.xml | 65 +++++++++++++++++++ .../zycx/service/impl/ZycxServiceImpl.java | 14 +++- zycx/src/main/resources/mapper/ZycxMapper.xml | 33 +++++----- 11 files changed, 248 insertions(+), 19 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcBatchno.java create mode 100644 liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/QcBatchnoMapper.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcBatchnoServiceImpl.java create mode 100644 liswork/src/main/resources/mapper/QcBatchnoMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcBatchno.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcBatchno.java new file mode 100644 index 0000000..b6ca664 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcBatchno.java @@ -0,0 +1,25 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class QcBatchno { + private String yq; + private String zkpph; + private String zkph; + private Date startda; + private String conc; + private Date expiredt; + private Date endda; + private String useflag; + private String qcsrc; + private String standsrc; + private String bk; + private String batchno; +} diff --git a/lis-common/src/main/java/com/czlis/common/core/redis/RedisCache.java b/lis-common/src/main/java/com/czlis/common/core/redis/RedisCache.java index 5d52c2d..dc68c64 100644 --- a/lis-common/src/main/java/com/czlis/common/core/redis/RedisCache.java +++ b/lis-common/src/main/java/com/czlis/common/core/redis/RedisCache.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import cn.hutool.core.util.BooleanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; @@ -244,4 +245,23 @@ public class RedisCache { public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } + + /** + * 对redis修改操作增加互斥锁，解决缓存击穿问题 + * @param key + * @return + */ + private boolean tryLock(String key){ + //如果10秒钟没有执行完毕，则锁过期 + Boolean flag = redisTemplate.opsForValue().setIfAbsent(key, "1", 10, TimeUnit.SECONDS); + return BooleanUtil.isTrue(flag); + } + + /** + * 释放互斥锁 + * @param key + */ + private void unLock(String key){ + redisTemplate.delete(key); + } } diff --git a/lisresources/src/main/resources/jasperreports_extension.properties b/lisresources/src/main/resources/jasperreports_extension.properties index f927980..b5931af 100644 --- a/lisresources/src/main/resources/jasperreports_extension.properties +++ b/lisresources/src/main/resources/jasperreports_extension.properties @@ -1,3 +1,2 @@ net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory -net.sf.jasperreports.extension.simple.font.families.lobstertwo=stsong/fonts.xml -net.sf.jasperreports.extension.text.null.value= \ No newline at end of file +net.sf.jasperreports.extension.simple.font.families.lobstertwo=stsong/fonts.xml \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java new file mode 100644 index 0000000..1fb1cf7 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java @@ -0,0 +1,44 @@ +package com.czlis.liswork.controller.qc; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.QcBatchno; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.liswork.service.QcBatchnoService; +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.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 质控批号设置 + */ +@RestController +@RequestMapping("/qc") +@Slf4j +@Api(tags = "质控批号设置") +public class QcBatchnoController extends BaseController { + + @Autowired + private QcBatchnoService qcBatchnoService; + + + @ApiOperation("查询质控批号") + @GetMapping("/query") + public TableDataInfo queryList(QcBatchno qcBatchno) { + startPage(); + List qcBatchnoList = qcBatchnoService.queryList(qcBatchno); + return getDataTable(qcBatchnoList); + } + + @ApiOperation("获取项目列表") + @GetMapping("/queryVal") + public Result queryValList(String yq){ + return qcBatchnoService.queryValList(yq); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java index 2214fc9..f6840d5 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java @@ -1,6 +1,7 @@ package com.czlis.liswork.controller.qc; import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.ComOpt; import com.czlis.common.core.domain.entity.lis.QcRules; @@ -25,7 +26,7 @@ import java.util.List; @RequestMapping("/qc") @Slf4j @Api(tags = "质控设置界面") -public class QualitySetController { +public class QualitySetController extends BaseController { @Autowired private QualitySetService qualitySetService; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcBatchnoMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcBatchnoMapper.java new file mode 100644 index 0000000..8122ef4 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcBatchnoMapper.java @@ -0,0 +1,14 @@ +package com.czlis.liswork.mapper; + +import com.czlis.common.core.domain.entity.lis.QcBatchno; + +import java.util.List; +import java.util.Map; + +public interface QcBatchnoMapper { + List selectList(QcBatchno qcBatchno); + void insert(QcBatchno qcBatchno); + void update(QcBatchno qcBatchno); + void delete(QcBatchno qcBatchno); + List> qcSampleList(String yq); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java b/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java new file mode 100644 index 0000000..0b83110 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java @@ -0,0 +1,13 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.QcBatchno; + +import java.util.List; + +public interface QcBatchnoService { + List queryList(QcBatchno qcBatchno); + + Result queryValList(String yq); + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcBatchnoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcBatchnoServiceImpl.java new file mode 100644 index 0000000..f7e72c9 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcBatchnoServiceImpl.java @@ -0,0 +1,33 @@ +package com.czlis.liswork.service.impl.qc; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.QcBatchno; +import com.czlis.liswork.mapper.QcBatchnoMapper; +import com.czlis.liswork.service.QcBatchnoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class QcBatchnoServiceImpl implements QcBatchnoService { + + @Autowired + private QcBatchnoMapper qcBatchnoMapper; + + + @Override + public List queryList(QcBatchno qcBatchno) { + List qcBatchnoList = qcBatchnoMapper.selectList(qcBatchno); + return qcBatchnoList; + } + + @Override + public Result queryValList(String yq) { + List> mapList = qcBatchnoMapper.qcSampleList(yq); + return new Result("0","获取数据成功！",mapList); + } + + +} diff --git a/liswork/src/main/resources/mapper/QcBatchnoMapper.xml b/liswork/src/main/resources/mapper/QcBatchnoMapper.xml new file mode 100644 index 0000000..18a2deb --- /dev/null +++ b/liswork/src/main/resources/mapper/QcBatchnoMapper.xml @@ -0,0 +1,65 @@ + + + + + + + update qc_batchno set + startda = #{startda}, + conc = #{conc}, + conc = #{conc}, + expiredt = #{expiredt}, + endda = #{endda}, + useflag = #{useflag}, + qcsrc = #{qcsrc}, + standsrc = #{standsrc}, + bk = #{bk}, + batchno = #{batchno}, + yq = #{yq} + where yq = #{yq} and zkpph = #{zkpph} and zkph = #{zkph} + + + + delete from qc_batchno where yq = #{yq} and zkpph = #{zkpph} and zkph = #{zkph} + + + + insert into qc_batchno(yq, zkpph, zkph, startda, conc, expiredt, endda, useflag, qcsrc, standsrc, bk, batchno) + values(#{yq},#{zkpph},#{startda},#{conc},#{expiredt},#{endda},#{useflag},#{qcsrc},#{standsrc},#{bk},#{batchno}) + + + + + + diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java index c8b1908..c7ec169 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java +++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java @@ -172,7 +172,19 @@ public class ZycxServiceImpl implements ZycxService { public Result printBarCode(String sqh){ ReportParam reportParam = new ReportParam(); reportParam.setSqh(sqh); - return reportUtil.printToPdf("barcode_zy",reportParam, sqh,false); + Result result = reportUtil.printToPdf("barcode_zy", reportParam, sqh, false); + if(!result.getCode().equals("0")) return result; + //修改打印状态 + LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); + if(labReqmainOne == null) return new Result("-1","没有找到申请单数据！"); + String zt = labReqmainOne.getZt(); + if(zt.trim().equals("1") || zt.trim().equals("8")){ + LabReqmain labReqmain = new LabReqmain(); + labReqmain.setZt("11"); + labReqmain.setSqh(sqh); + commonUtil.updateLabReqmain(labReqmain); + } + return new Result("0","打印成功！",result.getData()); } diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index 574d94b..ab19aca 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -13,25 +13,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (select yhxm from com_usr where yhdh = a.jsys) as jsysname, (select zdmc from com_dict where zdlb = 'DP' AND zddh = a.ksdh) as ksname, c.confirmdt as confirmdt - from lab_reqmain a left join lab_feeitemclass b on (a.bgddh = b.sflbdh),lab_pat c where a.sqh = c.sqh + from lab_reqmain a left join lab_feeitemclass b on (a.bgddh = b.sflbdh) left join lab_pat c on (a.sqh = c.sqh)