Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-01-07 f9c24ba3d5eba45afef222dcd72b6383893efc76

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/meeting/meeting_admin/src/main/resources/application.yml

@@ -57,14 +57,6 @@
    doumeemes.dao: debug


swagger:
  host:
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  # 禁用swagger时的重定向地址
  redirect-uri: /

# WEB服务器配置
server:
  compression:

 server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml

@@ -25,7 +25,7 @@
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos
        password: nacos
      # 安全配置

 server/meeting/meeting_admin/src/main/resources/bootstrap.yml

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

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -403,19 +403,19 @@
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        //注册司机
        if((Constants.equalsInteger(user.getType(),Constants.ZERO)
        if(!((Constants.equalsInteger(user.getType(),Constants.ZERO)
                ||Constants.equalsInteger(user.getType(),Constants.TWO))
                && Objects.nonNull(user.getMemberId())){
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                if(Objects.isNull(user.getCompanyId())){
                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
                }
                Company company = companyMapper.selectById(user.getCompanyId());
                if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
                }
            }
        }else{
                && Objects.nonNull(user.getMemberId()))){
//            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
//                if(Objects.isNull(user.getCompanyId())){
//                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
//                }
//                Company company = companyMapper.selectById(user.getCompanyId());
//                if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
//                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
//                }
//            }
//        }else{
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }
        if(StringUtils.isNotBlank(password)){
@@ -473,7 +473,7 @@
        if (systemUser == null) {
            systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
        }else{
            if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
            if(!(Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)||Constants.equalsInteger(systemUser.getType(),Constants.memberType.internal))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，请使用正确的司机账号登陆！");
            }
        }

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

@@ -515,6 +515,12 @@
                String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
                String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
                for(RuleEventSearchDataResponse r :rlist){
                    try {
                        if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
                            continue;
                        }
                    }catch (Exception e){
                    }
                    WaningEventDataListVO data = new WaningEventDataListVO();
                    data.setAddr(r.getSrc_name());
                    data.setImg(r.getImage_url());