zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化逻辑

Browse Source
This commit is contained in:
tangwei 2026-07-23 10:12:48 +08:00
parent 3b10901fda
commit 0d8bc39af6
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java
View File

@ -265,6 +265,14 @@ public class SwaggerConfig {
.build();
}
@Bean
public GroupedOpenApi groupWarnRuleApi() {
return GroupedOpenApi.builder()
.group("5.5 预警规则")
.packagesToScan("com.yfd.platform.qgc_sys.warnRule.controller")
.build();
}
@Bean
public GroupedOpenApi groupLygkApi() {

3
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
View File

@ -107,12 +107,11 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
"FROM MS_WARN_RULE_B t1\n" +
"INNER JOIN MS_WARN_RULE_DETAIL_B t2 ON t1.ID = t2.RULE_ID\n" +
"INNER JOIN ST_YS_B t3 ON t2.YS = t3.YS\n" +
"WHERE t1.RULE_TYPE = #{ruleType}\n" +
"WHERE t1.RULE_TYPE ="+dbRuleType+"\n" +
" AND t1.IS_DELETED = 0\n" +
" AND t2.IS_DELETED = 0\n" +
"GROUP BY t2.TB_ID, t2.YS, t3.YS_SHOW_NAME";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("ruleType", dbRuleType);
return microservicDynamicSQLMapper.getAllListWithResultType(sql, paramMap, WarnYsVo.class);
}

2
backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java
View File

@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/sys/warnRule")
@Tag(name = "告警规则配置管理")
@Controller("msWarnRuleBControllerSys")
public class MsWarnRuleBController {
@Resource

6
backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
View File

@ -149,6 +149,9 @@ public class SysMenuController {
public ResponseResult addMenu(@RequestBody SysMenu sysMenu,
@RequestHeader(value = "Tenant_id", required = false) String tenantId) {
sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
if(StrUtil.isBlank(sysMenu.getTenantId())){
sysMenu.setTenantId(sysMenu.getSystemcode());
}
boolean isOk = sysMenuService.addMenu(sysMenu);
if (isOk) {
return ResponseResult.success();
@ -176,6 +179,9 @@ public class SysMenuController {
return ResponseResult.error("未找到对应租户的菜单");
}
sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
if(StrUtil.isBlank(sysMenu.getTenantId())){
sysMenu.setTenantId(sysMenu.getSystemcode());
}
sysMenu.setLastmodifier(userService.getUsername());
sysMenu.setLastmodifydate(new Timestamp(System.currentTimeMillis()));
boolean isOk = sysMenuService.updateById(sysMenu);