From 06e87e87fdab51a4c46ceeb5dcf4421c02d9dfce Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 3 Jun 2026 17:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=9E=B6=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 1 + .idea/encodings.xml | 6 ++ .idea/vcs.xml | 4 +- .../java/com/czblood/bus/cache/DmzdCache.java | 62 ++++++++++++++ .../bus/mapper/XkOperatorInfoMapper.java | 9 ++ .../java/com/czblood/bus/pojo/XkDmzd.java | 25 ++++++ .../com/czblood/bus/pojo/XkOperatorInfo.java | 23 ++++++ .../bus/system/BloodExtInterfaceService.java | 82 +++++++++++++++++++ .../czblood/bus/system/BloodLoginService.java | 36 -------- .../com/czblood/bus/utils/BloodBankUtil.java | 9 ++ .../resources/mapper/XkOperatorInfoMapper.xml | 11 +++ blood_bus_bloodbank/pom.xml | 27 ++++++ blood_bus_doctor/pom.xml | 1 + blood_bus_nurse/pom.xml | 27 ++++++ blood_bus_report/pom.xml | 27 ++++++ .../common/constant/CacheConstants.java | 2 +- blood_start/pom.xml | 18 ++++ .../src/main/resources/application.yml | 2 +- .../czblood/system/mapper/CommonMapper.java | 7 ++ .../system/service/ExtSystemInterface.java | 31 +++++++ .../service/impl/SysUserServiceImpl.java | 5 ++ .../com/czblood/system/util/CommonUtil.java | 14 ++++ .../system/web/service/SysLoginService.java | 7 +- .../resources/mapper/system/CommonMapper.xml | 8 ++ .../resources/mapper/system/SysUserMapper.xml | 2 +- pom.xml | 37 +-------- sql/updatedb_blood.sql | 7 ++ 27 files changed, 416 insertions(+), 74 deletions(-) create mode 100644 blood_bus/src/main/java/com/czblood/bus/mapper/XkOperatorInfoMapper.java create mode 100644 blood_bus/src/main/java/com/czblood/bus/pojo/XkDmzd.java create mode 100644 blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java create mode 100644 blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java delete mode 100644 blood_bus/src/main/java/com/czblood/bus/system/BloodLoginService.java create mode 100644 blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java create mode 100644 blood_bus/src/main/resources/mapper/XkOperatorInfoMapper.xml create mode 100644 blood_bus_bloodbank/pom.xml create mode 100644 blood_bus_nurse/pom.xml create mode 100644 blood_bus_report/pom.xml create mode 100644 blood_system/src/main/java/com/czblood/system/mapper/CommonMapper.java create mode 100644 blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java create mode 100644 blood_system/src/main/resources/mapper/system/CommonMapper.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 881cd4d..35f355b 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -11,6 +11,7 @@ + "-Djdk.tls.disabledAlgorithms=SSLv3, TLSv1.1, DTLSv1.0, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, ECDH" diff --git a/.idea/encodings.xml b/.idea/encodings.xml index d0bd22f..7540f20 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,8 +3,14 @@ + + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d843f34..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/blood_bus/src/main/java/com/czblood/bus/cache/DmzdCache.java b/blood_bus/src/main/java/com/czblood/bus/cache/DmzdCache.java index 293552d..d8d5351 100644 --- a/blood_bus/src/main/java/com/czblood/bus/cache/DmzdCache.java +++ b/blood_bus/src/main/java/com/czblood/bus/cache/DmzdCache.java @@ -1,7 +1,69 @@ package com.czblood.bus.cache; +import com.alibaba.fastjson2.JSONArray; +import com.czblood.bus.pojo.XkDmzd; +import com.czblood.common.constant.CacheConstants; +import com.czblood.common.core.redis.RedisCache; +import com.czblood.common.utils.StringUtils; +import com.czblood.common.utils.spring.SpringUtils; + +import java.util.Collection; +import java.util.List; + /** * 字典缓存 */ public class DmzdCache { + + /** + * 设置字典缓存 + * + * @param key 参数键 + * @param dictDatas 字典数据列表 + */ + public static void setDictCache(String key, List dictDatas) { + SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); + } + + /** + * 获取字典缓存 + * + * @param key 参数键 + * @return dictDatas 字典数据列表 + */ + public static List getDictCache(String key) { + JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); + if (StringUtils.isNotNull(arrayCache)) { + return arrayCache.toList(XkDmzd.class); + } + return null; + } + + /** + * 删除指定字典缓存 + * + * @param key 字典键 + */ + public static void removeDictCache(String key) { + SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key)); + } + + /** + * 清空字典缓存 + */ + public static void clearDictCache() { + Collection keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.XK_DMZD_KEY + "*"); + SpringUtils.getBean(RedisCache.class).deleteObject(keys); + } + + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + public static String getCacheKey(String configKey) { + return CacheConstants.XK_DMZD_KEY + configKey; + } } diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkOperatorInfoMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkOperatorInfoMapper.java new file mode 100644 index 0000000..ff6dc08 --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkOperatorInfoMapper.java @@ -0,0 +1,9 @@ +package com.czblood.bus.mapper; + +import com.czblood.bus.pojo.XkOperatorInfo; + +import java.util.List; + +public interface XkOperatorInfoMapper { + List queryList(XkOperatorInfo xkOperatorInfo); +} diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/XkDmzd.java b/blood_bus/src/main/java/com/czblood/bus/pojo/XkDmzd.java new file mode 100644 index 0000000..384e6b6 --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/XkDmzd.java @@ -0,0 +1,25 @@ +package com.czblood.bus.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XkDmzd { + private String wordbook_sign; + private String wordbook_code; + private Integer sid; + private String wordbook_name; + private String remark; + private String exp1; + private String exp2; + private String exp3; + private String exp4; + private String use_sign; + private Date last_modified; + private String exp5; +} diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java b/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java new file mode 100644 index 0000000..af7d612 --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java @@ -0,0 +1,23 @@ +package com.czblood.bus.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XkOperatorInfo { + private String operator_id; + private String operator_name; + private String pwd; + private String work_group; + private String dept; + private String operator_type; + private String py; + private String is_bank_director; + private String is_medical_director; + private String postname; + private String sign_pic; + private String vshiscode; +} diff --git a/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java b/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java new file mode 100644 index 0000000..56506cb --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java @@ -0,0 +1,82 @@ +package com.czblood.bus.system; + +import com.czblood.bus.mapper.XKHosInfoMapper; +import com.czblood.bus.mapper.XkOperatorInfoMapper; +import com.czblood.bus.pojo.XkHosInfo; +import com.czblood.bus.pojo.XkOperatorInfo; +import com.czblood.common.core.domain.Result; +import com.czblood.common.core.domain.entity.SysLoginParam; +import com.czblood.common.core.domain.entity.SysUser; +import com.czblood.common.core.domain.model.LoginParam; +import com.czblood.common.core.domain.model.LoginUser; +import com.czblood.common.utils.SecurityUtils; +import com.czblood.common.utils.StringUtils; +import com.czblood.system.mapper.SysUserMapper; +import com.czblood.system.service.ExtSystemInterface; +import com.czblood.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 登录接口 + */ +@Component +public class BloodExtInterfaceService implements ExtSystemInterface { + + @Resource + XKHosInfoMapper xkHosInfoMapper; + @Resource + XkOperatorInfoMapper xkOperatorInfoMapper; + @Autowired + private SysUserMapper userMapper; + @Autowired + private ISysConfigService configService; + + + @Override + public Result syncUser() { + XkOperatorInfo xkOperatorInfo = new XkOperatorInfo(); + List xkOperatorInfoList = xkOperatorInfoMapper.queryList(xkOperatorInfo); + int j = 0; + for (XkOperatorInfo operatorInfo : xkOperatorInfoList) { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(operatorInfo.getOperator_id()); + if(!StringUtils.isNull(u)) continue; + SysUser sysUser = new SysUser(); + sysUser.setDeptId(101L); + sysUser.setUserName(operatorInfo.getOperator_id()); + sysUser.setNickName(operatorInfo.getOperator_name()); + sysUser.setUserType("00"); + sysUser.setSex("1"); + String password = configService.selectConfigByKey("sys.user.initPassword"); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + sysUser.setStatus("0"); + sysUser.setCreateBy("admin"); + sysUser.setVshisuser(operatorInfo.getVshiscode()); + sysUser.setYljg("602"); //以前老的输血系统没有医疗机构的概念，所以这里先给个之前的默认值 + sysUser.setDelFlag("0"); + userMapper.insertUser(sysUser); + j++; + } + return new Result("0","导入成功，共有："+j+"条数据导入！"); + + } + + @Override + public void setLoginParam(LoginParam loginParam, LoginUser loginUser) { + SysLoginParam sysLoginParam = new SysLoginParam(); + sysLoginParam.setLoginYLJG(loginParam.getLoginYLJG()); + sysLoginParam.setLocalid(loginParam.getLocalid()); + sysLoginParam.setLoginYLJGName(loginParam.getLoginYLJGName()); + loginUser.setSysLoginParam(sysLoginParam); + } + + @Override + public Object gethospList() { + XkHosInfo xkHosInfo = new XkHosInfo(); + return xkHosInfoMapper.query(xkHosInfo); + } +} diff --git a/blood_bus/src/main/java/com/czblood/bus/system/BloodLoginService.java b/blood_bus/src/main/java/com/czblood/bus/system/BloodLoginService.java deleted file mode 100644 index 9fc28b5..0000000 --- a/blood_bus/src/main/java/com/czblood/bus/system/BloodLoginService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.czblood.bus.system; - -import com.czblood.bus.mapper.XKHosInfoMapper; -import com.czblood.bus.pojo.XkHosInfo; -import com.czblood.common.core.domain.entity.SysLoginParam; -import com.czblood.common.core.domain.model.LoginParam; -import com.czblood.common.core.domain.model.LoginUser; -import com.czblood.system.web.service.SysLoginService; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -@Primary -public class BloodLoginService extends SysLoginService { - - @Resource - XKHosInfoMapper xkHosInfoMapper; - - @Override - public void setLoginParam(LoginParam loginParam, LoginUser loginUser) { - SysLoginParam sysLoginParam = new SysLoginParam(); - sysLoginParam.setLoginYLJG(loginParam.getLoginYLJG()); - sysLoginParam.setLocalid(loginParam.getLocalid()); - sysLoginParam.setLoginYLJGName(loginParam.getLoginYLJGName()); - loginUser.setSysLoginParam(sysLoginParam); - } - - @Override - public Object gethospList() { - XkHosInfo xkHosInfo = new XkHosInfo(); - return xkHosInfoMapper.query(xkHosInfo); - } -} diff --git a/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java new file mode 100644 index 0000000..c05f6b9 --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java @@ -0,0 +1,9 @@ +package com.czblood.bus.utils; + +import org.springframework.stereotype.Component; + +@Component +public class BloodBankUtil { + + +} diff --git a/blood_bus/src/main/resources/mapper/XkOperatorInfoMapper.xml b/blood_bus/src/main/resources/mapper/XkOperatorInfoMapper.xml new file mode 100644 index 0000000..b6f0f28 --- /dev/null +++ b/blood_bus/src/main/resources/mapper/XkOperatorInfoMapper.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/blood_bus_bloodbank/pom.xml b/blood_bus_bloodbank/pom.xml new file mode 100644 index 0000000..ceb94ce --- /dev/null +++ b/blood_bus_bloodbank/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.czblood + blood + 1.0 + + + blood_bus_bloodbank + jar + 输血科业务 + + blood_bus_bloodbank + + + UTF-8 + + + + + com.czblood + blood_bus + 1.0 + + + diff --git a/blood_bus_doctor/pom.xml b/blood_bus_doctor/pom.xml index e6900e8..1bf53fc 100644 --- a/blood_bus_doctor/pom.xml +++ b/blood_bus_doctor/pom.xml @@ -11,6 +11,7 @@ jar blood_bus_doctor + 医生业务模块 UTF-8 diff --git a/blood_bus_nurse/pom.xml b/blood_bus_nurse/pom.xml new file mode 100644 index 0000000..e3efd63 --- /dev/null +++ b/blood_bus_nurse/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.czblood + blood + 1.0 + + + blood_bus_nurse + jar + + blood_bus_nurse + 护士业务模块 + + + UTF-8 + + + + + com.czblood + blood_bus + 1.0 + + + diff --git a/blood_bus_report/pom.xml b/blood_bus_report/pom.xml new file mode 100644 index 0000000..2c10d38 --- /dev/null +++ b/blood_bus_report/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.czblood + blood + 1.0 + + + blood_bus_report + jar + + blood_bus_report + 报表模块 + + + UTF-8 + + + + + com.czblood + blood_bus + 1.0 + + + diff --git a/blood_common/src/main/java/com/czblood/common/constant/CacheConstants.java b/blood_common/src/main/java/com/czblood/common/constant/CacheConstants.java index 93b564e..83adeb5 100644 --- a/blood_common/src/main/java/com/czblood/common/constant/CacheConstants.java +++ b/blood_common/src/main/java/com/czblood/common/constant/CacheConstants.java @@ -49,6 +49,6 @@ public class CacheConstants /** * 参数 */ - public static final String COM_OPT_KEY = "com_opt:"; + //public static final String COM_OPT_KEY = "com_opt:"; } diff --git a/blood_start/pom.xml b/blood_start/pom.xml index 7790536..38806cc 100644 --- a/blood_start/pom.xml +++ b/blood_start/pom.xml @@ -27,6 +27,21 @@ blood_bus_doctor 1.0 + + com.czblood + blood_bus_bloodbank + 1.0 + + + com.czblood + blood_bus_nurse + 1.0 + + + com.czblood + blood_bus_report + 1.0 + org.springframework.boot spring-boot-starter-test @@ -81,6 +96,9 @@ blood_system-1.0.jar blood_bus-1.0.jar blood_bus_doctor-1.0.jar + blood_bus_bloodbank-1.0.jar + blood_bus_nurse-1.0.jar + blood_bus_report-1.0.jar diff --git a/blood_start/src/main/resources/application.yml b/blood_start/src/main/resources/application.yml index 87116c9..5d077cb 100644 --- a/blood_start/src/main/resources/application.yml +++ b/blood_start/src/main/resources/application.yml @@ -23,7 +23,7 @@ czblood: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 9803 + port: 8907 servlet: # 应用的访问路径 context-path: / diff --git a/blood_system/src/main/java/com/czblood/system/mapper/CommonMapper.java b/blood_system/src/main/java/com/czblood/system/mapper/CommonMapper.java new file mode 100644 index 0000000..aeab626 --- /dev/null +++ b/blood_system/src/main/java/com/czblood/system/mapper/CommonMapper.java @@ -0,0 +1,7 @@ +package com.czblood.system.mapper; + +import java.util.Date; + +public interface CommonMapper { + Date getCurrentTime(); +} diff --git a/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java b/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java new file mode 100644 index 0000000..c70a575 --- /dev/null +++ b/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java @@ -0,0 +1,31 @@ +package com.czblood.system.service; + +import com.czblood.common.core.domain.Result; +import com.czblood.common.core.domain.model.LoginParam; +import com.czblood.common.core.domain.model.LoginUser; + +/** + * 外部接口扩展 + */ +public interface ExtSystemInterface { + + /** + * 同步用户 + * @return + */ + public Result syncUser() ; + + + /** + * 设置登录参数 + * @param loginParam + * @param loginUser + */ + public void setLoginParam(LoginParam loginParam, LoginUser loginUser) ; + + /** + * 获取医疗机构列表 + * @return + */ + public Object gethospList() ; +} diff --git a/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java b/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java index 48084d9..de4a5f3 100644 --- a/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java +++ b/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.czblood.common.core.domain.Result; +import com.czblood.system.service.ExtSystemInterface; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,6 +66,9 @@ public class SysUserServiceImpl implements ISysUserService { @Autowired protected Validator validator; + @Autowired(required = false) + private ExtSystemInterface extSystemInterface; + /** * 根据条件分页查询用户列表 * @@ -502,6 +506,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public Result syncUser() { + extSystemInterface.syncUser(); // List comUsrList = comUsrMapper.getComUsrList(""); // int j = 0; // for (ComUsr comUsr : comUsrList) { diff --git a/blood_system/src/main/java/com/czblood/system/util/CommonUtil.java b/blood_system/src/main/java/com/czblood/system/util/CommonUtil.java index d5f4e3e..1d5d9f2 100644 --- a/blood_system/src/main/java/com/czblood/system/util/CommonUtil.java +++ b/blood_system/src/main/java/com/czblood/system/util/CommonUtil.java @@ -1,14 +1,20 @@ package com.czblood.system.util; +import cn.hutool.core.date.DateUtil; +import com.czblood.system.mapper.CommonMapper; import com.czblood.system.mapper.RegLocalconfigMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Date; + @Component public class CommonUtil { @Autowired RegLocalconfigMapper regLocalconfigMapper; + @Autowired + CommonMapper commonMapper; public String getLocalconfig(String smac) { return regLocalconfigMapper.getLocalconfig(smac); @@ -17,4 +23,12 @@ public class CommonUtil { public String getLocalconfigByIP(String ip) { return regLocalconfigMapper.getLocalconfigByIP(ip); } + + public String getCurrentTime() { + return DateUtil.format(commonMapper.getCurrentTime(),"yyyy-MM-dd HH:mm:ss"); + } + + public Date getCurrentTimeDate() { + return commonMapper.getCurrentTime(); + } } diff --git a/blood_system/src/main/java/com/czblood/system/web/service/SysLoginService.java b/blood_system/src/main/java/com/czblood/system/web/service/SysLoginService.java index caa07e9..e63ba65 100644 --- a/blood_system/src/main/java/com/czblood/system/web/service/SysLoginService.java +++ b/blood_system/src/main/java/com/czblood/system/web/service/SysLoginService.java @@ -23,6 +23,7 @@ import com.czblood.common.utils.ip.IpUtils; import com.czblood.system.factory.AsyncFactory; import com.czblood.system.mapper.SysUserMapper; import com.czblood.system.security.context.AuthenticationContextHolder; +import com.czblood.system.service.ExtSystemInterface; import com.czblood.system.service.ISysConfigService; import com.czblood.system.service.ISysUserService; import com.czblood.system.service.TokenService; @@ -67,6 +68,9 @@ public class SysLoginService { @Autowired CommonUtil commonUtil; + @Autowired(required = false) + private ExtSystemInterface extSystemInterface; + /** * 获取本地配置信息 * @param smac @@ -97,6 +101,7 @@ public class SysLoginService { } public Object gethospList() { + return extSystemInterface.gethospList(); // List regHospitalList = regHospitalMapper.selectHospitalAll(); // List> comDictlist0 = new ArrayList<>(); // for (RegHospital regHospital : regHospitalList) { @@ -106,7 +111,6 @@ public class SysLoginService { // comDictlist0.add(map); // } // return comDictlist0; - return null; } /** @@ -302,5 +306,6 @@ public class SysLoginService { // sysLoginParam.setLocalid(loginParam.getLocalid()); // sysLoginParam.setLoginYLJGName(loginParam.getLoginYLJGName()); // loginUser.setSysLoginParam(sysLoginParam); + extSystemInterface.setLoginParam(loginParam,loginUser); } } diff --git a/blood_system/src/main/resources/mapper/system/CommonMapper.xml b/blood_system/src/main/resources/mapper/system/CommonMapper.xml new file mode 100644 index 0000000..d1a1460 --- /dev/null +++ b/blood_system/src/main/resources/mapper/system/CommonMapper.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/blood_system/src/main/resources/mapper/system/SysUserMapper.xml b/blood_system/src/main/resources/mapper/system/SysUserMapper.xml index 73f149e..6b21855 100644 --- a/blood_system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/blood_system/src/main/resources/mapper/system/SysUserMapper.xml @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - u.vshisuser, u.vshisuser1, u.vshisuser2, u.yljg, u.sn, u.snid, u.signCert, + u.yljg, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u diff --git a/pom.xml b/pom.xml index 071d76a..25504fc 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,15 @@ blood_start blood_bus blood_bus_doctor + blood_bus_nurse + blood_bus_bloodbank + blood_bus_report UTF-8 UTF-8 - 1.0 + 1.0 1.8 3.1.1 2.5.15 @@ -220,38 +223,6 @@ - - - com.czblood - pf_system - ${pf.version} - - - - - com.czblood - pf_common - ${pf.version} - - - - com.czblood - pf_interfaceCommon - ${pf.version} - - - - com.czblood - pf_transitPF - ${pf.version} - - - - - - - - cn.hutool diff --git a/sql/updatedb_blood.sql b/sql/updatedb_blood.sql index 90f7ac5..27026e6 100644 --- a/sql/updatedb_blood.sql +++ b/sql/updatedb_blood.sql @@ -22,4 +22,11 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'xk_c begin alter table xk_check_bloodtype add hos_id varchar(30) end +go + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'yljg') + begin + alter table sys_user add yljg varchar(10); + update sys_user set yljg = '602' where user_name = 'admin' + end go \ No newline at end of file