Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx

license/doc/update.sql

@@ -15,6 +15,8 @@ CREATE TABLE `pms_use_log`
   AUTO_INCREMENT = 0
   DEFAULT CHARSET = utf8 COMMENT ='使用记录表';
 
+ALTER TABLE `device` MODIFY sn varchar (30) NULL COMMENT '授权SN';
+
 ALTER TABLE `device`
     ADD COLUMN `status` int(1) NULL DEFAULT NULL COMMENT '状态 0：未使用，1：已使用，2：失效' AFTER `app_id`;
 

license/src/main/java/iot/sixiang/license/controller/TerminalDeviceController.java

@@ -4,7 +4,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.ResResult;
-import iot.sixiang.license.model.dto.*;
+import iot.sixiang.license.model.dto.GetTerminalDeviceTokenDTO;
+import iot.sixiang.license.model.dto.PlatFormBindDTO;
+import iot.sixiang.license.model.dto.ReportErrorMsgDTO;
+import iot.sixiang.license.model.dto.TerminalDevieBindDTO;
+import iot.sixiang.license.model.dto.TerminalDevieUnBindDTO;
 import iot.sixiang.license.service.TerminalDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,23 +26,23 @@ public class TerminalDeviceController {
     @Autowired
     TerminalDeviceService terminalDeviceService;
 
-    // @GetMapping("/get_token")
-    // @ApiOperation(value = "终端设备获取token", notes = "终端设备获取token")
-    // public ResResult getToken(GetTerminalDeviceTokenDTO getTerminalDeviceTokenDTO) {
-    //     return terminalDeviceService.getToken(getTerminalDeviceTokenDTO);
-    // }
+    @GetMapping("/get_token")
+    @ApiOperation(value = "终端设备获取token", notes = "终端设备获取token")
+    public ResResult getToken(GetTerminalDeviceTokenDTO getTerminalDeviceTokenDTO) {
+        return terminalDeviceService.getToken(getTerminalDeviceTokenDTO);
+    }
 
-    // @PostMapping("/report_error_msg")
-    // @ApiOperation(value = "终端设备上报错误信息", notes = "终端设备上报错误信息")
-    // public BaseResult reportErrorMsg(@RequestBody List<ReportErrorMsgDTO> reportErrorMsgDTO) {
-    //     return terminalDeviceService.reportErrorMsg(reportErrorMsgDTO);
-    // }
+    @PostMapping("/report_error_msg")
+    @ApiOperation(value = "终端设备上报错误信息", notes = "终端设备上报错误信息")
+    public BaseResult reportErrorMsg(@RequestBody List<ReportErrorMsgDTO> reportErrorMsgDTO) {
+        return terminalDeviceService.reportErrorMsg(reportErrorMsgDTO);
+    }
 
-    // @PostMapping("/bind")
-    // @ApiOperation(value = "终端设备绑定接口", notes = "终端设备绑定接口")
-    // public BaseResult terminalDevieBind(@RequestBody TerminalDevieBindDTO terminalDevieBindDTO) {
-    //     return terminalDeviceService.terminalDeviceBind(terminalDevieBindDTO);
-    // }
+    @PostMapping("/bind")
+    @ApiOperation(value = "终端设备绑定接口", notes = "终端设备绑定接口")
+    public BaseResult terminalDevieBind(@RequestBody TerminalDevieBindDTO terminalDevieBindDTO) {
+        return terminalDeviceService.terminalDeviceBind(terminalDevieBindDTO);
+    }
 
     @PostMapping("/unbind")
     @ApiOperation(value = "终端设备解绑接口", notes = "终端设备解绑接口")
@@ -46,11 +50,11 @@ public class TerminalDeviceController {
         return terminalDeviceService.terminalDeviceunBind(terminalDevieUnBindDTO);
     }
 
-    // @GetMapping("/get_bind_status")
-    // @ApiOperation(value = "获取终端设备绑定状态接口", notes = "获取终端设备绑定状态接口")
-    // public ResResult getBindStatus(TerminalDevieUnBindDTO terminalDevieUnBindDTO) {
-    //     return terminalDeviceService.getBindStatus(terminalDevieUnBindDTO);
-    // }
+    @GetMapping("/get_bind_status")
+    @ApiOperation(value = "获取终端设备绑定状态接口", notes = "获取终端设备绑定状态接口")
+    public ResResult getBindStatus(TerminalDevieUnBindDTO terminalDevieUnBindDTO) {
+        return terminalDeviceService.getBindStatus(terminalDevieUnBindDTO);
+    }
 
     @PostMapping("/v2/bind")
     @ApiOperation(value = "平台绑定设备sn接口", notes = "平台绑定设备sn接口")