‘liusuyi’
2023-06-16 4c855671b05efba9199c456adbd7c846db608230
优化三维实景业务
已修改3个文件
21 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -1,16 +1,14 @@
package com.ruoyi.alarm.globalAlarm.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -33,17 +31,19 @@
    @PostMapping("/List")
    @ApiOperation(value = "报警查询接口",notes = "这里包含了所有报警类型的数据")
    @ApiOperationSupport(includeParameters = {"condition.command"})
    public AjaxResult selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
        List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
        return AjaxResult.success(result);
    }
    @PostMapping("/view")
    @ApiOperation(value = "查看报警接口",notes = "指定查看某个报警数据")
    @ApiOperationSupport(includeParameters = {"condition.command","condition.id"})
    public AjaxResult  viewAlarmLog(@RequestBody GlobalAlarmCondition condition) {
        Object result = globalAlarmService.updateAlarmViewTime(condition);
        return AjaxResult.success(result);
    }
    @PostMapping("/count")
    @GetMapping("/count")
    @ApiOperation(value = "查看报警点数量",notes = "查询刷新时间内报警的点位数量")
    public AjaxResult  countAlarmLog() {
        Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
@@ -43,6 +43,7 @@
     */
    @PreAuthorize("@ss.hasPermi('management3d:tiles3d:list')")
    @GetMapping("/list")
    @ApiOperation("查询三维实景列表")
    public TableDataInfo list(ArdTiles3d ardTiles3d)
    {
        startPage();
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
@@ -65,11 +65,11 @@
    /** 自动超清化模型 */
    @Excel(name = "自动超清化模型")
    private Integer cullRequestsWhileMovingMultiplier;
    private Double cullRequestsWhileMovingMultiplier;
    /** 模型加载速度 */
    @Excel(name = "模型加载速度")
    private Integer dynamicScreenSpaceErrorDensity;
    private Double dynamicScreenSpaceErrorDensity;
    /** 部门id */
    @Excel(name = "部门id")
@@ -187,21 +187,21 @@
    {
        return maximumMemoryUsage;
    }
    public void setCullRequestsWhileMovingMultiplier(Integer cullRequestsWhileMovingMultiplier)
    public void setCullRequestsWhileMovingMultiplier(Double cullRequestsWhileMovingMultiplier)
    {
        this.cullRequestsWhileMovingMultiplier = cullRequestsWhileMovingMultiplier;
    }
    public Integer getCullRequestsWhileMovingMultiplier()
    public Double getCullRequestsWhileMovingMultiplier()
    {
        return cullRequestsWhileMovingMultiplier;
    }
    public void setDynamicScreenSpaceErrorDensity(Integer dynamicScreenSpaceErrorDensity)
    public void setDynamicScreenSpaceErrorDensity(Double dynamicScreenSpaceErrorDensity)
    {
        this.dynamicScreenSpaceErrorDensity = dynamicScreenSpaceErrorDensity;
    }
    public Integer getDynamicScreenSpaceErrorDensity()
    public Double getDynamicScreenSpaceErrorDensity()
    {
        return dynamicScreenSpaceErrorDensity;
    }