diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/call/CallRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java similarity index 72% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/call/CallRest.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java index a1606f4..efcbb8c 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/call/CallRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java @@ -1,48 +1,31 @@ -package com.yxt.supervise.monitor.biz.call; +package com.yxt.supervise.monitor.biz.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.monitor.api.demobaseentity.DemoBaseentity; -import com.yxt.supervise.monitor.api.demobaseentity.DemoBaseentityDto; -import com.yxt.supervise.monitor.api.demobaseentity.DemoBaseentityQuery; -import com.yxt.supervise.monitor.api.demobaseentity.DemoBaseentityVo; import com.yxt.supervise.monitor.biz.demobaseentity.DemoBaseentityService; import com.yxt.supervise.monitor.biz.util.HttpUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.http.client.methods.HttpGet; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.io.IOException; import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.util.HashMap; -import java.util.List; import java.util.Map; -@Api(tags = "基础实体类") -@RestController("com.yxt.supervise.monitor.biz.call.CallRest") +@Api(tags = "接口控制器") +@RestController("com.yxt.supervise.monitor.biz.controller.CallRest") @RequestMapping("/call") public class CallRest { @Autowired private DemoBaseentityService demoBaseentityService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = demoBaseentityService.listPageVo(pq); - return rb.success().setData(pv); - } - @ApiOperation("获取token") @GetMapping("/getCallToken") public String getCallToken() throws Exception { @@ -149,33 +132,27 @@ public class CallRest { return result; } - @ApiOperation("新增") - @PostMapping("/insert") - public ResultBean save(@RequestBody DemoBaseentityDto dto) { - return demoBaseentityService.saveInsert(dto); - } - - @ApiOperation("修改") - @PostMapping("/update") - public ResultBean update(@RequestBody DemoBaseentityDto dto) { - return demoBaseentityService.saveUpdate(dto); + @ApiOperation("接入设备") + @GetMapping("/createDevice") + public String createDevice(String consumerId) { + String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/create"; + Map param = new HashMap<>(); + param.put("deviceSerial", consumerId); // 设备序列号 string + param.put("groupNo", consumerId); // 组编号 string + param.put("validateCode", consumerId); // 验证码 string + String result = HttpUtils.sendPostMap(url,param, "35ad3e80-1de4-4477-827e-0473320cf644"); + return result; } - @ApiOperation("根据sid查询") - @GetMapping("/fetchVoBySid/{sid}") - public ResultBean fetchVoBySid(@PathVariable String sid) { - ResultBean rb = ResultBean.fireFail(); - DemoBaseentity entity = demoBaseentityService.fetchBySid(sid); - DemoBaseentityVo vo = new DemoBaseentityVo(); - BeanUtil.copyProperties(entity, vo); - return rb.success().setData(vo); + @ApiOperation("删除设备") + @GetMapping("/removeDevice") + public String removeDevice(String consumerId) { + String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/update"; + Map param = new HashMap<>(); + param.put("deviceName", consumerId); // 设备名称 string + param.put("deviceSerial", consumerId); // 设备序列号 string + String result = HttpUtils.sendPostMap(url,param, "35ad3e80-1de4-4477-827e-0473320cf644"); + return result; } - @ApiOperation("删除") - @DeleteMapping("/deleteBySid/{sid}") - public ResultBean deleteBySid(@PathVariable String sid) { - ResultBean rb = ResultBean.fireFail(); - int i = demoBaseentityService.deleteBySid(sid); - return rb.success().setMsg("删除成功"); - } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java new file mode 100644 index 0000000..fed7a21 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java @@ -0,0 +1,38 @@ +package com.yxt.supervise.monitor.biz.controller; + +import com.alibaba.fastjson.JSONObject; +import com.yxt.common.core.result.ResultBean; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; + +@Api(tags = "设备控制器") +@RestController("com.yxt.supervise.monitor.biz.controller.YDeviceRest") +@RequestMapping("/device") +public class YDeviceRest { + + @Autowired + private YDeviceService yDeviceService; + + + @ApiOperation("分页获取设备列表") + @GetMapping("/getDevicePage") + public String getDevicePage(@RequestParam Map searchVo) { + yDeviceService.getDevicePage(searchVo); + return null; + } +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java new file mode 100644 index 0000000..4c16601 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.monitor.biz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.monitor.api.demoidentity.DemoIdentity; +import com.yxt.supervise.monitor.api.entity.Device; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface YDeviceMapper extends BaseMapper { + + + IPage getDevicePage(); +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java new file mode 100644 index 0000000..6a3bdff --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java @@ -0,0 +1,19 @@ +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.supervise.monitor.api.demoidentity.DemoIdentity; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.biz.demoidentity.DemoIdentityMapper; +import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper; +import com.yxt.supervise.monitor.biz.service.impl.IYDeviceServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public interface YDeviceService extends IService { + + IPage getDevicePage(Map searchVo); +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java new file mode 100644 index 0000000..d9a7fe9 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.monitor.biz.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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 org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; + +@Service +public class IYDeviceServiceImpl extends ServiceImpl implements YDeviceService { + + @Resource YDeviceMapper yDeviceMapper; + @Override + public IPage getDevicePage(Map searchVo){ + return yDeviceMapper.getDevicePage(); + } +} diff --git a/yxt-supervise-monitor-biz/src/main/resources/mapper/DemoIdentityMapper.xml b/yxt-supervise-monitor-biz/src/main/resources/mapper/DemoIdentityMapper.xml new file mode 100644 index 0000000..1120bf3 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/resources/mapper/DemoIdentityMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file