优化三维实景业务

‘liusuyi’

2023-06-16 46145020122ba6cbe138c805de2f870592867b81

优化三维实景业务

 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java

@@ -15,7 +15,6 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.List;
@@ -191,7 +190,6 @@
    AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlLock(cmd));

    }

    @ApiOperation("获取云台锁定信息")
@@ -262,6 +260,7 @@
        String base64Str = sdk.captureJPEGPicture(cmd);
        return toAjaxString(base64Str, "相机抓图");
    }

    @ApiOperation("相机抓图")
    @PostMapping("/picCutCate")
    @Log(title = "相机抓图", businessType = BusinessType.CONTROL)

 ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java

@@ -3,10 +3,13 @@
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;

import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
import com.ruoyi.management3d.tiles3d.service.IArdTiles3dService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

 ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
import com.ruoyi.management3d.tiles3d.mapper.ArdTiles3dMapper;
@@ -64,6 +65,7 @@
     */
    @Override
    public int insertArdTiles3d(ArdTiles3d ardTiles3d) {
        ardTiles3d.setTilesId(IdUtils.simpleUUID());
        ardTiles3d.setUserId(SecurityUtils.getUserId());
        ardTiles3d.setCreateBy(SecurityUtils.getUsername());
        ardTiles3d.setCreateTime(DateUtils.getNowDate());
@@ -140,8 +142,11 @@
        }
        if (ardTiles3ds.size() > 0) {
            for (ArdTiles3d tiles3d : ardTiles3ds) {
                Map<String, Object> cameraMap = ArdTool.convertEntityToMap(tiles3d);
                childList.add(cameraMap);
                Map<String, Object> tiles3dMap = ArdTool.convertEntityToMap(tiles3d);
                String value =(String) tiles3dMap.get("tilesName");
                tiles3dMap.remove("tilesName");
                tiles3dMap.put("name",value);
                childList.add(tiles3dMap);
            }
        }
        map.put("children", childList);

 ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml

@@ -74,7 +74,9 @@
            <if test="dynamicScreenSpaceErrorDensity != null ">and c.dynamic_screen_space_error_density =
                #{dynamicScreenSpaceErrorDensity}
            </if>
            <if test="deptId != null ">and c.dept_id = #{deptId}</if>
            <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
                WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
            </if>
            <if test="userId != null  and userId != ''">and c.user_id = #{userId}</if>
        </where>
        <!-- 数据范围过滤 -->

 ruoyi-admin/src/main/resources/application-ard.yml

@@ -17,7 +17,7 @@
#mqtt
mqtt:
  host: tcp://192.168.1.15:1883
  clientId: m4c
  clientId: m3
  username: admin
  password: xzx12345
  topic: tube,stealelec

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -50,6 +50,26 @@
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    @ApiModelProperty(value = "动态参数", name = "params", notes = "根据不同的查询字段自由配置参数", required = true)
    private Map<String, Object> params;
    @ApiModelProperty(value = "页码", name = "pageNum", notes = "页码", required = true)
    private Integer pageNum;
    @ApiModelProperty(value = "页大小", name = "pageSize", notes = "页大小", required = true)
    private Integer pageSize;

    public Integer getPageNum() {
        return pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        return pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }

    public String getSearchValue()
    {