From 2834ef95bbdd046a6a0f52c29b569f49aea0b9ba Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 21 May 2025 14:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E9=87=87=E8=A1=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lis-common/pom.xml | 5 +++ lis-system/pom.xml | 2 + .../czlis/system/config/SecurityConfig.java | 2 +- .../controller/dict/DictController.java | 5 ++- .../service/impl/ComDictServiceImpl.java | 9 +++- .../main/resources/mapper/ComDictMapper.xml | 35 +++++++-------- pom.xml | 8 ++++ .../czlis/zycx/controller/ZycxController.java | 23 ++++++++-- .../com/czlis/zycx/mapper/ZycxMapper.java | 6 +++ .../com/czlis/zycx/service/ZycxService.java | 4 ++ .../zycx/service/impl/ZycxServiceImpl.java | 45 +++++++++++++++++++ zycx/src/main/resources/mapper/ZycxMapper.xml | 20 +++++++++ 12 files changed, 139 insertions(+), 25 deletions(-) diff --git a/lis-common/pom.xml b/lis-common/pom.xml index b12b3e3..0e6d28a 100644 --- a/lis-common/pom.xml +++ b/lis-common/pom.xml @@ -143,6 +143,11 @@ 1.6.2 + + com.belerweb + pinyin4j + + \ No newline at end of file diff --git a/lis-system/pom.xml b/lis-system/pom.xml index d4ba69b..dca6f9f 100644 --- a/lis-system/pom.xml +++ b/lis-system/pom.xml @@ -55,6 +55,7 @@ zybgcx + com.czlis lis-quartz @@ -178,6 +179,7 @@ maven-resources-plugin + 3.3.1 copy-resources diff --git a/lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java b/lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java index b9699b8..6767a23 100644 --- a/lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java +++ b/lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig { requests.antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/zyreq/**").permitAll() .antMatchers("/doc.html").permitAll() //Knife4j 过滤 // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java index bdc88de..34260c7 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java @@ -48,14 +48,17 @@ public class DictController extends BaseController { } + @ApiOperation("删除字典") @DeleteMapping("/del") public Result delComDict(ComDict comDict){ log.info("调用删除字典接口{}",comDict); return comDictService.delComDict(comDict); } + @ApiOperation("修改字典") @PostMapping("/update") - public Result updateComDict(ComDict comDict){ + public Result updateComDict(@RequestBody ComDict comDict){ + log.info("调用修改字典接口{}",comDict); return comDictService.updateComDict(comDict); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java index c3fce6e..94f2caf 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java @@ -1,6 +1,7 @@ package com.czlis.liswork.service.impl; +import cn.hutool.extra.pinyin.PinyinUtil; import com.czlis.common.core.domain.Result; import com.czlis.common.utils.ComDictUtils; import com.czlis.liswork.mapper.dict.ComDictMapper; @@ -44,6 +45,12 @@ public class ComDictServiceImpl implements ComDictService { @Transactional(rollbackFor = Exception.class) @Override public Result insertComDict(ComDict comDict) { + String pinyin = PinyinUtil.getFirstLetter(comDict.getZdmc(), ""); //拼音首字母 + if(pinyin.length() >= 9) { + pinyin = pinyin.substring(0, 9); + } + comDict.setZjf(pinyin); + comDict.setZdbz("Y"); int row = comDictMapper.insertComDict(comDict); if(row > 0){ List comDictList = comDictMapper.getComDictList(comDict); @@ -73,7 +80,7 @@ public class ComDictServiceImpl implements ComDictService { List comDictList = comDictMapper.getComDictList(comDict); ComDictUtils.setDictCache(comDict.getZdlb(),comDictList); } - return null; + return new Result("0","修改成功！"); } } diff --git a/liswork/src/main/resources/mapper/ComDictMapper.xml b/liswork/src/main/resources/mapper/ComDictMapper.xml index 1777a5d..5ff0024 100644 --- a/liswork/src/main/resources/mapper/ComDictMapper.xml +++ b/liswork/src/main/resources/mapper/ComDictMapper.xml @@ -27,7 +27,6 @@ insert into com_dict( - zdlb, zddh, zdmc, zjf, @@ -35,15 +34,16 @@ bz, yljg, userflag, + zdlb )values( - #{zdlb} - #{zddh} - #{zdmc} - #{zjf} - #{zdbz} - #{bz} - #{yljg} - #{userflag} + #{zddh}, + #{zdmc}, + #{zjf}, + #{zdbz}, + #{bz}, + #{yljg}, + #{userflag}, + #{zdlb} ) @@ -54,16 +54,15 @@ update com_dict - zdlb = #{zdlb} - zddh = #{zddh} - zdmc= #{zdmc} - zjf = #{zjf} - zdbz = #{zdbz} - bz = #{bz} - yljg = #{yljg} - userflag = #{userflag} + zdmc= #{zdmc}, + zjf = #{zjf}, + zdbz = #{zdbz}, + bz = #{bz}, + yljg = #{yljg}, + userflag = #{userflag}, + zddh = #{zddh} - where zdlb = #{zdlb} and zddh = {zddh} and yljg = #{yljg} + where zdlb = #{zdlb} and zddh = #{zddh} and yljg = #{yljg} diff --git a/pom.xml b/pom.xml index 7703568..13efcf6 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ 1.18.26 3.0.3 8.2.2.jre8 + 2.5.1 9.0.98 @@ -268,6 +269,13 @@ mssql-jdbc ${sqlserver.version} + + + + com.belerweb + pinyin4j + ${pinyin4j.version} + 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 92ee37c..9a04498 100644 --- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java +++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java @@ -8,12 +8,10 @@ import com.czlis.zycx.pojo.Web_getBarcode; 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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,6 +22,7 @@ import java.util.List; @Api(tags = "住院采血接口") @RestController @RequestMapping("/zyreq") +@Slf4j public class ZycxController extends BaseController { @Autowired private ZycxService zycxService; @@ -38,6 +37,22 @@ public class ZycxController extends BaseController { return getDataTable(sqdInfoList); } + @ApiOperation("生成条码") + @GetMapping("/add") + public Result createSQD(String dept,String userid,String st,String et,String yljg){ + log.info("调用生成条码接口：{},{},{},{},{}",dept,userid,st,et,yljg); + return zycxService.createSQD(dept,userid,st,et,yljg); + } + + + @ApiOperation("执行条码") + @GetMapping("/print") + public Result execSQD(String sqh,String userid,String status,String yljg){ + log.info("执行条码接口：{},{},{},{}",sqh,userid,status,yljg); + return zycxService.execSQD(sqh,userid,status,yljg); + } + + diff --git a/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java b/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java index f35369b..dc9a719 100644 --- a/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java +++ b/zycx/src/main/java/com/czlis/zycx/mapper/ZycxMapper.java @@ -1,13 +1,19 @@ package com.czlis.zycx.mapper; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.LabReqmain; import com.czlis.zycx.pojo.Web_getBarcode; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; public interface ZycxMapper { List getSQDInfo(LabReqmain labReqmain); + + void createSQD(Map map); + + void execSQD(Map map); } diff --git a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java index e8dd06c..75c3331 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java +++ b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java @@ -9,4 +9,8 @@ import java.util.List; public interface ZycxService { List getSQDInfo(LabReqmain labReqmain); + + Result createSQD(String dept, String userid, String st, String et, String yljg); + + Result execSQD(String sqh,String userid,String status,String yljg ); } 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 3c2ac48..4187c32 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 @@ -8,9 +8,12 @@ import com.czlis.zycx.service.ZycxService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -25,4 +28,46 @@ public class ZycxServiceImpl implements ZycxService { return zycxMapper.getSQDInfo(labReqmain); } + @Transactional + @Override + public Result createSQD(String dept, String userid, String st, String et, String yljg) { + Map map = new HashMap<>(); + map.put("dept", dept); + map.put("userid", userid); + map.put("st", st); + map.put("et", et); + map.put("yljg", yljg); + map.put("retcode",""); + map.put("retmsg",""); + zycxMapper.createSQD(map); + String retCode = String.valueOf(map.get("retcode")); + String retMsg = String.valueOf(map.get("retmsg")); + log.info("生成条码存储过程出参：{},{}",retCode,retMsg); + if(retCode.equals("0")){ + return new Result("0","生成条码成功！"); + }else{ + return new Result("-1","生成条码失败！"+retMsg); + } + } + + @Override + public Result execSQD(String sqh,String userid,String status,String yljg) { + Map map = new HashMap<>(); + map.put("sqh", sqh); + map.put("userid", userid); + map.put("status", status); + //map.put("yljg", yljg); + map.put("retcode",""); + map.put("retmsg",""); + zycxMapper.execSQD(map); + String retCode = String.valueOf(map.get("retcode")); + String retMsg = String.valueOf(map.get("retmsg")); + log.info("调用执行状态存储过程出参：{},{}",retCode,retMsg); + if(retCode.equals("0")){ + return new Result("0","修改状态成功！"); + }else{ + return new Result("-1","修改状态失败！"+retMsg); + } + } + } diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index 6f512de..315aa61 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -25,5 +25,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + \ No newline at end of file