Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志记录调整

Browse Source
This commit is contained in:
xuyang
2023-08-28 16:19:35 +08:00
parent ac0afada79
commit 1d378e0c03
12 changed files with 321 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDevModelController.java
View File

@@ -1,29 +1,24 @@
package com.njcn.access.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.access.pojo.param.DevModelParam;
import com.njcn.access.service.ICsDevModelService;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.api.CsGroupFeignClient;
import com.njcn.csdevice.enums.DeviceOperate;
import com.njcn.web.advice.DeviceLog;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* 类的介绍：
*
@@ -44,7 +39,6 @@ public class CsDevModelController extends BaseController {
@PostMapping("/addModel")
@ApiOperation("新增设备模板")
@Transactional(rollbackFor = {Exception.class})
@DeviceLog(operateType = DeviceOperate.ADD_MODEL)
public HttpResult<String> addModel(@RequestPart("file") @Validated MultipartFile file){
String methodDescribe = getMethodDescribe("addModel");
//1.录入通用字典

3
iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
View File

@@ -40,7 +40,6 @@ public class CsDeviceController extends BaseController {
@PostMapping("/register")
@ApiOperation("直连设备状态判断")
@ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
@DeviceLog(operateType = DeviceOperate.JUDGE_ONLINE)
@ReturnMsg
public HttpResult<String> devRegister(@RequestParam String nDid){
csDeviceService.devRegister(nDid);
@@ -51,7 +50,6 @@ public class CsDeviceController extends BaseController {
@PostMapping("/model")
@ApiOperation("获取直连设备模板信息")
@ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
@DeviceLog(operateType = DeviceOperate.MODEL)
@ReturnMsg
public HttpResult<Object> getModel(@RequestParam String nDid){
String methodDescribe = getMethodDescribe("getModel");
@@ -63,7 +61,6 @@ public class CsDeviceController extends BaseController {
@PostMapping("/access")
@ApiOperation("直连设备注册")
@ApiImplicitParam(name = "devAccessParam", value = "接入参数", required = true)
@DeviceLog(operateType = DeviceOperate.DEVICE_REGISTER)
public HttpResult<String> devAccess(@RequestBody @Validated DevAccessParam devAccessParam){
String methodDescribe = getMethodDescribe("getModel");
csDeviceService.devAccess(devAccessParam);