diff --git a/lis-common/src/main/java/com/czlis/common/config/RuoYiConfig.java b/lis-common/src/main/java/com/czlis/common/config/RuoYiConfig.java index ddb7ec7..d90b86e 100644 --- a/lis-common/src/main/java/com/czlis/common/config/RuoYiConfig.java +++ b/lis-common/src/main/java/com/czlis/common/config/RuoYiConfig.java @@ -11,6 +11,19 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "czlis") public class RuoYiConfig { + /** + * 公司联系方式 + */ + private String phone; + + /** + * 公司邮箱 + */ + private String email; + /** + * 公司名称 + */ + private String compay; /** * 项目名称 */ @@ -56,8 +69,29 @@ public class RuoYiConfig { */ private static String mzPrintName; + public String getCompay() { + return compay; + } + public void setCompay(String compay) { + this.compay = compay; + } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } public static String getInterfaceUrl() { @@ -81,6 +115,7 @@ public class RuoYiConfig { } public void setName(String name) { + this.name = name; } 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 index d01f277..5ba27e7 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -460,7 +460,9 @@ public class CommonUtil { public String getYqdl(String yq) { return labInstrMapper.getYqdl(yq); } - + public String getLisgroup(String yq) { + return labInstrMapper.getLisgroup(yq); + } public LabInstr getLabInstr(String yq) { return labInstrMapper.getLabInstr(yq); } diff --git a/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java b/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java index 14bf8cb..05a7818 100644 --- a/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java +++ b/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java @@ -1,6 +1,7 @@ package com.czlis.system.web.service; import com.alibaba.fastjson2.JSON; +import com.czlis.common.config.RuoYiConfig; import com.czlis.common.constant.CacheConstants; import com.czlis.common.constant.Constants; import com.czlis.common.constant.UserConstants; @@ -44,6 +45,8 @@ import java.util.*; @Component @Slf4j public class SysLoginService { + @Resource + private RuoYiConfig ruoyiConfig; @Autowired private TokenService tokenService; @@ -68,16 +71,24 @@ public class SysLoginService { Map map = new HashMap<>(); if(configvalue!=null) { map = JSON.parseObject(configvalue, Map.class); + if(map!=null) { + String yq=map.get("defaultinstr").toString(); + if(yq!=null) { + String lisgroupid = commonUtil.getLisgroup(yq); + map.put("lisgroupid", lisgroupid); + } + } } return map; } public Map getOEM(){ Map oem=new HashMap<>(); - oem.put("compay","武汉创智天地信息技术有限公司"); - oem.put("version","区域版LIMS V8.001"); - oem.put("phone","027-67849602"); - oem.put("Email","czlis@163.com"); - oem.put("appname","实验室信息管理系统"); + oem.put("compay",ruoyiConfig.getCompay()); + oem.put("version",ruoyiConfig.getVersion()); + oem.put("phone",ruoyiConfig.getPhone()); + oem.put("Email",ruoyiConfig.getEmail()); + oem.put("appname",ruoyiConfig.getName()); + oem.put("copyrightyear",ruoyiConfig.getCopyrightYear()); return oem; } public Object gethospList(){ diff --git a/lis-system/src/main/resources/application.yml b/lis-system/src/main/resources/application.yml index db097b2..38e82c5 100644 --- a/lis-system/src/main/resources/application.yml +++ b/lis-system/src/main/resources/application.yml @@ -1,11 +1,17 @@ # 项目相关配置 czlis: - # 名称 - name: lis8.0 + #公司 + compay: 武汉创智天地信息技术有限公司 + # 产品名称 + name: 实验室信息管理系统LIMS8.0(Bate版) # 版本 - version: 8.0.0 + version: 8.0.1 # 版权年份 - copyrightYear: 2025 + copyrightYear: 2022-2026 + #联系方式 + phone: 027-67849602 + #电子邮箱 + email: czlis@163.com # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) profile: D:/czlis mzPrintName: pdfFactory Pro