From 9337904788cde21a22b96f17ed01c19f3ccfbe08 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Mon, 12 May 2025 13:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=E5=AE=9E=E6=97=B6=E4=B8=8E?= =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessAlertController.java | 8 +++-- .../controller/system/AiLabelController.java | 8 +++++ .../system/service/IAiLabelService.java | 1 + .../service/impl/AiLabelServiceImpl.java | 31 ++++++++++++++----- .../handler/WorkflowPermissionHandler.java | 12 ++++--- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java index d3f2659..5561834 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java @@ -2,6 +2,7 @@ package org.dromara.business.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSON; +import com.alibaba.nacos.client.utils.TenantUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -17,6 +18,8 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.api.RemoteNoticeService; import org.dromara.system.api.domain.bo.RemoteNoticeBo; @@ -87,7 +90,7 @@ public class BusinessAlertController extends BaseController { */ @Operation(summary ="ai实时流预警保存",description = "ai实时流预警保存") @PostMapping("/saveAlert") - public void saveAlert(@RequestBody BusinessAlertVo vo) { + public R saveAlert(@RequestBody BusinessAlertVo vo) { vo.setBusinessType(2); BusinessAlert businessAlert = businessAlertService.addBusinessAlert(vo); RemoteStartProcess startProcess = new RemoteStartProcess(); @@ -102,13 +105,14 @@ public class BusinessAlertController extends BaseController { remoteNoticeBo.setIsRead(0); remoteNoticeBo.setCreateBy(1L); remoteNoticeBo.setCreateDept(1L); - remoteNoticeBo.setCreateTime(new Date()); + remoteNoticeBo.setCreateTime(vo.getCreateTime()); if (vo.getBusinessType() == 2){ vo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, vo.getImages(), 3600).toString()); } remoteNoticeBo.setDeviceSn(vo.getDeviceSn()); remoteNoticeBo.setParam(JSON.toJSONString(vo)); remoteNoticeService.saveNotice(remoteNoticeBo); + return R.ok(); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java index 2a3b69d..845a44d 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java @@ -57,6 +57,14 @@ public class AiLabelController extends BaseController { return aiLabelService.allList(); } + /** + * 下拉框集合-绑定过的标签 + */ + @GetMapping("/bing/list") + public List listPostLabel() { + return aiLabelService.selectLabelList(); + } + /** * 下拉框集合 */ diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java index ede3b27..2994447 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java @@ -76,4 +76,5 @@ public interface IAiLabelService { String getFlowCode(String labelCode); List selectLabelByList(String postCode); + List selectLabelList(); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java index 19cdee1..b42756c 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java @@ -54,7 +54,7 @@ public class AiLabelServiceImpl implements IAiLabelService { * @return ai 识别类型 */ @Override - public AiLabelVo queryById(Long labelId){ + public AiLabelVo queryById(Long labelId) { return baseMapper.selectVoById(labelId); } @@ -132,7 +132,7 @@ public class AiLabelServiceImpl implements IAiLabelService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(AiLabel entity){ + private void validEntityBeforeSave(AiLabel entity) { //TODO 做一些数据校验,如唯一约束 } @@ -145,7 +145,7 @@ public class AiLabelServiceImpl implements IAiLabelService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; @@ -154,7 +154,7 @@ public class AiLabelServiceImpl implements IAiLabelService { @Override public List queryListByLabel(List labelIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in(!labelIds.isEmpty(),"label_id",labelIds); + queryWrapper.in(!labelIds.isEmpty(), "label_id", labelIds); return this.baseMapper.selectList(queryWrapper); } @@ -165,10 +165,10 @@ public class AiLabelServiceImpl implements IAiLabelService { @Override public List selectLabelByList(String postCode) { - SysPostVo sysPostVo = sysPostService.selectLableByList(postCode,null); - if(sysPostVo != null){ + SysPostVo sysPostVo = sysPostService.selectLableByList(postCode, null); + if (sysPostVo != null) { List postVoList = aiLabelPostService.queryListByLabel(sysPostVo.getPostId()); - return postVoList.stream() + return postVoList.stream() .map(aiLabel -> { AiLabelVo aiLabelVo = new AiLabelVo(); aiLabelVo.setLabelId(aiLabel.getLabelId()); @@ -181,4 +181,21 @@ public class AiLabelServiceImpl implements IAiLabelService { } return ListUtil.empty(); } + + @Override + public List selectLabelList() { + List aiLabelList = aiLabelPostService.getAiLabelList(); + return aiLabelList.stream() + .map(aiLabel -> { + AiLabelVo aiLabelVo = new AiLabelVo(); + aiLabelVo.setLabelId(aiLabel.getLabelId()); + aiLabelVo.setLabelEn(aiLabel.getLabelEn()); + aiLabelVo.setLabelCn(aiLabel.getLabelCn()); + aiLabelVo.setAiName(aiLabel.getAiName()); + return aiLabelVo; + }) + .collect(Collectors.toList()); + } + + } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java index 138c2e1..959e93f 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java @@ -36,19 +36,21 @@ public class WorkflowPermissionHandler implements PermissionHandler { */ @Override public List permissions() { - LoginUser loginUser = LoginHelper.getLoginUser(); List resultList = new ArrayList<>(); - //如果为空则将管理员放进去 - resultList.add("1"); - resultList.add("dept:100"); + resultList.add("1"); + resultList.add("dept:1"); resultList.add("${handler}"); - if (ObjectUtil.isNull(loginUser)) { + //没登陆 + if (!LoginHelper.isLogin()){ + return resultList; } + LoginUser loginUser = LoginHelper.getLoginUser(); + // 使用一个流来构建权限列表 List permissionList = Stream.of( // 角色权限前缀