最新版本541200007

jiangping

2024-12-11 3bf55d9e2a39b66a39e1a51d8b706e1419a1e5b7

最新版本541200007

 server/system_gateway/src/main/resources/application.yml

@@ -71,7 +71,7 @@
  jwt:
    enabled: true   #是否开启JWT登录认证功能
    secret: fjkfaf;afa  # JWT私钥，用于校验JWT令牌的合法性
    expiration: 36000000 #JWT令牌的有效期，用于校验JWT令牌的合法性
    expiration: 300000 #JWT令牌的有效期，用于校验JWT令牌的合法性
    header: JWTHeaderName #HTTP请求的Header名称，该Header作为参数传递JWT令牌
    userParamName: username  #用户登录认证用户名参数名称
    pwdParamName: password  #用户登录认证密码参数名称

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: system_gateway
  # 安全配置

 server/visits/dmvisit_admin/src/main/resources/application.yml

@@ -78,7 +78,7 @@
  jwt:
    enabled: true   #是否开启JWT登录认证功能
    secret: fjkfaf;afa  # JWT私钥，用于校验JWT令牌的合法性
    expiration: 36000000 #JWT令牌的有效期，用于校验JWT令牌的合法性
    expiration: 300000 #JWT令牌的有效期，用于校验JWT令牌的合法性
    header: JWTHeaderName #HTTP请求的Header名称，该Header作为参数传递JWT令牌
    userParamName: username  #用户登录认证用户名参数名称
    pwdParamName: password  #用户登录认证密码参数名称

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -1327,7 +1327,7 @@
        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                .eq(Visits::getIsdeleted,Constants.ZERO)
                .in(Visits::getStatus,Constants.VisitStatus.signout )));//已签离
        PageWrap<Visits> pageWrap = new PageWrap<>();
        /*PageWrap<Visits> pageWrap = new PageWrap<>();
        pageWrap.setCapacity(10);
        pageWrap.setPage(1);
        pageWrap.setModel(new Visits());
@@ -1344,14 +1344,38 @@
                list.add(data);
            }
            result.setRetentionNum(visitsPageData.getTotal());
        }*/

        String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Visits.class);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");
        queryWrapper.eq(Visits::getStatus,Constants.VisitStatus.signin);
        queryWrapper.apply(" TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+"  ");
        queryWrapper.ne("m.type ",Constants.TWO);
        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByDesc(Visits::getEditDate);
        List<Visits> vr = visitsJoinMapper.selectList(queryWrapper);
        result.setVisitRetentionDataList(new ArrayList<>());//访客滞留数据集合
        if(vr!=null&&vr!=null){
            vr.stream().forEach(s ->{
                VisitRetentionDataVO t = new VisitRetentionDataVO();
                t.setName(s.getName());
                t.setCompanyName(s.getCompanyName());
                t.setTimeOutMinute(s.getTimeOut());
                result.getVisitRetentionDataList().add(t);
            });
        }
        result.setVisitRetentionDataList(list);//访客滞留数据集合
        return result;

    }
    @Override
    public  SecurityBoardVO centerSecurityData(){


        SecurityBoardVO data = new SecurityBoardVO();
        getParkingCarsNum(data);//获取车位数据
@@ -1367,9 +1391,13 @@
                (int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
        );
        //在园长期相关方人数
        data.setInternalTotal(
        data.setRelatedTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
        );
        //在园内部员工人数
        data.setInternalTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count()
        );
        //在园访客数量
        data.setVisitTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()