Merge branch 'han' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/VcDeviceGroupController.java

@@ -1,10 +1,16 @@
 package com.usky.iot.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.domain.VcDeviceGroup;
+import com.usky.iot.service.VcDeviceGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -13,9 +19,56 @@ import org.springframework.stereotype.Controller;
  * @author han
  * @since 2024-10-23
  */
-@Controller
+@RestController
 @RequestMapping("/vcDeviceGroup")
 public class VcDeviceGroupController {
+    @Autowired
+    private VcDeviceGroupService vcDeviceGroupService;
+
+    /**
+     * 站点分组-新增
+     *
+     * @param groupName 站点分组名称
+     * @return
+     */
+    @GetMapping("vcDeviceGroupAdd")
+    public ApiResult<Void> vcDeviceGroupAdd(@RequestParam String groupName) {
+        vcDeviceGroupService.vcDeviceGroupAdd(groupName);
+        return ApiResult.success();
+    }
+
+    /**
+     * 站点分组-修改
+     *
+     * @param groupName 站点分组名称
+     * @param id           站点分组ID
+     * @return
+     */
+    @GetMapping("vcDeviceGroupUpdate")
+    public ApiResult<Void> vcDeviceGroupUpdate(@RequestParam String groupName, @RequestParam Integer id) {
+        vcDeviceGroupService.vcDeviceGroupUpdate(groupName, id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 站点分组-删除
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        vcDeviceGroupService.removeById(id);
+        return ApiResult.success();
+    }
 
+    /**
+     * 站点分组-列表
+     *
+     * @param groupName 站点分组名称
+     * @return
+     */
+    @GetMapping("vcDeviceGroupList")
+    public ApiResult<List<VcDeviceGroup>> vcDeviceGroupList(@RequestParam(value = "groupName", required = false, defaultValue = "") String groupName) {
+        return ApiResult.success(vcDeviceGroupService.vcDeviceGroupList(groupName));
+    }
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/VcDevice.java

@@ -57,6 +57,31 @@ public class VcDevice implements Serializable {
      */
     private Integer groupId;
 
+    /**
+     * 排序
+     */
+    private Integer orderNum;
+
+    /**
+     * 获取方式
+     */
+    private Integer access;
+
+    /**
+     * 视频描述
+     */
+    private String videoDesc;
+
+    /**
+     * 摄像头IP
+     */
+    private String videoIp;
+
+    /**
+     * 摄像头端口
+     */
+    private Integer videoPort;
+
     /**
      * 创建者
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/VcDeviceGroup.java

@@ -32,6 +32,11 @@ public class VcDeviceGroup implements Serializable {
      */
     private String groupName;
 
+    /**
+     * 排序
+     */
+    private Integer orderNum;
+
     /**
      * 创建者
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/VcStream.java

@@ -57,6 +57,11 @@ public class VcStream implements Serializable {
      */
     private String deployAmbient;
 
+    /**
+     * 流媒体描述
+     */
+    private String streamDesc;
+
     /**
      * 创建者
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/VcDeviceGroupService.java

@@ -1,8 +1,11 @@
 package com.usky.iot.service;
 
+import com.usky.iot.domain.VcDevice;
 import com.usky.iot.domain.VcDeviceGroup;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,9 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface VcDeviceGroupService extends CrudService<VcDeviceGroup> {
 
+    void vcDeviceGroupAdd(String groupName);
+
+    void vcDeviceGroupUpdate(String groupName,Integer id);
+
+    List<VcDeviceGroup> vcDeviceGroupList(String groupName);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/VcDeviceGroupServiceImpl.java

@@ -1,11 +1,18 @@
 package com.usky.iot.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.VcDevice;
 import com.usky.iot.domain.VcDeviceGroup;
 import com.usky.iot.mapper.VcDeviceGroupMapper;
 import com.usky.iot.service.VcDeviceGroupService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +24,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class VcDeviceGroupServiceImpl extends AbstractCrudService<VcDeviceGroupMapper, VcDeviceGroup> implements VcDeviceGroupService {
 
+    @Override
+    public void vcDeviceGroupAdd(String groupName){
+        VcDeviceGroup vcDeviceGroup = new VcDeviceGroup();
+        vcDeviceGroup.setGroupName(groupName);
+        vcDeviceGroup.setCreateBy(SecurityUtils.getUsername());
+        vcDeviceGroup.setCreateTime(LocalDateTime.now());
+        vcDeviceGroup.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        vcDeviceGroup.setTenantId(SecurityUtils.getTenantId());
+        this.save(vcDeviceGroup);
+    }
+
+    @Override
+    public void vcDeviceGroupUpdate(String groupName,Integer id){
+        VcDeviceGroup vcDeviceGroup = this.getById(id);
+        vcDeviceGroup.setUpdateBy(SecurityUtils.getUsername());
+        vcDeviceGroup.setUpdateTime(LocalDateTime.now());
+        vcDeviceGroup.setGroupName(groupName);
+        this.updateById(vcDeviceGroup);
+    }
+
+    @Override
+    public List<VcDeviceGroup> vcDeviceGroupList(String groupName){
+        LambdaQueryWrapper<VcDeviceGroup> lambdaQuery = Wrappers.lambdaQuery();
+//        lambdaQuery.eq(VcDeviceGroup::getTenantId,SecurityUtils.getTenantId());
+        List<VcDeviceGroup> list = this.list(lambdaQuery);
+        return list;
+    }
 }

service-iot/service-iot-biz/src/main/resources/mapper/iot/VcDeviceGroupMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.usky.iot.domain.VcDeviceGroup">
         <id column="id" property="id" />
         <result column="group_name" property="groupName" />
+        <result column="order_num" property="orderNum" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />

service-iot/service-iot-biz/src/main/resources/mapper/iot/VcDeviceMapper.xml

@@ -11,6 +11,11 @@
         <result column="camera_type" property="cameraType" />
         <result column="stream_id" property="streamId" />
         <result column="group_id" property="groupId" />
+        <result column="order_num" property="orderNum" />
+        <result column="access" property="access" />
+        <result column="video_desc" property="videoDesc" />
+        <result column="video_ip" property="videoIP" />
+        <result column="video_port" property="videoPort" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />

service-iot/service-iot-biz/src/main/resources/mapper/iot/VcStreamMapper.xml

@@ -11,6 +11,7 @@
         <result column="user_password" property="userPassword" />
         <result column="platform_type" property="platformType" />
         <result column="deploy_ambient" property="deployAmbient" />
+        <result column="stream_desc" property="streamDesc" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />