增加APP位置接口 修复ptz设置获取不到用户问题

‘liusuyi’

2023-07-18 8ba375ddf6fc3bedf7999bf065575e5e75e5504c

增加APP位置接口
修复ptz设置获取不到用户问题

 ard-work/pom.xml

@@ -21,11 +21,6 @@
            <version>1.10</version>
        </dependency>


        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
@@ -65,12 +60,6 @@
            <artifactId>minio</artifactId>
            <version>8.3.5</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>io.swagger</groupId>-->
<!--            <artifactId>swagger-annotations</artifactId>-->
<!--            <version>1.6.2</version>-->
<!--            <scope>compile</scope>-->
<!--        </dependency>-->
        <!--mqtt-->
        <dependency>
            <groupId>org.springframework.integration</groupId>
@@ -87,16 +76,16 @@
<!--            <version>3.0.0</version>-->
<!--            <scope>compile</scope>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-spring</artifactId>
            <version>2.0.9</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.github.xiaoymin</groupId>-->
<!--            <artifactId>knife4j-annotations</artifactId>-->
<!--            <artifactId>knife4j-spring</artifactId>-->
<!--            <version>2.0.9</version>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-annotations</artifactId>
            <version>2.0.9</version>
        </dependency>
        <!--张建提供引导依赖-->
        <dependency>
            <groupId>org.gavaghan</groupId>

 ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java

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

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicParameters;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;

 ard-work/src/main/java/com/ruoyi/app/controller/ArdAppPositionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@
package com.ruoyi.app.controller;

import javax.servlet.http.HttpServletResponse;

import com.ruoyi.app.domain.ArdAppPosition;
import com.ruoyi.app.service.IArdAppPositionService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;

import java.util.List;

/**
 * app位置Controller
 * 
 * @author ard
 * @date 2023-07-18
 */
@Api(tags = "app位置")
@RestController
@RequestMapping("/app/position")
public class ArdAppPositionController extends BaseController
{
    @Autowired
    private IArdAppPositionService ardAppPositionService;

    /**
     * æŸ¥è¯¢app位置列表
     */
    @ApiOperation("查询app位置列表")
    @PreAuthorize("@ss.hasPermi('app:position:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdAppPosition ardAppPosition)
    {
        startPage();
        List<ArdAppPosition> list = ardAppPositionService.selectArdAppPositionList(ardAppPosition);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºapp位置列表
     */
    @PreAuthorize("@ss.hasPermi('app:position:export')")
    @Log(title = "app位置", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdAppPosition ardAppPosition)
    {
        List<ArdAppPosition> list = ardAppPositionService.selectArdAppPositionList(ardAppPosition);
        ExcelUtil<ArdAppPosition> util = new ExcelUtil<ArdAppPosition>(ArdAppPosition.class);
        util.exportExcel(response, list, "app位置数据");
    }

    /**
     * èŽ·å–app位置详细信息
     */
    @PreAuthorize("@ss.hasPermi('app:position:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(ardAppPositionService.selectArdAppPositionById(id));
    }

    /**
     * æ–°å¢žapp位置
     */
    @ApiOperation("新增app位置")
    @PreAuthorize("@ss.hasPermi('app:position:add')")
    @Log(title = "app位置", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdAppPosition ardAppPosition)
    {
        return toAjax(ardAppPositionService.insertArdAppPosition(ardAppPosition));
    }

    /**
     * ä¿®æ”¹app位置
     */
    @PreAuthorize("@ss.hasPermi('app:position:edit')")
    @Log(title = "app位置", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdAppPosition ardAppPosition)
    {
        return toAjax(ardAppPositionService.updateArdAppPosition(ardAppPosition));
    }

    /**
     * åˆ é™¤app位置
     */
    @PreAuthorize("@ss.hasPermi('app:position:remove')")
    @Log(title = "app位置", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(ardAppPositionService.deleteArdAppPositionByIds(ids));
    }
}

 ard-work/src/main/java/com/ruoyi/app/domain/ArdAppPosition.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.ruoyi.app.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * app位置对象 ard_app_position
 * 
 * @author ard
 * @date 2023-07-18
 */
public class ArdAppPosition extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ID */
    private String id;

    /** ç”¨æˆ·ID */
    @Excel(name = "用户ID")
    private String userId;

    /** ç»åº¦ */
    @Excel(name = "经度")
    private Double longitude;

    /** çº¬åº¦ */
    @Excel(name = "纬度")
    private Double latitude;

    /** é«˜å±‚ */
    @Excel(name = "高层")
    private Double altitude;

    public void setId(String id) 
    {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    }
    public void setUserId(String userId) 
    {
        this.userId = userId;
    }

    public String getUserId() 
    {
        return userId;
    }
    public void setLongitude(Double longitude) 
    {
        this.longitude = longitude;
    }

    public Double getLongitude() 
    {
        return longitude;
    }
    public void setLatitude(Double latitude) 
    {
        this.latitude = latitude;
    }

    public Double getLatitude() 
    {
        return latitude;
    }
    public void setAltitude(Double altitude) 
    {
        this.altitude = altitude;
    }

    public Double getAltitude() 
    {
        return altitude;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("userId", getUserId())
            .append("longitude", getLongitude())
            .append("latitude", getLatitude())
            .append("altitude", getAltitude())
            .append("createTime", getCreateTime())
            .toString();
    }
}

 ard-work/src/main/java/com/ruoyi/app/mapper/ArdAppPositionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.ruoyi.app.mapper;

import java.util.List;
import com.ruoyi.app.domain.ArdAppPosition;


/**
 * app位置Mapper接口
 * 
 * @author ard
 * @date 2023-07-18
 */
public interface ArdAppPositionMapper 
{
    /**
     * æŸ¥è¯¢app位置
     * 
     * @param id app位置主键
     * @return app位置
     */
    public ArdAppPosition selectArdAppPositionById(String id);

    /**
     * æŸ¥è¯¢app位置列表
     * 
     * @param ardAppPosition app位置
     * @return app位置集合
     */
    public List<ArdAppPosition> selectArdAppPositionList(ArdAppPosition ardAppPosition);

    /**
     * æ–°å¢žapp位置
     * 
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    public int insertArdAppPosition(ArdAppPosition ardAppPosition);

    /**
     * ä¿®æ”¹app位置
     * 
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    public int updateArdAppPosition(ArdAppPosition ardAppPosition);

    /**
     * åˆ é™¤app位置
     * 
     * @param id app位置主键
     * @return ç»“æžœ
     */
    public int deleteArdAppPositionById(String id);

    /**
     * æ‰¹é‡åˆ é™¤app位置
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteArdAppPositionByIds(String[] ids);
}

 ard-work/src/main/java/com/ruoyi/app/service/IArdAppPositionService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.ruoyi.app.service;

import java.util.List;
import com.ruoyi.app.domain.ArdAppPosition;


/**
 * app位置Service接口
 * 
 * @author ard
 * @date 2023-07-18
 */
public interface IArdAppPositionService 
{
    /**
     * æŸ¥è¯¢app位置
     * 
     * @param id app位置主键
     * @return app位置
     */
    public ArdAppPosition selectArdAppPositionById(String id);

    /**
     * æŸ¥è¯¢app位置列表
     * 
     * @param ardAppPosition app位置
     * @return app位置集合
     */
    public List<ArdAppPosition> selectArdAppPositionList(ArdAppPosition ardAppPosition);

    /**
     * æ–°å¢žapp位置
     * 
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    public int insertArdAppPosition(ArdAppPosition ardAppPosition);

    /**
     * ä¿®æ”¹app位置
     * 
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    public int updateArdAppPosition(ArdAppPosition ardAppPosition);

    /**
     * æ‰¹é‡åˆ é™¤app位置
     * 
     * @param ids éœ€è¦åˆ é™¤çš„app位置主键集合
     * @return ç»“æžœ
     */
    public int deleteArdAppPositionByIds(String[] ids);

    /**
     * åˆ é™¤app位置信息
     * 
     * @param id app位置主键
     * @return ç»“æžœ
     */
    public int deleteArdAppPositionById(String id);
}

 ard-work/src/main/java/com/ruoyi/app/service/impl/ArdAppPositionServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.ruoyi.app.service.impl;

import com.ruoyi.app.domain.ArdAppPosition;
import com.ruoyi.app.mapper.ArdAppPositionMapper;
import com.ruoyi.app.service.IArdAppPositionService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;


/**
 * app位置Service业务层处理
 *
 * @author ard
 * @date 2023-07-18
 */
@Service
public class ArdAppPositionServiceImpl implements IArdAppPositionService {
    @Resource
    private ArdAppPositionMapper ardAppPositionMapper;

    /**
     * æŸ¥è¯¢app位置
     *
     * @param id app位置主键
     * @return app位置
     */
    @Override
    public ArdAppPosition selectArdAppPositionById(String id) {
        return ardAppPositionMapper.selectArdAppPositionById(id);
    }

    /**
     * æŸ¥è¯¢app位置列表
     *
     * @param ardAppPosition app位置
     * @return app位置
     */
    @Override
    public List<ArdAppPosition> selectArdAppPositionList(ArdAppPosition ardAppPosition) {
        return ardAppPositionMapper.selectArdAppPositionList(ardAppPosition);
    }

    /**
     * æ–°å¢žapp位置
     *
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    @Override
    public int insertArdAppPosition(ArdAppPosition ardAppPosition) {
                ardAppPosition.setUserId(SecurityUtils.getUserId());
                ardAppPosition.setCreateTime(DateUtils.getNowDate());
            return ardAppPositionMapper.insertArdAppPosition(ardAppPosition);
    }

    /**
     * ä¿®æ”¹app位置
     *
     * @param ardAppPosition app位置
     * @return ç»“æžœ
     */
    @Override
    public int updateArdAppPosition(ArdAppPosition ardAppPosition) {
        return ardAppPositionMapper.updateArdAppPosition(ardAppPosition);
    }

    /**
     * æ‰¹é‡åˆ é™¤app位置
     *
     * @param ids éœ€è¦åˆ é™¤çš„app位置主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAppPositionByIds(String[] ids) {
        return ardAppPositionMapper.deleteArdAppPositionByIds(ids);
    }

    /**
     * åˆ é™¤app位置信息
     *
     * @param id app位置主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAppPositionById(String id) {
        return ardAppPositionMapper.deleteArdAppPositionById(id);
    }
}

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

@@ -161,6 +161,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.ptzMap"})
    public @ResponseBody
    AjaxResult SetPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setPtz(cmd));
    }


 ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.app.mapper.ArdAppPositionMapper">
    <resultMap type="ArdAppPosition" id="ArdAppPositionResult">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="longitude" column="longitude"/>
        <result property="latitude" column="latitude"/>
        <result property="altitude" column="altitude"/>
        <result property="createTime" column="create_time"/>
    </resultMap>

    <sql id="selectArdAppPositionVo">
        select id, user_id, longitude, latitude, altitude, create_time
        from ard_app_position
    </sql>

    <select id="selectArdAppPositionList" parameterType="ArdAppPosition" resultMap="ArdAppPositionResult">
        <include refid="selectArdAppPositionVo"/>
        <where>
        </where>
    </select>

    <select id="selectArdAppPositionById" parameterType="String" resultMap="ArdAppPositionResult">
        <include refid="selectArdAppPositionVo"/>
        where id = #{id}
    </select>

    <insert id="insertArdAppPosition" parameterType="ArdAppPosition">
        insert into ard_app_position
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="userId != null">user_id,</if>
            <if test="longitude != null">longitude,</if>
            <if test="latitude != null">latitude,</if>
            <if test="altitude != null">altitude,</if>
            <if test="createTime != null">create_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="userId != null">#{userId},</if>
            <if test="longitude != null">#{longitude},</if>
            <if test="latitude != null">#{latitude},</if>
            <if test="altitude != null">#{altitude},</if>
            <if test="createTime != null">#{createTime},</if>
        </trim>
    </insert>

    <update id="updateArdAppPosition" parameterType="ArdAppPosition">
        update ard_app_position
        <trim prefix="SET" suffixOverrides=",">
            <if test="userId != null">user_id = #{userId},</if>
            <if test="longitude != null">longitude = #{longitude},</if>
            <if test="latitude != null">latitude = #{latitude},</if>
            <if test="altitude != null">altitude = #{altitude},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteArdAppPositionById" parameterType="String">
        delete
        from ard_app_position
        where id = #{id}
    </delete>

    <delete id="deleteArdAppPositionByIds" parameterType="String">
        delete from ard_app_position where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -4,6 +4,8 @@
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
@@ -41,7 +43,7 @@
 * 
 * @author ruoyi
 */
//@Api(tags = "用户信息")
@Api(tags = "用户信息")
@RestController
@RequestMapping("/system/user")
public class SysUserController extends BaseController
@@ -62,6 +64,7 @@
     * èŽ·å–用户列表
     */
//    @ApiOperation(value = "获取用户列表")
    @ApiOperationSupport(includeParameters={"user.userId"})
    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysUser user)