From d45f50dcb7814413b37df4b7da5d3a129984ab15 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 24 Jun 2025 18:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lis-common/pom.xml | 6 -- .../common/core/domain/entity/ComOpt.java | 17 +++++ lis-interfaceCommon/pom.xml | 7 ++ .../interfaceCommon/mapper/ComOptMapper.java | 9 +++ .../interfaceCommon/mapper/CommonMapper.java | 4 ++ .../interfaceCommon/mapper/LabPatMapper.java | 11 ++++ .../mapper/LabReqdetailMapper.java | 4 ++ .../mapper/LabReqmainMapper.java | 4 ++ .../interfaceCommon/utils/CommonUtil.java | 27 ++++++++ .../utils}/LisInterfaceUtil.java | 2 +- .../main/resources/mapper/ComOptMapper.xml | 16 +++++ .../main/resources/mapper/LabPatMapper.xml | 12 ++++ liswork/pom.xml | 8 ++- .../work/LisWorkPageInfoController.java | 32 ++++++++- .../czlis/liswork/mapper/LisWorkMapper.java | 3 +- .../liswork/mapper/LisWorkPageInfoMapper.java | 21 ++++++ .../com/czlis/liswork/pojo/LabResultRe.java | 25 +++++++ .../service/LisWorkPageInfoService.java | 9 +++ .../impl/LisWorkPageInfoServiceImpl.java | 66 +++++++++++++++++++ .../service/impl/LisWorkServiceImpl.java | 9 ++- .../main/resources/mapper/LisWorkMapper.xml | 4 ++ .../mapper/LisWorkPageInfoMapper.xml | 42 ++++++++++++ mzcx/pom.xml | 2 +- pom.xml | 7 ++ zybgcx/pom.xml | 2 +- zycx/pom.xml | 2 +- .../czlis/zycx/controller/ZycxController.java | 4 +- 27 files changed, 336 insertions(+), 19 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/ComOpt.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqdetailMapper.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java rename {lis-common/src/main/java/com/czlis/common/utils/lisinterface => lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils}/LisInterfaceUtil.java (98%) create mode 100644 lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml create mode 100644 lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java create mode 100644 liswork/src/main/java/com/czlis/liswork/pojo/LabResultRe.java create mode 100644 liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml diff --git a/lis-common/pom.xml b/lis-common/pom.xml index 1940761..0e6d28a 100644 --- a/lis-common/pom.xml +++ b/lis-common/pom.xml @@ -148,12 +148,6 @@ pinyin4j - - com.czlis - lis-interfaceCommon - 8.0.0 - - \ No newline at end of file diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/ComOpt.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/ComOpt.java new file mode 100644 index 0000000..f7297e5 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/ComOpt.java @@ -0,0 +1,17 @@ +package com.czlis.common.core.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ComOpt { + private String yq; + private String xxdh; + private String xxlb; + private String xxqz; + private String bz; + +} diff --git a/lis-interfaceCommon/pom.xml b/lis-interfaceCommon/pom.xml index 1eae88c..2d535e4 100644 --- a/lis-interfaceCommon/pom.xml +++ b/lis-interfaceCommon/pom.xml @@ -11,6 +11,13 @@ lis-interfaceCommon + + + com.czlis + lis-common + + + \ No newline at end of file diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java new file mode 100644 index 0000000..647b534 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java @@ -0,0 +1,9 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.ComOpt; + +public interface ComOptMapper { + ComOpt getComOptOne(String yq,String xxdh); + String getComOptValue(String yq,String xxdh); + +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java new file mode 100644 index 0000000..d35ed1e --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java @@ -0,0 +1,4 @@ +package com.czlis.interfaceCommon.mapper; + +public interface CommonMapper { +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java new file mode 100644 index 0000000..6da6110 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java @@ -0,0 +1,11 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.LabPat; + +import java.util.Date; +import java.util.List; + +public interface LabPatMapper { + List getLabPatList(); + LabPat getLabPatOne(Date jyrq, String yq,String ybh); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqdetailMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqdetailMapper.java new file mode 100644 index 0000000..4651063 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqdetailMapper.java @@ -0,0 +1,4 @@ +package com.czlis.interfaceCommon.mapper; + +public interface LabReqdetailMapper { +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java new file mode 100644 index 0000000..6351d1d --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqmainMapper.java @@ -0,0 +1,4 @@ +package com.czlis.interfaceCommon.mapper; + +public interface LabReqmainMapper { +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java new file mode 100644 index 0000000..854bea2 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -0,0 +1,27 @@ +package com.czlis.interfaceCommon.utils; + +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.interfaceCommon.mapper.ComOptMapper; +import com.czlis.interfaceCommon.mapper.LabPatMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class CommonUtil { + + @Autowired + LabPatMapper labPatMapper; + @Autowired + ComOptMapper comOptMapper; + + + public LabPat getLabPatOne(Date jyrq, String yq, String ybh){ + return labPatMapper.getLabPatOne(jyrq, yq, ybh); + } + + public String getComOptValue(String yq,String xxdh){ + return comOptMapper.getComOptValue(yq,xxdh); + } +} diff --git a/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java similarity index 98% rename from lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java rename to lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java index d94ab41..2b59e98 100644 --- a/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java @@ -1,4 +1,4 @@ -package com.czlis.common.utils.lisinterface; +package com.czlis.interfaceCommon.utils; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml new file mode 100644 index 0000000..9232d3c --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml new file mode 100644 index 0000000..fa79d49 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/liswork/pom.xml b/liswork/pom.xml index af51ec6..5551323 100644 --- a/liswork/pom.xml +++ b/liswork/pom.xml @@ -19,7 +19,13 @@ com.czlis - lis-common + lis-interfaceCommon + + + + org.springframework.boot + spring-boot-starter-test + test diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 2596d8d..582a9a0 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; + @Api(tags = "获取检验tab页面信息") @RestController @RequestMapping("/lisworkpageinfo") @@ -19,9 +21,35 @@ public class LisWorkPageInfoController { @ApiOperation("获取检验结果图片信息") @GetMapping("/resultgraph") - public Result resultGraph(){ - return null; + public Result resultGraph(Date jyrq,String yq,String ybh){ + return lisWorkPageInfoService.resultGraph(jyrq,yq,ybh); + } + + @ApiOperation("获取复查结果") + @GetMapping("/redo") + public Result getRedo(Date jyrq,String yq,String ybh){ + return lisWorkPageInfoService.getRedo(jyrq,yq,ybh); + } + + @ApiOperation("获取历史结果") + @GetMapping("/history") + public Result getHistory(Date jyrq,String yq,String ybh){ + return lisWorkPageInfoService.getHistory(jyrq,yq,ybh); + } + + @ApiOperation("获取其他仪器结果") + @GetMapping("/otherinstr") + public Result getOtherinstr(Date jyrq,String yq,String ybh){ + return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh); + } + + @ApiOperation("获取收费信息") + @GetMapping("/reqdetail") + public Result getReqdetail(Date jyrq,String yq,String ybh){ + return lisWorkPageInfoService.getReqdetail(jyrq,yq,ybh); } + + } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 3b7bcd1..485dc2d 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -3,6 +3,7 @@ package com.czlis.liswork.mapper; import com.czlis.common.core.domain.entity.LabPat; import com.czlis.common.core.domain.entity.LabResult; import com.czlis.common.core.domain.entity.LabResultMed; +import com.czlis.common.core.domain.entity.SysUser; import com.czlis.liswork.pojo.ComOpt; import com.czlis.liswork.pojo.ComUsrpower; import com.czlis.liswork.pojo.LabPatInfo; @@ -19,5 +20,5 @@ public interface LisWorkMapper { List getLabResult(LabResult labResult); List getLabPatInfo(LabPatInfo labPatInfo); List getLabResultMedInfo(LabResultMed labResultMed); - + SysUser getSysUser(String userId, String mm); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java new file mode 100644 index 0000000..ae51d06 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java @@ -0,0 +1,21 @@ +package com.czlis.liswork.mapper; + +import cn.hutool.core.date.DateTime; +import com.czlis.common.core.domain.entity.LabReqdetail; +import com.czlis.liswork.pojo.LabGraph; +import com.czlis.liswork.pojo.LabGraphUnit; +import com.czlis.liswork.pojo.LabOldGraph; +import com.czlis.liswork.pojo.LabResultRe; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +public interface LisWorkPageInfoMapper { + List getLabGraphList(Date jyrq,String yq,String ybh); + List getLabOldGraphList(Date jyrq,String yq,String ybh); + List getLabGraphUnitList(String yq,String txmc); + List getRedo(Date jyrq, String yq, String ybh); + List getReqdetail(String sqh); + List> getOtherinstr(Date dayStart, DateTime dayEnd, String brdh, String brxm); +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/LabResultRe.java b/liswork/src/main/java/com/czlis/liswork/pojo/LabResultRe.java new file mode 100644 index 0000000..d1d3708 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/LabResultRe.java @@ -0,0 +1,25 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabResultRe { + private String wyh; + private Date jyrq; + private String yq; + private String ybh; + private String xmdh; + private String csjg; + private String od; + private String cutoff; + private String jgbz; + private String bz1; + private String bz2; + private String yhdh; +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java index 6e2ce55..961e26d 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -1,4 +1,13 @@ package com.czlis.liswork.service; +import com.czlis.common.core.domain.Result; + +import java.util.Date; + public interface LisWorkPageInfoService { + Result resultGraph(Date jyrq, String yq, String ybh); + Result getRedo(Date jyrq, String yq, String ybh); + Result getHistory(Date jyrq, String yq, String ybh); + Result getReqdetail(Date jyrq, String yq, String ybh); + Result getOtherinstr(Date jyrq, String yq, String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index e00420d..11c4558 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -1,10 +1,76 @@ package com.czlis.liswork.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.common.core.domain.entity.LabReqdetail; +import com.czlis.liswork.mapper.LisWorkPageInfoMapper; +import com.czlis.liswork.pojo.LabGraph; +import com.czlis.liswork.pojo.LabGraphUnit; +import com.czlis.liswork.pojo.LabOldGraph; +import com.czlis.liswork.pojo.LabResultRe; import com.czlis.liswork.service.LisWorkPageInfoService; +import com.czlis.interfaceCommon.utils.CommonUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.*; + @Service @Slf4j public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { + + @Autowired + LisWorkPageInfoMapper lisWorkPageInfoMapper; + @Autowired + CommonUtil commonUtil; + + @Override + public Result resultGraph(Date jyrq, String yq, String ybh) { + List labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh); + List labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,""); + List labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh); + List> queryList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("labGraphList",labGraphList); + map.put("labGraphUnitList",labGraphUnitList); + map.put("labOldGraphList",labOldGraphList); + queryList.add(map); + return new Result("0","获取数据成功！",queryList); + } + + @Override + public Result getRedo(Date jyrq, String yq, String ybh) { + List labResultReList = lisWorkPageInfoMapper.getRedo(jyrq,yq,ybh); + return new Result("0","获取数据成功！",labResultReList); + } + + @Override + public Result getHistory(Date jyrq, String yq, String ybh) { + return null; + } + + @Override + public Result getReqdetail(Date jyrq, String yq, String ybh) { + LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); + if(labPatOne == null) return new Result("-1","没有查到对应的上机记录！"); + String sqh = labPatOne.getSqh(); + List labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh); + return new Result("0","获取数据成功！",labReqdetailList); + } + + @Override + public Result getOtherinstr(Date jyrq, String yq, String ybh) { + String value = commonUtil.getComOptValue(yq, "COMPAREDA"); + DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value)); + LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); + String brdh = labPatOne.getBrdh(); + String brxm = labPatOne.getBrxm(); + List> queryList = lisWorkPageInfoMapper.getOtherinstr(jyrq,dayEnd,brdh,brxm); + return new Result("0","查询数据成功！",queryList); + } + + } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 9ebc210..7f44bb7 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -4,6 +4,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.LabPat; import com.czlis.common.core.domain.entity.LabResult; import com.czlis.common.core.domain.entity.LabResultMed; +import com.czlis.common.core.domain.entity.SysUser; import com.czlis.liswork.mapper.LisWorkMapper; import com.czlis.liswork.pojo.ComOpt; import com.czlis.liswork.pojo.ComUsrpower; @@ -86,8 +87,12 @@ public class LisWorkServiceImpl implements LisWorkService { public Result checkUser(String yhdh, String mm) { if(yhdh == null || yhdh.equals("")) return new Result("-1","用户名不能为空！"); if(mm == null || mm.equals("")) return new Result("-1","密码不能为空！"); - //lisWorkMapper.get - return null; + SysUser sysUser = lisWorkMapper.getSysUser(yhdh, mm); + if(sysUser != null){ + return new Result("0","登录成功！"); + }else{ + return new Result("-1","登录失败，账户密码不正确！"); + } } } diff --git a/liswork/src/main/resources/mapper/LisWorkMapper.xml b/liswork/src/main/resources/mapper/LisWorkMapper.xml index 5f39b66..4ca0a6f 100644 --- a/liswork/src/main/resources/mapper/LisWorkMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkMapper.xml @@ -41,4 +41,8 @@ and ywdh = #{ywdh} + + diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml new file mode 100644 index 0000000..5056a9b --- /dev/null +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + diff --git a/mzcx/pom.xml b/mzcx/pom.xml index 746d450..79dd450 100644 --- a/mzcx/pom.xml +++ b/mzcx/pom.xml @@ -18,7 +18,7 @@ com.czlis - lis-common + lis-interfaceCommon diff --git a/pom.xml b/pom.xml index 5ab77a3..007cdfe 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,13 @@ ${tomcat.version} + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + com.alibaba diff --git a/zybgcx/pom.xml b/zybgcx/pom.xml index b7a55f6..6e7e217 100644 --- a/zybgcx/pom.xml +++ b/zybgcx/pom.xml @@ -14,7 +14,7 @@ com.czlis - lis-common + lis-interfaceCommon diff --git a/zycx/pom.xml b/zycx/pom.xml index 552c197..12dd545 100644 --- a/zycx/pom.xml +++ b/zycx/pom.xml @@ -18,7 +18,7 @@ com.czlis - lis-common + lis-interfaceCommon diff --git a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java index b7b88fd..9c7d5ff 100644 --- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java +++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java @@ -4,14 +4,12 @@ import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.LabReqmain; import com.czlis.common.core.page.TableDataInfo; -import com.czlis.common.utils.lisinterface.LisInterfaceUtil; -import com.czlis.zycx.pojo.Web_getBarcode; +import com.czlis.interfaceCommon.utils.LisInterfaceUtil; import com.czlis.zycx.service.ZycxService; 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.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource;