From 7f3690545448c0421abb6697f1fccf551ce51071 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Mon, 15 Jun 2026 16:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E7=94=B5=E7=9B=91=E6=8E=A7=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BsEnergyCoreUseWarningProcessor.java | 27 + .../energy/feign/IBsEnergyCoreUseClient.java | 5 + .../springblade/system/feign/ISysClient.java | 476 +++++++++--------- .../system/feign/ISysClientFallback.java | 5 + .../energy/feign/BsEnergyCoreUseClient.java | 5 + .../service/IBsEnergyCoreUseService.java | 5 +- .../impl/BsEnergyCoreUseServiceImpl.java | 89 +++- .../mapper/OemSettlementApprovalMapper.xml | 20 +- .../springblade/system/feign/SysClient.java | 7 + 9 files changed, 392 insertions(+), 247 deletions(-) create mode 100644 blade-ops/blade-job/src/main/java/org/springblade/job/processor/energy/BsEnergyCoreUseWarningProcessor.java diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/energy/BsEnergyCoreUseWarningProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/energy/BsEnergyCoreUseWarningProcessor.java new file mode 100644 index 000000000..70100ebd1 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/energy/BsEnergyCoreUseWarningProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.energy; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.energy.feign.IBsEnergyCoreUseClient; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +@Component +@Data +@Slf4j +public class BsEnergyCoreUseWarningProcessor implements BasicProcessor { + + @Resource + private IBsEnergyCoreUseClient client; + + @Override + public ProcessResult process(TaskContext context) throws Exception { + log.info("开始用电监控预警..."); + client.warning(); + log.info("结束用电监控预警..."); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/energy/feign/IBsEnergyCoreUseClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/energy/feign/IBsEnergyCoreUseClient.java index 17df2f2b8..5b9804dd8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/energy/feign/IBsEnergyCoreUseClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/energy/feign/IBsEnergyCoreUseClient.java @@ -13,10 +13,15 @@ public interface IBsEnergyCoreUseClient { String API_PREFIX = "/feign/client/bs-energy-core-use"; String UPDATE_USED = API_PREFIX + "/update-used"; String SAVE_HISTORY_REC = API_PREFIX + "/save-history-rec"; + String WARNING = API_PREFIX + "/warning"; @GetMapping(UPDATE_USED) void updateUsed(@RequestParam String type); @GetMapping(SAVE_HISTORY_REC) void saveHistoryRec(); + @GetMapping(WARNING) + void warning(); + + } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java index ecb0f0467..7eb0f83d2 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java @@ -40,266 +40,276 @@ import java.util.List; * @author Chill */ @FeignClient( - value = AppConstant.APPLICATION_SYSTEM_NAME, - fallback = ISysClientFallback.class + value = AppConstant.APPLICATION_SYSTEM_NAME, + fallback = ISysClientFallback.class ) public interface ISysClient { - String API_PREFIX = "/feign/client/system"; - String MENU = API_PREFIX + "/menu"; - String DEPT = API_PREFIX + "/dept"; - String DEPT_CODE = API_PREFIX + "/dept-code"; - String DEPT_IDS = API_PREFIX + "/dept-ids"; - String DEPT_IDS_FUZZY = API_PREFIX + "/dept-ids-fuzzy"; - String DEPT_NAME = API_PREFIX + "/dept-name"; - String DEPT_NAMES = API_PREFIX + "/dept-names"; - String DEPT_CHILD = API_PREFIX + "/dept-child"; - String POST = API_PREFIX + "/post"; - String POST_IDS = API_PREFIX + "/post-ids"; - String POST_IDS_FUZZY = API_PREFIX + "/post-ids-fuzzy"; - String POST_NAME = API_PREFIX + "/post-name"; - String POST_NAMES = API_PREFIX + "/post-names"; - String ROLE = API_PREFIX + "/role"; - String ROLE_IDS = API_PREFIX + "/role-ids"; - String ROLE_NAME = API_PREFIX + "/role-name"; - String ROLE_NAMES = API_PREFIX + "/role-names"; - String ROLE_ALIAS = API_PREFIX + "/role-alias"; - String ROLE_ALIASES = API_PREFIX + "/role-aliases"; - String TENANT = API_PREFIX + "/tenant"; - String TENANT_ID = API_PREFIX + "/tenant-id"; - String TENANT_PACKAGE = API_PREFIX + "/tenant-package"; - String PARAM = API_PREFIX + "/param"; - String PARAM_VALUE = API_PREFIX + "/param-value"; - String REGION = API_PREFIX + "/region"; + String API_PREFIX = "/feign/client/system"; + String MENU = API_PREFIX + "/menu"; + String DEPT = API_PREFIX + "/dept"; + String DEPT_CODE = API_PREFIX + "/dept-code"; + String DEPT_IDS = API_PREFIX + "/dept-ids"; + String DEPT_IDS_FUZZY = API_PREFIX + "/dept-ids-fuzzy"; + String DEPT_NAME = API_PREFIX + "/dept-name"; + String DEPT_NAMES = API_PREFIX + "/dept-names"; + String DEPT_CHILD = API_PREFIX + "/dept-child"; + String POST = API_PREFIX + "/post"; + String POST_IDS = API_PREFIX + "/post-ids"; + String POST_IDS_FUZZY = API_PREFIX + "/post-ids-fuzzy"; + String POST_NAME = API_PREFIX + "/post-name"; + String POST_NAMES = API_PREFIX + "/post-names"; + String ROLE = API_PREFIX + "/role"; + String ROLE_IDS = API_PREFIX + "/role-ids"; + String ROLE_NAME = API_PREFIX + "/role-name"; + String ROLE_NAMES = API_PREFIX + "/role-names"; + String ROLE_ALIAS = API_PREFIX + "/role-alias"; + String ROLE_ALIASES = API_PREFIX + "/role-aliases"; + String TENANT = API_PREFIX + "/tenant"; + String TENANT_ID = API_PREFIX + "/tenant-id"; + String TENANT_PACKAGE = API_PREFIX + "/tenant-package"; + String PARAM = API_PREFIX + "/param"; + String PARAM_VALUE = API_PREFIX + "/param-value"; + String REGION = API_PREFIX + "/region"; + String LIST_ALL_USER_BY_ROLE_ALIAS = API_PREFIX +"/list-all-user-by-role-alias"; - /** - * 获取菜单 - * - * @param id 主键 - * @return Menu - */ - @GetMapping(MENU) - R getMenu(@RequestParam("id") Long id); + /** + * 获取菜单 + * + * @param id 主键 + * @return Menu + */ + @GetMapping(MENU) + R getMenu(@RequestParam("id") Long id); - /** - * 获取部门 - * - * @param id 主键 - * @return Dept - */ - @GetMapping(DEPT) - R getDept(@RequestParam("id") Long id); + /** + * 获取部门 + * + * @param id 主键 + * @return Dept + */ + @GetMapping(DEPT) + R getDept(@RequestParam("id") Long id); - /** - * 获取部门 - * - * @param deptCode 主键 - * @return Dept - */ - @GetMapping(DEPT_CODE) - R getDeptByCode(@RequestParam("deptCode") String deptCode); + /** + * 获取部门 + * + * @param deptCode 主键 + * @return Dept + */ + @GetMapping(DEPT_CODE) + R getDeptByCode(@RequestParam("deptCode") String deptCode); - /** - * 获取部门id - * - * @param tenantId 租户id - * @param deptNames 部门名 - * @return 部门id - */ - @GetMapping(DEPT_IDS) - R getDeptIds(@RequestParam("tenantId") String tenantId, @RequestParam("deptNames") String deptNames); + /** + * 获取部门id + * + * @param tenantId 租户id + * @param deptNames 部门名 + * @return 部门id + */ + @GetMapping(DEPT_IDS) + R getDeptIds(@RequestParam("tenantId") String tenantId, @RequestParam("deptNames") String deptNames); - /** - * 获取部门id - * - * @param tenantId 租户id - * @param deptNames 部门名 - * @return 部门id - */ - @GetMapping(DEPT_IDS_FUZZY) - R getDeptIdsByFuzzy(@RequestParam("tenantId") String tenantId, @RequestParam("deptNames") String deptNames); + /** + * 获取部门id + * + * @param tenantId 租户id + * @param deptNames 部门名 + * @return 部门id + */ + @GetMapping(DEPT_IDS_FUZZY) + R getDeptIdsByFuzzy(@RequestParam("tenantId") String tenantId, @RequestParam("deptNames") String deptNames); - /** - * 获取部门名 - * - * @param id 主键 - * @return 部门名 - */ - @GetMapping(DEPT_NAME) - R getDeptName(@RequestParam("id") Long id); + /** + * 获取部门名 + * + * @param id 主键 + * @return 部门名 + */ + @GetMapping(DEPT_NAME) + R getDeptName(@RequestParam("id") Long id); - /** - * 获取部门名 - * - * @param deptIds 主键 - * @return - */ - @GetMapping(DEPT_NAMES) - R> getDeptNames(@RequestParam("deptIds") String deptIds); + /** + * 获取部门名 + * + * @param deptIds 主键 + * @return + */ + @GetMapping(DEPT_NAMES) + R> getDeptNames(@RequestParam("deptIds") String deptIds); - /** - * 获取子部门ID - * - * @param deptId - * @return - */ - @GetMapping(DEPT_CHILD) - R> getDeptChild(@RequestParam("deptId") Long deptId); + /** + * 获取子部门ID + * + * @param deptId + * @return + */ + @GetMapping(DEPT_CHILD) + R> getDeptChild(@RequestParam("deptId") Long deptId); - /** - * 获取岗位 - * - * @param id 主键 - * @return Post - */ - @GetMapping(POST) - R getPost(@RequestParam("id") Long id); + /** + * 获取岗位 + * + * @param id 主键 + * @return Post + */ + @GetMapping(POST) + R getPost(@RequestParam("id") Long id); - /** - * 获取岗位id - * - * @param tenantId 租户id - * @param postNames 岗位名 - * @return 岗位id - */ - @GetMapping(POST_IDS) - R getPostIds(@RequestParam("tenantId") String tenantId, @RequestParam("postNames") String postNames); + /** + * 获取岗位id + * + * @param tenantId 租户id + * @param postNames 岗位名 + * @return 岗位id + */ + @GetMapping(POST_IDS) + R getPostIds(@RequestParam("tenantId") String tenantId, @RequestParam("postNames") String postNames); - /** - * 获取岗位id - * - * @param tenantId 租户id - * @param postNames 岗位名 - * @return 岗位id - */ - @GetMapping(POST_IDS_FUZZY) - R getPostIdsByFuzzy(@RequestParam("tenantId") String tenantId, @RequestParam("postNames") String postNames); + /** + * 获取岗位id + * + * @param tenantId 租户id + * @param postNames 岗位名 + * @return 岗位id + */ + @GetMapping(POST_IDS_FUZZY) + R getPostIdsByFuzzy(@RequestParam("tenantId") String tenantId, @RequestParam("postNames") String postNames); - /** - * 获取岗位名 - * - * @param id 主键 - * @return 岗位名 - */ - @GetMapping(POST_NAME) - R getPostName(@RequestParam("id") Long id); + /** + * 获取岗位名 + * + * @param id 主键 + * @return 岗位名 + */ + @GetMapping(POST_NAME) + R getPostName(@RequestParam("id") Long id); - /** - * 获取岗位名 - * - * @param postIds 主键 - * @return - */ - @GetMapping(POST_NAMES) - R> getPostNames(@RequestParam("postIds") String postIds); + /** + * 获取岗位名 + * + * @param postIds 主键 + * @return + */ + @GetMapping(POST_NAMES) + R> getPostNames(@RequestParam("postIds") String postIds); - /** - * 获取角色 - * - * @param id 主键 - * @return Role - */ - @GetMapping(ROLE) - R getRole(@RequestParam("id") Long id); + /** + * 获取角色 + * + * @param id 主键 + * @return Role + */ + @GetMapping(ROLE) + R getRole(@RequestParam("id") Long id); - /** - * 获取角色id - * - * @param tenantId 租户id - * @param roleNames 角色名 - * @return 角色id - */ - @GetMapping(ROLE_IDS) - R getRoleIds(@RequestParam("tenantId") String tenantId, @RequestParam("roleNames") String roleNames); + /** + * 获取角色id + * + * @param tenantId 租户id + * @param roleNames 角色名 + * @return 角色id + */ + @GetMapping(ROLE_IDS) + R getRoleIds(@RequestParam("tenantId") String tenantId, @RequestParam("roleNames") String roleNames); - /** - * 获取角色名 - * - * @param id 主键 - * @return 角色名 - */ - @GetMapping(ROLE_NAME) - R getRoleName(@RequestParam("id") Long id); + /** + * 获取角色名 + * + * @param id 主键 + * @return 角色名 + */ + @GetMapping(ROLE_NAME) + R getRoleName(@RequestParam("id") Long id); - /** - * 获取角色别名 - * - * @param id 主键 - * @return 角色别名 - */ - @GetMapping(ROLE_ALIAS) - R getRoleAlias(@RequestParam("id") Long id); + /** + * 获取角色别名 + * + * @param id 主键 + * @return 角色别名 + */ + @GetMapping(ROLE_ALIAS) + R getRoleAlias(@RequestParam("id") Long id); - /** - * 获取角色名 - * - * @param roleIds 主键 - * @return - */ - @GetMapping(ROLE_NAMES) - R> getRoleNames(@RequestParam("roleIds") String roleIds); + /** + * 获取角色名 + * + * @param roleIds 主键 + * @return + */ + @GetMapping(ROLE_NAMES) + R> getRoleNames(@RequestParam("roleIds") String roleIds); - /** - * 获取角色别名 - * - * @param roleIds 主键 - * @return 角色别名 - */ - @GetMapping(ROLE_ALIASES) - R> getRoleAliases(@RequestParam("roleIds") String roleIds); + /** + * 获取角色别名 + * + * @param roleIds 主键 + * @return 角色别名 + */ + @GetMapping(ROLE_ALIASES) + R> getRoleAliases(@RequestParam("roleIds") String roleIds); - /** - * 获取租户 - * - * @param id 主键 - * @return Tenant - */ - @GetMapping(TENANT) - R getTenant(@RequestParam("id") Long id); + /** + * 获取租户 + * + * @param id 主键 + * @return Tenant + */ + @GetMapping(TENANT) + R getTenant(@RequestParam("id") Long id); - /** - * 获取租户 - * - * @param tenantId 租户id - * @return Tenant - */ - @GetMapping(TENANT_ID) - R getTenant(@RequestParam("tenantId") String tenantId); + /** + * 获取租户 + * + * @param tenantId 租户id + * @return Tenant + */ + @GetMapping(TENANT_ID) + R getTenant(@RequestParam("tenantId") String tenantId); - /** - * 获取租户产品包 - * - * @param tenantId 租户id - * @return Tenant - */ - @GetMapping(TENANT_PACKAGE) - R getTenantPackage(@RequestParam("tenantId") String tenantId); + /** + * 获取租户产品包 + * + * @param tenantId 租户id + * @return Tenant + */ + @GetMapping(TENANT_PACKAGE) + R getTenantPackage(@RequestParam("tenantId") String tenantId); - /** - * 获取参数 - * - * @param id 主键 - * @return Param - */ - @GetMapping(PARAM) - R getParam(@RequestParam("id") Long id); + /** + * 获取参数 + * + * @param id 主键 + * @return Param + */ + @GetMapping(PARAM) + R getParam(@RequestParam("id") Long id); - /** - * 获取参数配置 - * - * @param paramKey 参数key - * @return String - */ - @GetMapping(PARAM_VALUE) - R getParamValue(@RequestParam("paramKey") String paramKey); + /** + * 获取参数配置 + * + * @param paramKey 参数key + * @return String + */ + @GetMapping(PARAM_VALUE) + R getParamValue(@RequestParam("paramKey") String paramKey); - /** - * 获取行政区划 - * - * @param code 主键 - * @return Region - */ - @GetMapping(REGION) - R getRegion(@RequestParam("code") String code); + /** + * 获取行政区划 + * + * @param code 主键 + * @return Region + */ + @GetMapping(REGION) + R getRegion(@RequestParam("code") String code); + + /** + * 根据角色别名查询所有用户 + * + * @param roleAlias + * @return + */ + @GetMapping(LIST_ALL_USER_BY_ROLE_ALIAS) + R> listAllByRoleAlias(@RequestParam("roleAlias") String roleAlias); } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java index a5c451690..184d87c8e 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java @@ -164,5 +164,10 @@ public class ISysClientFallback implements ISysClient { return R.fail("获取数据失败"); } + @Override + public R> listAllByRoleAlias(String roleAlias) { + return R.fail("获取数据失败"); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/feign/BsEnergyCoreUseClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/feign/BsEnergyCoreUseClient.java index 3a1abb2a7..032fc3d40 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/feign/BsEnergyCoreUseClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/feign/BsEnergyCoreUseClient.java @@ -21,4 +21,9 @@ public class BsEnergyCoreUseClient implements IBsEnergyCoreUseClient { public void saveHistoryRec() { service.saveHistoryRec(); } + + @Override + public void warning() { + service.warning(); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyCoreUseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyCoreUseService.java index 19b577e39..bc53005c0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyCoreUseService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyCoreUseService.java @@ -32,5 +32,8 @@ public interface IBsEnergyCoreUseService extends BaseService bsEnergyHistoryRecEntities = bsEnergyHistoryRecService.list(new LambdaQueryWrapper().eq(BsEnergyHistoryRecEntity::getDeviceCode, deviceCode).orderByDesc(BsEnergyHistoryRecEntity::getCreateTime)); BsEnergyHistoryRecEntity last = null; - if(!CollectionUtils.isEmpty(bsEnergyHistoryRecEntities)){ + if (!CollectionUtils.isEmpty(bsEnergyHistoryRecEntities)) { last = bsEnergyHistoryRecEntities.get(0); } if (last != null && last.getId() != null) { @@ -182,6 +193,76 @@ public class BsEnergyCoreUseServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + LocalDate today = LocalDate.now(); + LocalDate yesterday = today.minusDays(1); + LocalDate day1 = yesterday.minusDays(1); + LocalDate day2 = yesterday.minusDays(2); + LocalDate day3 = yesterday.minusDays(3); + wrapper.ne("QUO_ELECTRIC_NUM", 0); + wrapper.eq("TYPE", "2"); + wrapper.apply("TRUNC(START_TIME) >= TRUNC({0}) AND TRUNC(START_TIME) < TRUNC({1}) AND (REAL_ELECTRIC_NUM < QUO_ELECTRIC_NUM OR REAL_ELECTRIC_NUM > QUO_ELECTRIC_NUM * 1.3)", day3, today); + List list = this.list(wrapper); + if (CollectionUtils.isEmpty(list)) { + return; + } + R> userResult = sysClient.listAllByRoleAlias("environmentalTechnician"); + if (userResult == null || !userResult.isSuccess()) { + return; + } + List users = userResult.getData(); + Map> workDayMap = list.stream() + .collect(Collectors.groupingBy( + BsEnergyCoreUseEntity::getWorkCenterId, + Collectors.mapping( + entity -> SDF.format(entity.getStartTime()), + Collectors.toSet() + ) + )); + Map workCenterMap = list.stream() + .collect(Collectors.toMap( + BsEnergyCoreUseEntity::getWorkCenterId, + BsEnergyCoreUseEntity::getWorkCenterName, + (oldVal, newVal) -> oldVal + )); + String date0 = SDF.format(localDateToDate(yesterday)); + String date1 = SDF.format(localDateToDate(day1)); + String date2 = SDF.format(localDateToDate(day2)); + String date3 = SDF.format(localDateToDate(day3)); + for (Map.Entry> entry : workDayMap.entrySet()) { + String workCenterId = entry.getKey(); + String workCenterName = workCenterMap.get(workCenterId); + Set dateSet = entry.getValue(); + + // 判断每一天是否异常 + boolean b0 = dateSet.contains(date0); + boolean b1 = dateSet.contains(date1); + boolean b2 = dateSet.contains(date2); + boolean b3 = dateSet.contains(date3); + + // 触发条件：仅最近三天异常 + if (b0 && b1 && b2 && !b3) { + // 发送提醒 + String title = String.format("%s - 用电异常提醒", workCenterName); + String content = String.format("%s - 已连续3天用电异常，请关注", workCenterName); + for (User user : users) { + MesNotifyMessageEntity notifyMessage = MesNotifyMessageEntity.builder() + .title(title) + .content(content) + .receiveUserId(user.getId()) + .build(); + mesNotifyMessageClient.save(notifyMessage); + } + } + } + } + + private Date localDateToDate(LocalDate localDate) { + return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + } + /** * 创建作业中心用水用电记录 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml index 87d731014..63e0efa9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml @@ -21,11 +21,12 @@ a.SETTLEMENT_MEMO, a.APPROVAL_STATUS, CASE a.APPROVAL_STATUS - WHEN 1 THEN '待审批' - WHEN 2 THEN '审批中' - WHEN 3 THEN '审批通过' - WHEN 4 THEN '审批不通过' - ELSE '未知' + WHEN 1 THEN '待校对' + WHEN 2 THEN '校对中' + WHEN 3 THEN '审核通过' + WHEN 4 THEN '审核不通过' + WHEN 5 THEN '待审核' + ELSE '未知' END AS APPROVAL_STATUS_NAME, a.SUBMIT_TIME, to_char(a.SUBMIT_TIME, 'yyyy-MM-dd') as SUBMIT_DATE, @@ -94,10 +95,11 @@ a.SETTLEMENT_MEMO, a.APPROVAL_STATUS, CASE a.APPROVAL_STATUS - WHEN 1 THEN '待审批' - WHEN 2 THEN '审批中' - WHEN 3 THEN '审批通过' - WHEN 4 THEN '审批不通过' + WHEN 1 THEN '待校对' + WHEN 2 THEN '校对中' + WHEN 3 THEN '审核通过' + WHEN 4 THEN '审核不通过' + WHEN 5 THEN '待审核' ELSE '未知' END AS APPROVAL_STATUS_NAME, a.SUBMIT_TIME, diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java index d067ab0fb..28fc6fbed 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java @@ -63,6 +63,8 @@ public class SysClient implements ISysClient { private final IRegionService regionService; + private final IUserExtService userExtService; + @Override @GetMapping(MENU) public R getMenu(Long id) { @@ -206,5 +208,10 @@ public class SysClient implements ISysClient { return R.data(regionService.getById(code)); } + @Override + public R> listAllByRoleAlias(String roleAlias) { + return R.data(userExtService.listAllByRole(roleAlias)); + } + }