代码提交

 Source/UBCS-WEB/src/views/wel/index.vue

@@ -7,7 +7,7 @@
    </el-row>
    <el-row>
      <el-col :span="24">
        <basic-container title="待办事项">
        <basic-container title="主数据统计">
          <Statistic></Statistic>
        </basic-container>
      </el-col>

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/MdmCount.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.vci.ubcs.code.entity;

import lombok.Data;

import java.io.Serializable;

/**
 * ä¸»æ•°æ®ç»Ÿè®¡å¯¹è±¡
 * @author ludc
 * @date 2023/10/16 16:04
 */
@Data
public class MdmCount implements Serializable {

    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = 5020487634341423512L;

    /**
     * ä¸»æ•°æ®åç§°
     */
    private String menuName;

    /**
     * ä¸»æ•°æ®æ€»æ•°
     */
    private String mdmCount;

    /**
     * èœå•è·¯ç”±
     */
    private String menuRoute;

    /**
     * èœå•å›¾æ ‡
     */
    private String inco;

    /**
     * æ˜¯å¦é»˜è®¤æ˜¾ç¤º
     */
    private Integer isDefault;

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IMdmCountService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.vci.ubcs.code.service;

import com.vci.ubcs.code.entity.MdmCount;

import java.util.List;

/**
 * ä¸»æ•°æ®æ€»æ•°ç»Ÿè®¡æœåŠ¡
 * @author ludc
 * @date 2023/10/16 15:48
 */
public interface IMdmCountService {

    /**
     * ç»Ÿè®¡ä¸»æ•°æ®æ€»æ•°
     * @return
     */
    List<MdmCount> getMdmCounts();


}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmCountServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.MdmCount;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.IMdmCountService;
import com.vci.ubcs.system.feign.ISysClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
 * ä¸»æ•°æ®ç»Ÿè®¡æœåŠ¡
 * @author ludc
 * @date 2023/10/16 15:47
 */
@Slf4j
@Service
public class MdmCountServiceImpl implements IMdmCountService {

    /**
     * ç³»ç»ŸæœåŠ¡
     */
    @Resource
    private ISysClient sysClient;

    @Resource
    private ICodeClassifyService codeClassifyService;

    @Override
    public List<MdmCount> getMdmCounts() {
        // 1、需要先查询出分类下顶级节点有哪些主数据,拿到业务类型名称
        LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query()
            .lambda()
            .isNull(CodeClassify::getParentCodeClassifyOid).select(CodeClassify::getBtmTypeId);
        Map<String, Object> map = codeClassifyService.getMap(wrapper);
        // 2、然后需要查询出菜单路由和图标

        // 3、然后设置进

        return null;
    }

}

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java

@@ -102,7 +102,7 @@
    public boolean submit(Strategy strategy) {
        //老的默认密码策略
        Long oldIsDefaultStrategy = null;
        //判断是否携带id
        //判断是否携带id，不携带id为新增操作
        if(Func.isEmpty(strategy.getId())){
            //执行新增
            Strategy dbstrategy = this.getOne(Wrappers.<Strategy>query().lambda()
@@ -132,13 +132,18 @@
            //检验密码策略是否符合要求
            checkPwdStrategy(strategy);
            //如果当前修改设置为默认密码策略，需要将已存在默认密码策略修改为非默认
            if(strategy.getIsDefault().equals("1") || strategy.getIsDefault() == 1){
            if((strategy.getIsDefault().toString()).equals("1")){
                //查询老的默认密码策略，便于下面修改
                oldIsDefaultStrategy = this.queryByIsDefault().getId();
                this.update(Wrappers.<Strategy>update().lambda()
                    .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
                    .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
                Strategy strategyDefault = this.queryByIsDefault();
                // åœ¨æ•°æ®ä¸å‡ºçŽ°é—®é¢˜çš„情况下不会出现strategyDefault为空的情况
                if(Func.isNotEmpty(strategyDefault)){
                    oldIsDefaultStrategy = strategyDefault.getId();
                    this.update(Wrappers.<Strategy>update().lambda()
                        .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
                        .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
                }
            }else {
                // é¿å…ç”¨æˆ·å°†å”¯ä¸€çš„默认密码策略改为非默认
                if(Func.isEmpty(queryByIsDefault())){
                    throw new ServiceException("默认密码策略必须有且仅有一条!");
                }

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java

@@ -526,6 +526,9 @@
            pwdupdateday = dateToDay(pwdUpdateTime);
        }
        Strategy strategy = sysClient.getByUserId(userId).getData();
        if(Func.isNotEmpty(strategy)){
            throw new ServiceException("密码策略查询为空，请检查当前租户下是否存在默认密码策略！");
        }
        //是否提醒通过最后一次修改密码的时间加上过期时间减去当前时间，如果小于过期提醒时间就进行提醒，如果<=0就提醒必须修改密码
        long reminder = pwdupdateday+strategy.getExpirationTime()-dateToDay(new Date());
        //提醒用户必须修改密码