yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预警信息发布接口修改

master
wany 2026-03-10 14:32:58 +08:00
parent 27e8981b9a
commit a384b22431
4 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gunshi/project/ss/controller/WarningRuleController.java
View File

@ -125,4 +125,10 @@ public class WarningRuleController{
public R<Boolean> audit(@RequestBody @Validated WarningAuditDto dto) {
return R.ok(warningRuleInfoService.audit(dto));
}
@Operation(summary = "预警信息审核统计")
@PostMapping("/audit/stat")
public R<Map<String,Long>> auditStat(@RequestBody @Validated WarningRulePageSo page) {
return R.ok(warningRuleInfoService.auditStat(page));
}
}

25
src/main/java/com/gunshi/project/ss/mapper/WarningRuleInfoMapper.java
View File

@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
@Mapper
public interface WarningRuleInfoMapper extends BaseMapper<WarningRuleInfo> {
@ -85,4 +86,28 @@ public interface WarningRuleInfoMapper extends BaseMapper<WarningRuleInfo> {
</script>
""")
Page<WarningRuleInfo> auditPage(Page<WarningRuleInfo> page,@Param("obj") WarningRulePageSo page1);
@Select("""
<script>
select t1.id,t2.warning_type from public.warning_rule_info t1
left join public.warning_rule t2 on t1.rule_id = t2.id
where t1.status != 0
<if test="obj.warningType != null and obj.warningType != ''">
and t2.warning_type = #{obj.warningType}
</if>
<if test="obj.warningLevel != null ">
and t2.warning_level = #{obj.warningLevel}
</if>
<if test="obj.auditStatus != null ">
and t1.status = #{obj.auditStatus}
</if>
<if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
and t1.init_audit_time <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
</if>
<if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
and t1.init_audit_time <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
</if>
</script>
""")
List<WarningRuleInfo> auditStat(@Param("obj") WarningRulePageSo page);
}

6
src/main/java/com/gunshi/project/ss/model/AttResBuilding.java
View File

@ -145,7 +145,7 @@ public class AttResBuilding implements Serializable {
private BigDecimal awaterLength;
@Schema(description="副坝输水管-壁厚(m)")
private BigDecimal awaterThick;
private String awaterThick;
@Schema(description="副坝输水管-最大流量(m³/s)")
private BigDecimal awaterMaxFlow;
@ -190,10 +190,10 @@ public class AttResBuilding implements Serializable {
private BigDecimal waterConveyanceInletElevation;
@Schema(description="东输水隧洞-长度")
private BigDecimal waterConveyanceLength;
private String waterConveyanceLength;
@Schema(description="东输水隧洞-壁厚(m)")
private BigDecimal waterConveyanceThick;
private String waterConveyanceThick;
@Schema(description="东输水隧洞-最大流量(m³/s)")
private BigDecimal waterConveyanceMaxFlow;

14
src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java
View File

@ -1,6 +1,7 @@
package com.gunshi.project.ss.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -67,8 +68,14 @@ public class WarningRuleInfoService extends ServiceImpl<WarningRuleInfoMapper,Wa
warningRuleInfo.setInitAuditTime(LocalDateTime.now());
warningRuleInfo.setFirstAuditUserId(auditProcess.getFirstAuditUserId());
warningRuleInfo.setFirstAuditUserName(auditProcess.getFirstAuditUserName());
warningRuleInfo.setFirstAuditTime(null);
warningRuleInfo.setFirstAuditStatus(null);
warningRuleInfo.setSecondAuditUserId(auditProcess.getSecondAuditUserId());
warningRuleInfo.setSecondAuditUserName(auditProcess.getSecondAuditUserName());
warningRuleInfo.setSecondAuditTime(null);
warningRuleInfo.setStatus(null);
this.updateById(warningRuleInfo);
objService.remove(new QueryWrapper<WarningRecObj>().eq("warning_info_id",warningRuleInfo.getId()));
objService.saveOrUpdateBatch(warningRuleInfo.getObjs());
return "发布成功";
}
@ -108,4 +115,9 @@ public class WarningRuleInfoService extends ServiceImpl<WarningRuleInfoMapper,Wa
}
return this.updateById(info);
}
public Map<String, Long> auditStat(WarningRulePageSo page) {
List<WarningRuleInfo> list= this.baseMapper.auditStat(page);
return list.stream().collect(Collectors.groupingBy(WarningRuleInfo::getWarningType, Collectors.counting()));
}
}