Browse Source

新增水环境监测服务相关常量类及其他接口改动

tags/v2.5.0
xiaoying 1 year ago
parent
commit
817d8cfecc
8 changed files with 66 additions and 0 deletions
  1. +38
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/constant/WeptspConstant.java
  2. +21
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java
  3. +7
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/third/service/impl/ThirdServiceImpl.java
  4. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/constant/AirportConstant.class
  5. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/service/impl/TenantServiceImpl.class
  6. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl$2.class
  7. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl$3.class
  8. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl.class

+ 38
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/constant/WeptspConstant.java View File

@@ -0,0 +1,38 @@
package com.tuoheng.constant;

/**
* @Author xiaoying
* @Date 2023/5/15 16:08
*/
public class WeptspConstant {
public static final String WEPTSP_CLIENT="tuoheng-weptsp";
/**
* 河湖长-pc端
*/
public static final String WEPTSP_CLIENT_ADMIN = "tuoheng-weptsp-admin";

public static final String WEPTSP_CLIENT_MP = "tuoheng-weptsp-mp";



public static final String WEPTSP_NAME="水环境监测业务平台";

/**
* 创建租户
*/
public static final String CREATE_TENANT = "/oidcTenant/add";
/**
* 编辑租户
*/
public static final String UPDATE_TENANT = "/oidcTenant/edit";

public static final String DELETE_TENANT = "/oidcTenant/delete";
/**
* 查询可用角色
*/
public static final String FIND_ROLE = "/oidcTenant/getRoleList";
/**
* 查询可用角色
*/
public static final String FIND_MENU = "/oidcTenant/getMenuList/{roleId}";
}

+ 21
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java View File

@@ -235,6 +235,11 @@ public class TenantServiceImpl implements TenantService {
addClientRoleDtoList(WaterWayConstant.WATERWAY_CLIENT_ADMIN, dto, list);
addClientRoleDtoList(WaterWayConstant.WATERWAY_CLIENT_MP, dto, list);
break;
//水环境
case WeptspConstant.WEPTSP_CLIENT:
addClientRoleDtoList(WeptspConstant.WEPTSP_CLIENT_ADMIN, dto, list);
//addClientRoleDtoList(WeptspConstant.WATERWAY_CLIENT_MP, dto, list);
break;
default:
break;
}
@@ -284,6 +289,8 @@ public class TenantServiceImpl implements TenantService {
x.setPlatformName(PilotConstant.PILOT_NAME);
} else if (platformCode.contains(AirportConstant.AIRPORT_CLIENT)) {
x.setPlatformName(AirportConstant.AIRPORT_NAME);
} else if (platformCode.contains(WeptspConstant.WEPTSP_CLIENT)) {
x.setPlatformName(WeptspConstant.WEPTSP_NAME);
}
return x;
});
@@ -387,6 +394,8 @@ public class TenantServiceImpl implements TenantService {
businessSystemVoList.add(getbusinessSystemVo(FreeWayConstant.FREEWAY_CLIENT, FreeWayConstant.FREEWAY_NAME));
} else if (authoritiesPo.getAuthority().contains(PilotConstant.PILOT_CLIENT)) {
businessSystemVoList.add(getbusinessSystemVo(PilotConstant.PILOT_CLIENT, PilotConstant.PILOT_NAME));
} else if (authoritiesPo.getAuthority().contains(WeptspConstant.WEPTSP_CLIENT)) {
businessSystemVoList.add(getbusinessSystemVo(WeptspConstant.WEPTSP_CLIENT, WeptspConstant.WEPTSP_NAME));
}
}
businessSystemVoList = businessSystemVoList.stream().distinct().collect(Collectors.toList());
@@ -778,6 +787,10 @@ public class TenantServiceImpl implements TenantService {
case PilotConstant.PILOT_CLIENT:
url = url + PilotConstant.CREATE_TENANT;
break;
//水环境
case WeptspConstant.WEPTSP_CLIENT:
url = url + WeptspConstant.CREATE_TENANT;
break;
default:
break;
}
@@ -841,6 +854,10 @@ public class TenantServiceImpl implements TenantService {
case PilotConstant.PILOT_CLIENT:
url = url + PilotConstant.DELETE_TENANT;
break;
//水环境
case WeptspConstant.WEPTSP_CLIENT:
url = url + WeptspConstant.DELETE_TENANT;
break;
default:
break;
}
@@ -904,6 +921,10 @@ public class TenantServiceImpl implements TenantService {
case PilotConstant.PILOT_CLIENT:
url = url + PilotConstant.UPDATE_TENANT;
break;
//水环境
case WeptspConstant.WEPTSP_CLIENT:
url = url + WeptspConstant.UPDATE_TENANT;
break;
default:
break;
}

+ 7
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/third/service/impl/ThirdServiceImpl.java View File

@@ -163,6 +163,9 @@ public class ThirdServiceImpl implements ThirdService {
//飞手
case PilotConstant.PILOT_CLIENT:
url = String.format(Locale.ENGLISH, "%s%s", platform.getPlatformUrl(), PilotConstant.FIND_MENU);
//水环境
case WeptspConstant.WEPTSP_CLIENT:
url = String.format(Locale.ENGLISH, "%s%s", platform.getPlatformUrl(), WeptspConstant.FIND_MENU);
default:
break;
}
@@ -239,6 +242,10 @@ public class ThirdServiceImpl implements ThirdService {
case PilotConstant.PILOT_CLIENT:
url = url + PilotConstant.FIND_ROLE;
break;
//水环境
case WeptspConstant.WEPTSP_CLIENT:
url = url + WeptspConstant.FIND_ROLE;
break;
default:
break;
}

BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/constant/AirportConstant.class View File


BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/service/impl/TenantServiceImpl.class View File


BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl$2.class View File


BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl$3.class View File


BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/third/service/impl/ThirdServiceImpl.class View File


Loading…
Cancel
Save