设备控制器 业务层

yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/vo/PageVo.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.monitor.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Exrickx
+ */
+@Data
+public class PageVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "页号")
+    private int current;
+
+    @ApiModelProperty(value = "页面大小")
+    private int size;
+
+    @ApiModelProperty(value = "排序字段")
+    private String sort;
+
+    @ApiModelProperty(value = "排序方式 asc/desc")
+    private String order;
+}

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceLogRest.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
 
 @Api(tags = "设备日志控制器")
-@RestController("com.yxt.supervise.monitor.biz.controller.YDeviceRest")
+@RestController("com.yxt.supervise.monitor.biz.controller.YDeviceLogRest")
-@RequestMapping("/device")
+@RequestMapping("/deviceLog")
 public class YDeviceLogRest {
 
     @Autowired

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java

@@ -2,17 +2,16 @@ package com.yxt.supervise.monitor.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.monitor.api.entity.Device;
+import com.yxt.supervise.monitor.api.vo.PageVo;
 import com.yxt.supervise.monitor.biz.demobaseentity.DemoBaseentityService;
 import com.yxt.supervise.monitor.biz.service.YDeviceService;
 import com.yxt.supervise.monitor.biz.util.HttpUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -32,16 +31,22 @@ public class YDeviceRest {
 
     @ApiOperation("分页获取设备列表")
     @GetMapping("/getDevicePage")
-    public String getDevicePage(@RequestParam Map<String,String> searchVo) {
+    public String getDevicePage(@RequestParam Map<String,String> searchVo,
+                                @ModelAttribute PageVo pageVo) {
         yDeviceService.getDevicePage(searchVo);
         return null;
     }
 
+    @ApiOperation("添加设备组")
+    @PostMapping("/createDeviceGroup")
+    public ResultBean createDeviceGroup(Device device) {
+        return yDeviceService.createDeviceGroup(device);
+    }
+
 
     @ApiOperation("添加设备")
-    @GetMapping("/createDevice")
+    @PostMapping("/createDevice")
-    public String createDevice(@RequestParam Device device) {
+    public ResultBean createDevice(Device device) {
-        yDeviceService.createDevice(device);
+        return yDeviceService.createDevice(device);
-        return null;
     }
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java

@@ -3,6 +3,7 @@ package com.yxt.supervise.monitor.biz.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.monitor.api.demoidentity.DemoIdentity;
 import com.yxt.supervise.monitor.api.entity.Device;
 import com.yxt.supervise.monitor.biz.demoidentity.DemoIdentityMapper;
@@ -17,6 +18,7 @@ public interface YDeviceService extends IService<Device> {
 
     IPage<Device> getDevicePage(Map<String,String> searchVo);
 
+    ResultBean createDevice(Device device);
 
-    String createDevice(Device device);
+    ResultBean createDeviceGroup(Device device);
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java

@@ -1,19 +1,25 @@
 package com.yxt.supervise.monitor.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.monitor.api.entity.Device;
 import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper;
 import com.yxt.supervise.monitor.biz.service.YDeviceService;
+import com.yxt.supervise.monitor.biz.util.HttpUtils;
 import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
 public class IYDeviceServiceImpl extends ServiceImpl<YDeviceMapper, Device> implements YDeviceService {
 
-    @Resource YDeviceMapper yDeviceMapper;
+    @Resource
+    YDeviceMapper yDeviceMapper;
 
 
     @Override
@@ -22,7 +28,37 @@ public class IYDeviceServiceImpl extends ServiceImpl<YDeviceMapper, Device> impl
     }
 
     @Override
-    public String createDevice(Device device){
+    public ResultBean createDevice(Device device) {
-        return null;
+        ResultBean rb = ResultBean.fireSuccess();
+
+        // 先给海康接口添加设备 如果失败直接返回失败
+        String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/create";
+        Map<String, Object> param = new HashMap<>();
+        param.put("deviceSerial", "Q16362484"); // 设备序列号	string
+        param.put("groupNo", "A1181"); // 组编号	string
+        param.put("validateCode", device.getVCode()); // 验证码	string
+        String paramJson = JSONObject.toJSONString(param);
+        String result = HttpUtils.sendPostJson(url, paramJson, "35ad3e80-1de4-4477-827e-0473320cf644");
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if ("200".equals(jsonObject.get("code").toString())) {
+            return rb.setData(this.save(device));
+        } else {
+            rb.setData(jsonObject.get("message"));
+            return rb;
+        }
+    }
+
+    @Override
+    public ResultBean createDeviceGroup(Device device) {
+        ResultBean rb = ResultBean.fireFail();
+
+        String url = "https://api2.hik-cloud.com/api/v1/open/basic/groups/create";
+        Map<String, Object> param = new HashMap<>();
+        param.put("groupName", "测试添加"); // 设备序列号	string
+        param.put("groupNo", "A1181"); // 组编号	string
+        String paramJson = JSONObject.toJSONString(param);
+        String result = HttpUtils.sendPostJson(url, paramJson, "35ad3e80-1de4-4477-827e-0473320cf644");
+        rb.setData(result);
+        return rb;
     }
 }