From 949df5662245e47a9129415794716a928ec49246 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 17 Mar 2026 15:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E7=BC=93?= =?UTF-8?q?=E5=AD=98,=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0=E5=8C=BB?= =?UTF-8?q?=E7=96=97=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity}/SysConfig.java | 2 +- .../core/domain/entity/reg/RegApply.java | 1 + .../core/domain/entity/reg/RegDict.java | 2 + .../domain/entity/reg/RegLocalconfig.java | 21 ++++++++++ .../common/core/domain/entity/reg/RegOpt.java | 16 ++++++++ ...gMapper.java => RegLocalconfigMapper.java} | 2 +- .../interfaceCommon/mapper/RegOptMapper.java | 7 ++++ .../mapper/SysConfigMapper.java | 4 +- .../interfaceCommon/utils/CommonUtil.java | 38 +++++++++++++----- ...figMapper.xml => RegLocalconfigMapper.xml} | 6 +-- .../main/resources/mapper/RegOptMapper.xml | 8 ++++ .../resources/mapper}/SysConfigMapper.xml | 2 +- .../system/service/ISysConfigService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 20 +++------- .../system/SysConfigController.java | 2 +- .../controller/RegOptController.java | 40 +++++++++++++++++++ .../controller/dict/RegDictController.java | 12 ++++++ .../transitPF/mapper/RegDictMapper.java | 4 +- .../transitPF/service/RegOptService.java | 10 +++++ .../service/impl/RegDictServiceImpl.java | 23 +++++++++-- .../service/impl/RegOptServiceImpl.java | 26 ++++++++++++ .../impl/RegRequestInfoServiceImpl.java | 6 ++- .../main/resources/mapper/RegDictMapper.xml | 14 ++++--- .../resources/mapper/RegRequestInfoMapper.xml | 3 +- 24 files changed, 224 insertions(+), 47 deletions(-) rename {pf_system/src/main/java/com/transitPlatForm/system/domain => pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity}/SysConfig.java (98%) create mode 100644 pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegLocalconfig.java create mode 100644 pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegOpt.java rename pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/{ComLocalconfigMapper.java => RegLocalconfigMapper.java} (77%) create mode 100644 pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegOptMapper.java rename {pf_system/src/main/java/com/transitPlatForm/system => pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon}/mapper/SysConfigMapper.java (92%) rename pf_interfaceCommon/src/main/resources/mapper/{ComLocalconfigMapper.xml => RegLocalconfigMapper.xml} (59%) create mode 100644 pf_interfaceCommon/src/main/resources/mapper/RegOptMapper.xml rename {pf_system/src/main/resources/mapper/system => pf_interfaceCommon/src/main/resources/mapper}/SysConfigMapper.xml (98%) create mode 100644 pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegOptController.java create mode 100644 pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegOptService.java create mode 100644 pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegOptServiceImpl.java diff --git a/pf_system/src/main/java/com/transitPlatForm/system/domain/SysConfig.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysConfig.java similarity index 98% rename from pf_system/src/main/java/com/transitPlatForm/system/domain/SysConfig.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysConfig.java index ba182c4..fef5dbb 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/domain/SysConfig.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.transitPlatForm.system.domain; +package com.transitPlatForm.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java index 494585e..7b4c5cf 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java @@ -56,4 +56,5 @@ public class RegApply { private String reqDetailName; private String bz; private String slzq; + private String OrderDate; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java index 6e9b592..777f489 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java @@ -42,4 +42,6 @@ public class RegDict extends BaseEntity { */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; + + private Integer hospital_id; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegLocalconfig.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegLocalconfig.java new file mode 100644 index 0000000..fc783cf --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegLocalconfig.java @@ -0,0 +1,21 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegLocalconfig { + private String smac; + private String sip; + private String sname; + private String configvalue; + private String create_by; + private Date create_time; + private String update_by; + private Date update_time; +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegOpt.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegOpt.java new file mode 100644 index 0000000..494a800 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegOpt.java @@ -0,0 +1,16 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegOpt { + private String opt_code; + private String opt_name; + private String opt_value; + private String opt_class; + private String bz; +} diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/ComLocalconfigMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegLocalconfigMapper.java similarity index 77% rename from pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/ComLocalconfigMapper.java rename to pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegLocalconfigMapper.java index 09c1c92..4ff4adb 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/ComLocalconfigMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegLocalconfigMapper.java @@ -1,6 +1,6 @@ package com.transitPlatForm.interfaceCommon.mapper; -public interface ComLocalconfigMapper { +public interface RegLocalconfigMapper { String getLocalconfig(String smac); String getLocalconfigByIP(String ip); } diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegOptMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegOptMapper.java new file mode 100644 index 0000000..9247ae5 --- /dev/null +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegOptMapper.java @@ -0,0 +1,7 @@ +package com.transitPlatForm.interfaceCommon.mapper; + +import com.transitPlatForm.common.core.domain.entity.reg.RegOpt; + +public interface RegOptMapper { + RegOpt queryOptOne(String opt_code); +} diff --git a/pf_system/src/main/java/com/transitPlatForm/system/mapper/SysConfigMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysConfigMapper.java similarity index 92% rename from pf_system/src/main/java/com/transitPlatForm/system/mapper/SysConfigMapper.java rename to pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysConfigMapper.java index 65d3f75..4bd9564 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/mapper/SysConfigMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysConfigMapper.java @@ -1,6 +1,6 @@ -package com.transitPlatForm.system.mapper; +package com.transitPlatForm.interfaceCommon.mapper; -import com.transitPlatForm.system.domain.SysConfig; +import com.transitPlatForm.common.core.domain.entity.SysConfig; import java.util.List; diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java index f81e242..d94b2ff 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java @@ -1,17 +1,17 @@ package com.transitPlatForm.interfaceCommon.utils; -import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.constant.CacheConstants; +import com.transitPlatForm.common.core.domain.entity.SysConfig; import com.transitPlatForm.common.core.domain.entity.SysUser; import com.transitPlatForm.common.core.domain.entity.reg.RegSeq; -import com.transitPlatForm.interfaceCommon.mapper.ComLocalconfigMapper; -import com.transitPlatForm.interfaceCommon.mapper.CommonMapper; -import com.transitPlatForm.interfaceCommon.mapper.RegSeqMapper; -import com.transitPlatForm.interfaceCommon.mapper.SysUserCommMapper; +import com.transitPlatForm.common.core.redis.RedisCache; +import com.transitPlatForm.common.core.text.Convert; +import com.transitPlatForm.common.utils.StringUtils; +import com.transitPlatForm.interfaceCommon.mapper.*; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -25,9 +25,15 @@ public class CommonUtil { @Autowired SysUserCommMapper sysUserCommMapper; @Autowired - ComLocalconfigMapper comLocalconfigMapper; + RegLocalconfigMapper regLocalconfigMapper; @Autowired RegSeqMapper regSeqMapper; + @Autowired + private SysConfigMapper configMapper; + + @Autowired + private RedisCache redisCache; + @@ -57,11 +63,11 @@ public class CommonUtil { } public String getLocalconfig(String smac) { - return comLocalconfigMapper.getLocalconfig(smac); + return regLocalconfigMapper.getLocalconfig(smac); } public String getLocalconfigByIP(String ip) { - return comLocalconfigMapper.getLocalconfigByIP(ip); + return regLocalconfigMapper.getLocalconfigByIP(ip); } /** @@ -109,5 +115,19 @@ public class CommonUtil { return map; } + public String selectConfigByKey(String configKey) { + String configValue = Convert.toStr(redisCache.getCacheObject(CacheConstants.SYS_CONFIG_KEY + configKey)); + if (StringUtils.isNotEmpty(configValue)) { + return configValue; + } + SysConfig config = new SysConfig(); + config.setConfigKey(configKey); + SysConfig retConfig = configMapper.selectConfig(config); + if (StringUtils.isNotNull(retConfig)) { + redisCache.setCacheObject(CacheConstants.SYS_CONFIG_KEY + configKey, retConfig.getConfigValue()); + return retConfig.getConfigValue(); + } + return StringUtils.EMPTY; + } } diff --git a/pf_interfaceCommon/src/main/resources/mapper/ComLocalconfigMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegLocalconfigMapper.xml similarity index 59% rename from pf_interfaceCommon/src/main/resources/mapper/ComLocalconfigMapper.xml rename to pf_interfaceCommon/src/main/resources/mapper/RegLocalconfigMapper.xml index 96aaec2..0d9fbe0 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/ComLocalconfigMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegLocalconfigMapper.xml @@ -1,11 +1,11 @@ - + diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegOptMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegOptMapper.xml new file mode 100644 index 0000000..a425ffb --- /dev/null +++ b/pf_interfaceCommon/src/main/resources/mapper/RegOptMapper.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/pf_system/src/main/resources/mapper/system/SysConfigMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/SysConfigMapper.xml similarity index 98% rename from pf_system/src/main/resources/mapper/system/SysConfigMapper.xml rename to pf_interfaceCommon/src/main/resources/mapper/SysConfigMapper.xml index 7c06984..9102e57 100644 --- a/pf_system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pf_system/src/main/java/com/transitPlatForm/system/service/ISysConfigService.java b/pf_system/src/main/java/com/transitPlatForm/system/service/ISysConfigService.java index 5944e32..d5b9fa7 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/service/ISysConfigService.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/service/ISysConfigService.java @@ -2,7 +2,7 @@ package com.transitPlatForm.system.service; import java.util.List; -import com.transitPlatForm.system.domain.SysConfig; +import com.transitPlatForm.common.core.domain.entity.SysConfig; /** * 参数配置 服务层 diff --git a/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysConfigServiceImpl.java b/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysConfigServiceImpl.java index cf2300e..d4dbd2c 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysConfigServiceImpl.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysConfigServiceImpl.java @@ -13,8 +13,8 @@ import com.transitPlatForm.common.core.text.Convert; import com.transitPlatForm.common.enums.DataSourceType; import com.transitPlatForm.common.exception.ServiceException; import com.transitPlatForm.common.utils.StringUtils; -import com.transitPlatForm.system.domain.SysConfig; -import com.transitPlatForm.system.mapper.SysConfigMapper; +import com.transitPlatForm.common.core.domain.entity.SysConfig; +import com.transitPlatForm.interfaceCommon.mapper.SysConfigMapper; import com.transitPlatForm.system.service.ISysConfigService; /** @@ -30,14 +30,6 @@ public class SysConfigServiceImpl implements ISysConfigService { @Autowired private RedisCache redisCache; - /** - * 项目启动时，初始化参数到缓存 - */ -// @PostConstruct -// public void init() { -// loadingConfigCache(); -// } - /** * 查询参数配置信息 * @@ -156,10 +148,10 @@ public class SysConfigServiceImpl implements ISysConfigService { */ @Override public void loadingConfigCache() { -// List configsList = configMapper.selectConfigList(new SysConfig()); -// for (SysConfig config : configsList) { -// redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); -// } + List configsList = configMapper.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } } /** diff --git a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysConfigController.java b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysConfigController.java index 4ea0e3f..52c7f81 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysConfigController.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysConfigController.java @@ -6,7 +6,7 @@ import com.transitPlatForm.common.core.domain.AjaxResult; import com.transitPlatForm.common.core.page.TableDataInfo; import com.transitPlatForm.common.enums.BusinessType; import com.transitPlatForm.common.utils.poi.ExcelUtil; -import com.transitPlatForm.system.domain.SysConfig; +import com.transitPlatForm.common.core.domain.entity.SysConfig; import com.transitPlatForm.system.service.ISysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegOptController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegOptController.java new file mode 100644 index 0000000..726831c --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegOptController.java @@ -0,0 +1,40 @@ +package com.transitPlatForm.transitPF.controller; + +import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegOpt; +import com.transitPlatForm.transitPF.service.RegOptService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 参数控制 + */ +@Api(tags = "参数控制") +@RestController +@RequestMapping("/opt") +@Slf4j +public class RegOptController { + + @Autowired + RegOptService regOptService; + + @ApiOperation("获取参数值") + @GetMapping("/value") + public Result getOptOne(String opt_code){ + return regOptService.getOptOne(opt_code); + } + + + @ApiOperation("增加参数") + @PostMapping("/add") + public Result addOpt(RegOpt regOpt){ + return regOptService.addOpt(regOpt); + } + +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java index 0e7f883..6d9abd1 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java @@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.List; @Api(tags = "区域检验中心-常用字典管理") @@ -27,6 +28,9 @@ import java.util.List; public class RegDictController extends BaseController { @Autowired private RegDictService regDictService; + + public static final String[] dict_type = {"DEPT","DOCTOR"}; + /** * 获取字典列表 */ @@ -68,6 +72,14 @@ public class RegDictController extends BaseController { @Log(title = SysLogConstants.DICT, businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated @RequestBody RegDict post) { + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + if(loginYLJG == null || loginYLJG.equals("")) return AjaxResult.error("没有获取到登录的医疗机构！"); + //匹配字典类型 + if(Arrays.stream(dict_type).anyMatch(post.getDictType():: equals)){ + post.setHospital_id(Integer.parseInt(loginYLJG)); + }else{ + post.setHospital_id(0); //默认医疗机构为0 + } if (!regDictService.checkDictNameUnique(post)) { return error("新增字典'" + post.getDictName() + "'失败，字典名称已存在"); } else if (!regDictService.checkDictCodeUnique(post)) { diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java index 06f9549..3a67967 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java @@ -69,7 +69,7 @@ public interface RegDictMapper { * @param dictType 类别 * @return 结果 */ - RegDict checkDictNameUnique(@Param("dictName") String dictName,@Param("dictType") String dictType); + RegDict checkDictNameUnique(@Param("dictName") String dictName,@Param("dictType") String dictType,@Param("hospital_id") int hospital_id); /** * 校验字典编码 @@ -77,7 +77,7 @@ public interface RegDictMapper { * @param DictCode 字典编码 * @return 结果 */ - RegDict checkDictCodeUnique(@Param("dictCode") String DictCode,@Param("dictType") String dictType); + RegDict checkDictCodeUnique(@Param("dictCode") String DictCode,@Param("dictType") String dictType,@Param("hospital_id") int hospital_id); List getInfoOne(String dict_type); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegOptService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegOptService.java new file mode 100644 index 0000000..69e8f56 --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegOptService.java @@ -0,0 +1,10 @@ +package com.transitPlatForm.transitPF.service; + +import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegOpt; + +public interface RegOptService { + Result getOptOne(String optCode); + + Result addOpt(RegOpt regOpt); +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java index 8576bfb..0adbf51 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java @@ -2,9 +2,11 @@ package com.transitPlatForm.transitPF.service.impl; import com.transitPlatForm.common.constant.UserConstants; import com.transitPlatForm.common.core.domain.AjaxResult; +import com.transitPlatForm.common.core.domain.R; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.exception.ServiceException; import com.transitPlatForm.common.utils.StringUtils; +import com.transitPlatForm.interfaceCommon.utils.CommonUtil; import com.transitPlatForm.interfaceCommon.utils.LisUtil; import com.transitPlatForm.interfaceCommon.utils.cache.RegDictCache; import com.transitPlatForm.transitPF.mapper.RegDictMapper; @@ -23,6 +25,8 @@ import static com.transitPlatForm.common.core.domain.AjaxResult.success; public class RegDictServiceImpl implements RegDictService { @Autowired RegDictMapper dictMapper; + @Autowired + private CommonUtil commonUtil; /** * 查询字典信息集合 @@ -66,7 +70,7 @@ public class RegDictServiceImpl implements RegDictService { @Override public boolean checkDictNameUnique(RegDict Dict) { Long DictId = StringUtils.isNull(Dict.getDictId()) ? -1L : Dict.getDictId(); - RegDict info = dictMapper.checkDictNameUnique(Dict.getDictName(),Dict.getDictType()); + RegDict info = dictMapper.checkDictNameUnique(Dict.getDictName(),Dict.getDictType(),Dict.getHospital_id()); if (StringUtils.isNotNull(info) && info.getDictId().longValue() != DictId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -82,7 +86,7 @@ public class RegDictServiceImpl implements RegDictService { @Override public boolean checkDictCodeUnique(RegDict Dict) { Long DictId = StringUtils.isNull(Dict.getDictId()) ? -1L : Dict.getDictId(); - RegDict info = dictMapper.checkDictCodeUnique(Dict.getDictCode(),Dict.getDictType()); + RegDict info = dictMapper.checkDictCodeUnique(Dict.getDictCode(),Dict.getDictType(),Dict.getHospital_id()); if (StringUtils.isNotNull(info) && info.getDictId().longValue() != DictId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -129,7 +133,14 @@ public class RegDictServiceImpl implements RegDictService { throw new ServiceException(String.format("%1$s已分配,不能删除", Dict.getDictName())); } } - return dictMapper.deleteDictByIds(DictIds); + + int i = dictMapper.deleteDictByIds(DictIds); + //重新设置缓存 + RegDict regDict = new RegDict(); + regDict.setDictId(DictIds[0]); + List regDictList = dictMapper.selectDictList(regDict); + RegDictCache.setDictCache(regDict.getDictType(),regDictList); + return i; } /** @@ -140,6 +151,12 @@ public class RegDictServiceImpl implements RegDictService { */ @Override public int insertDict(RegDict Dict) { + //获取项目代号的最大值 + String dictIdentity = commonUtil.selectConfigByKey("dict_identity"); + if(dictIdentity == null) dictIdentity = LisUtil.isBank(dictIdentity); + if(dictIdentity.equals("1")){ + Dict.setDictCode(getMaxNo(Dict.getDictType(),LisUtil.isBank(Dict.getHospital_id()))); + } int i = dictMapper.insertDict(Dict); //设置缓存 List regDictList = dictMapper.getInfoOne(Dict.getDictType()); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegOptServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegOptServiceImpl.java new file mode 100644 index 0000000..d2ffa4a --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegOptServiceImpl.java @@ -0,0 +1,26 @@ +package com.transitPlatForm.transitPF.service.impl; + +import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegOpt; +import com.transitPlatForm.interfaceCommon.mapper.RegOptMapper; +import com.transitPlatForm.transitPF.service.RegOptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class RegOptServiceImpl implements RegOptService { + + @Autowired + private RegOptMapper regOptMapper; + + @Override + public Result getOptOne(String optCode) { + RegOpt regOpt = regOptMapper.queryOptOne(optCode); + return new Result("0","获取参数成功！",regOpt.getOpt_value()); + } + + @Override + public Result addOpt(RegOpt regOpt) { + return null; + } +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index ad62788..6a1b000 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -287,7 +287,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { } }); - String itemClassOne = ""; + String itemClassOne = "",yblxOne = ""; int xh = 0, k = -1; String barcode = ""; String jymd = ""; @@ -295,8 +295,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { for (Map stringObjectMap : reqSqdInfoList) { String itemClass = LisUtil.isBank(stringObjectMap.get("sample_SrcHospBarcode")); + String yblx = LisUtil.isBank(stringObjectMap.get("sample_SampleTypeName")); RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail(); - if (itemClassOne.equals(itemClass)) { + if (itemClassOne.equals(itemClass) && yblxOne.equals(yblx)) { xh++; stringObjectMap.put("sample_Barcode", barcode); stringObjectMap.put("detail_OrderItemSerial", xh); @@ -323,6 +324,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { } barcode = DateUtil.format(commonUtil.getCurrentTime(), "yyyyMMdd") + srcHospCode + commonUtil.getNextSeq_pro("barcode", 4); itemClassOne = itemClass; + yblxOne = yblx; } stringObjectMap.put("sample_Barcode", barcode); diff --git a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml index 00e5674..c9c4bcc 100644 --- a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml @@ -15,6 +15,7 @@ + @@ -56,16 +57,16 @@ - select top 1 dict_id, dict_code, dict_name, dict_Sort, status, create_by, create_time, remark from Reg_Dict - where dict_name=#{dictName} and dict_type = #{dictType} + where dict_name=#{dictName} and dict_type = #{dictType} and hospital_id = #{hospital_id} - select top 1 dict_id, dict_code, dict_name, dict_Sort, status, create_by, create_time, remark from Reg_Dict - where dict_code=#{dictCode} and dict_type = #{dictType} + where dict_code=#{dictCode} and dict_type = #{dictType} and hospital_id = #{hospital_id} @@ -78,6 +79,7 @@ status = #{status}, remark = #{remark}, update_by = #{updateBy}, + hospital_id = #{hospital_id}, update_time = getdate() where dict_id = #{dictId} @@ -85,23 +87,23 @@ insert into Reg_Dict( - dict_id, dict_type, dict_code, dict_name, dict_Sort, status, remark, + hospital_id, create_by, create_time )values( - #{dictId}, #{dictType}, #{dictCode}, #{dictName}, #{dictSort}, #{status}, #{remark}, + #{hospital_id}, #{createBy}, getdate() ) diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml index bfbf7d4..382cfcb 100644 --- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml @@ -4,10 +4,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">