zjh 2023/12/12--1

zjh

2023-12-12 c9b1a88ad8f42454673c411cfac74284e68c1ac0

zjh 2023/12/12--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java

@@ -92,9 +92,9 @@
        // 生成令牌
        String token;
        if (loginBody.getMobile()) {
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(),loginBody.getCode(),loginBody.getUuid());
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
        } else {
            token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(),loginBody.getCode(),loginBody.getUuid());
            token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
        }
        if (null == token) {
            return success("该账号正在使用中");
@@ -113,31 +113,33 @@
        AjaxResult ajax = success();
        SysUser user = UserHoder.getLoginUser().getUser();
        if (null != user.getUserId()) {
            if (secretKeyLogin)
            {
                if(null !=user.getDeptId()){
                    if(!SecurityUtils.isAdmin(user.getUserId())){
                        SysDept sysDept = deptService.getById(user.getDeptId());
                        if (null != sysDept) {
                            DictHosp dictHosp = hospService.getById(sysDept.getHospId());
                            if(null !=dictHosp && dictHosp.getSecretKey() !=null && dictHosp.getExpirationTime() !=null){
                                if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
                                        dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
            if (secretKeyLogin) {
                if (null != user.getDeptId()) {
                    SysDept sysDept = deptService.getById(user.getDeptId());
                    if (null != sysDept) {
                        DictHosp dictHosp = hospService.getById(sysDept.getHospId());
                        if (null != dictHosp) {
                            user.setHospName(dictHosp.getHospAreaName());
                            user.setHospId(dictHosp.getHospAreaId());
                        }
                        if (!SecurityUtils.isAdmin(user.getUserId())) {
                            if (null != dictHosp && dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null) {
                                if (!SecurityUtils.matchesMallMerchantSecretKey(secret, dictHosp.getHospAreaId(), dictHosp.getHospAreaName(),
                                        dictHosp.getExpirationTime(), dictHosp.getSecretKey())) {

                                    String userIdKey = Constants.LOGIN_USERID_KEY + user.getUserId();
                                    String userKey = redisCache.getCacheObject(userIdKey);
                                    if (org.apache.commons.lang3.StringUtils.isNotEmpty(userKey))
                                    {
                                    if (org.apache.commons.lang3.StringUtils.isNotEmpty(userKey)) {
                                        redisCache.deleteObject(userIdKey);
                                        redisCache.deleteObject(userKey);
                                    }
                                    throw new SecretKeyException("商家已过期请续费使用");
                                }
                                long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
                                if(between<=30){
                                    UserHoder.getLoginUser().setMessage("还有 "+between+" 天到期 请注意续费! 以免影响正常使用!");
                                if (between <= 30) {
                                    UserHoder.getLoginUser().setMessage("还有 " + between + " 天到期 请注意续费! 以免影响正常使用!");
                                }
                            }else {
                            } else {
                                throw new SecretKeyException("请缴费使用");
                            }
                        }
@@ -150,8 +152,8 @@
            ajax.put("user", user);
            ajax.put("roles", roles);
            ajax.put("permissions", permissions);
            ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
            ajax.put("hospName",UserHoder.getLoginUser().getHospName());
            ajax.put("securitMessage", UserHoder.getLoginUser().getMessage());
            ajax.put("hospName", UserHoder.getLoginUser().getHospName());
        } else {
            Set<String> roles = new HashSet<>();
            LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -170,9 +172,9 @@
            ajax.put("user", user1);
            ajax.put("roles", roles);
            ajax.put("permissions", permissions);
            ajax.put("post",null);
            ajax.put("securitMessage",null);
            ajax.put("hospName",UserHoder.getLoginUser().getHospName());
            ajax.put("post", null);
            ajax.put("securitMessage", null);
            ajax.put("hospName", UserHoder.getLoginUser().getHospName());
        }
        return ajax;
    }

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java

@@ -98,6 +98,7 @@
                    DictHosp dictHosp = hospService.getById(sysDept.getHospId());
                    if (null != dictHosp) {
                        sysUser.setHospName(dictHosp.getHospAreaName());
                        sysUser.setHospId(dictHosp.getHospAreaId());
                    }
                }
                LambdaQueryWrapper<DictUserInfo> wq = new LambdaQueryWrapper<>();

 ltkj-admin/src/main/resources/application.yml

@@ -180,8 +180,8 @@
#  体检套餐和轮播图存储路径
photoPath: D:\AppPhoto\uploadPath\
# nginx图片服务器
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
#photoServer: http://192.168.0.5:5502/uploadPath/

# 微信小程序appid secret
xcx:
@@ -205,13 +205,13 @@
    #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12  #本地证书路径，在微信商户后台下载
    key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12  #服务器证书路径，在微信商户后台下载
#    pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify   #微信支付回调地址
#    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
#    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify   #微信支付回调地址

#积木报表访问地址
jimu:
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.5:5000/ltkj-admin
#  path: http://192.168.0.99:8081/ltkj-admin
#  path: http://192.168.0.101:5011

 ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysUser.java

@@ -163,6 +163,11 @@
    @ApiModelProperty(value = "所在机构")
    private String hospName;

    //所在机构ID
    @TableField(exist = false)
    @ApiModelProperty(value = "所在机构ID")
    private String hospId;

    //入职日期
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")