diff --git a/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java b/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java index ab77130..50426e2 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java @@ -14,7 +14,7 @@ public enum AccessResponseEnum { * A0301 ~ A0399 用于用户模块的枚举 *

*/ - NDID_NO_FIND("A0301", "nDid在平台端未找到或者已注册"), + NDID_NO_FIND("A0301", "此设备未录入或已注册!"), MISSING_CLIENT("A0302","设备客户端不在线!"), MODEL_REPEAT("A0302", "模板存在,请勿重复录入!"), diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java index dae5397..a76406a 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java @@ -1,6 +1,5 @@ package com.njcn.access.controller; -import com.njcn.access.enums.AccessEnum; import com.njcn.access.param.DevAccessParam; import com.njcn.access.service.ICsDeviceService; import com.njcn.common.pojo.annotation.OperateInfo; @@ -8,9 +7,9 @@ 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.EquipmentFeignClient; import com.njcn.csdevice.enums.DeviceOperate; import com.njcn.web.advice.DeviceLog; +import com.njcn.web.annotation.ReturnMsg; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -37,13 +36,12 @@ public class CsDeviceController extends BaseController { private final ICsDeviceService csDeviceService; - private final EquipmentFeignClient equipmentFeignClient; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/register") @ApiOperation("直连设备状态判断") @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true) @DeviceLog(operateType = DeviceOperate.JUDGE_ONLINE) + @ReturnMsg public HttpResult devRegister(@RequestParam String nDid){ csDeviceService.devRegister(nDid); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "设备MQTT通讯状态!"); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/controller/KafkaController.java b/iot-access/access-boot/src/main/java/com/njcn/access/controller/KafkaController.java deleted file mode 100644 index d3b7404..0000000 --- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/KafkaController.java +++ /dev/null @@ -1,54 +0,0 @@ -//package com.njcn.access.controller; -// -//import com.njcn.access.pojo.param.MessageParam; -//import com.njcn.web.controller.BaseController; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import io.swagger.annotations.ApiParam; -//import lombok.extern.slf4j.Slf4j; -//import org.apache.kafka.clients.consumer.ConsumerRecord; -//import org.springframework.kafka.annotation.KafkaListener; -//import org.springframework.kafka.core.KafkaTemplate; -//import org.springframework.stereotype.Component; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import javax.annotation.Resource; -//import javax.validation.Valid; -// -///** -// * 类的介绍： -// * -// * @author xuyang -// * @version 1.0.0 -// * @createTime 2023/4/18 13:53 -// */ -//@Slf4j -//@RestController -//@RequestMapping("/test") -//@Api(value = "TestController", tags = {"测试 API"}) -//public class KafkaController extends BaseController { -// -// @Resource -// private KafkaTemplate kafkaTemplate; -// -// @PostMapping("/kafka/sendMessage") -// @ApiOperation(value = "发送kafka告警消息") -// public void sendKafkaMessage(@Valid @ApiParam("参数") @RequestBody MessageParam param) { -// kafkaTemplate.send(param.getTopic(), param.getMessage()); -// } -// -// @Component -// public class KafkaConsumer { -// // 消费监听 -// @KafkaListener(topics = {"topic2"}) -// public void onMessage1(ConsumerRecord record){ -// // 消费的哪个topic、partition的消息,打印出消息内容 -// System.out.println("简单消费："+record.topic()+"-"+record.partition()+"-"+record.value()); -// } -// } -// -// -//} diff --git a/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java b/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java index d6a0c1a..8afc7fd 100644 --- a/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java +++ b/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java @@ -5,13 +5,13 @@ import com.njcn.middle.rocket.handler.EnhanceConsumerMessageHandler; import com.njcn.mq.constant.BusinessTopic; import com.njcn.mq.constant.MessageStatus; import com.njcn.mq.message.AppAutoDataMessage; +import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.pojo.enums.RedisKeyEnum; import com.njcn.redis.utils.RedisUtil; import com.njcn.stat.api.StatFeignClient; import com.njcn.system.api.RocketMqLogFeignClient; import com.njcn.system.pojo.po.RocketmqMsgErrorLog; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.stereotype.Service; @@ -75,9 +75,9 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler