diff --git a/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/WlRecordFeignClient.java b/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/WlRecordFeignClient.java index 5fff977..b58111b 100644 --- a/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/WlRecordFeignClient.java +++ b/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/WlRecordFeignClient.java @@ -1,21 +1,21 @@ -package com.njcn.stat.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.mq.message.AppAutoDataMessage; -import com.njcn.stat.api.fallback.WlRecordClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @author xy - */ -@FeignClient(value = ServerInfo.CS_STAT_BOOT, path = "/record", fallbackFactory = WlRecordClientFallbackFactory.class,contextId = "record") -public interface WlRecordFeignClient { - - @PostMapping("/addOrUpdateBaseData") - HttpResult addOrUpdateBaseData(@RequestBody @Validated AppAutoDataMessage appAutoDataMessage); - -} +//package com.njcn.stat.api; +// +//import com.njcn.common.pojo.constant.ServerInfo; +//import com.njcn.common.pojo.response.HttpResult; +//import com.njcn.mq.message.AppAutoDataMessage; +//import com.njcn.stat.api.fallback.WlRecordClientFallbackFactory; +//import org.springframework.cloud.openfeign.FeignClient; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +// +///** +// * @author xy +// */ +//@FeignClient(value = ServerInfo.CS_STAT_BOOT, path = "/record", fallbackFactory = WlRecordClientFallbackFactory.class,contextId = "record") +//public interface WlRecordFeignClient { +// +// @PostMapping("/addOrUpdateBaseData") +// HttpResult addOrUpdateBaseData(@RequestBody @Validated AppAutoDataMessage appAutoDataMessage); +// +//} diff --git a/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/fallback/WlRecordClientFallbackFactory.java b/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/fallback/WlRecordClientFallbackFactory.java index c910b8f..60ae9bf 100644 --- a/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/fallback/WlRecordClientFallbackFactory.java +++ b/iot-analysis/analysis-stat/stat-api/src/main/java/com/njcn/stat/api/fallback/WlRecordClientFallbackFactory.java @@ -1,35 +1,35 @@ -package com.njcn.stat.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.mq.message.AppAutoDataMessage; -import com.njcn.stat.api.WlRecordFeignClient; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author xy - */ -@Slf4j -@Component -public class WlRecordClientFallbackFactory implements FallbackFactory { - @Override - public WlRecordFeignClient create(Throwable cause) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (cause.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) cause.getCause(); - } - Enum finalExceptionEnum = exceptionEnum; - return new WlRecordFeignClient() { - - @Override - public HttpResult addOrUpdateBaseData(AppAutoDataMessage appAutoDataMessage) { - log.error("{}异常,降级处理,异常为:{}","新增或更新装置基础数据",cause.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} +//package com.njcn.stat.api.fallback; +// +//import com.njcn.common.pojo.enums.response.CommonResponseEnum; +//import com.njcn.common.pojo.exception.BusinessException; +//import com.njcn.common.pojo.response.HttpResult; +//import com.njcn.mq.message.AppAutoDataMessage; +//import com.njcn.stat.api.WlRecordFeignClient; +//import feign.hystrix.FallbackFactory; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +// +///** +// * @author xy +// */ +//@Slf4j +//@Component +//public class WlRecordClientFallbackFactory implements FallbackFactory { +// @Override +// public WlRecordFeignClient create(Throwable cause) { +// //判断抛出异常是否为解码器抛出的业务异常 +// Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; +// if (cause.getCause() instanceof BusinessException) { +// BusinessException businessException = (BusinessException) cause.getCause(); +// } +// Enum finalExceptionEnum = exceptionEnum; +// return new WlRecordFeignClient() { +// +// @Override +// public HttpResult addOrUpdateBaseData(AppAutoDataMessage appAutoDataMessage) { +// log.error("{}异常,降级处理,异常为:{}","新增或更新装置基础数据",cause.toString()); +// throw new BusinessException(finalExceptionEnum); +// } +// }; +// } +//} diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/controller/WlRecordController.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/controller/WlRecordController.java index 662f8ce..e979405 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/controller/WlRecordController.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/controller/WlRecordController.java @@ -1,48 +1,48 @@ -package com.njcn.stat.controller; - -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.mq.message.AppAutoDataMessage; -import com.njcn.stat.service.IWlRecordService; -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.validation.annotation.Validated; -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; - -/** - * 类的介绍: - * - * @author xuyang - * @version 1.0.0 - * @createTime 2024/9/10 9:23 - */ -@Slf4j -@RestController -@RequestMapping("/record") -@Api(tags = "便携式基础数据录入") -@AllArgsConstructor -public class WlRecordController extends BaseController { - - private final IWlRecordService wlRecordService; - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/addOrUpdateBaseData") - @ApiOperation("新增或更新装置基础数据") - @ApiImplicitParam(name = "appAutoDataMessage", value = "数据实体", required = true) - public HttpResult addOrUpdateBaseData(@RequestBody @Validated AppAutoDataMessage appAutoDataMessage){ - String methodDescribe = getMethodDescribe("addOrUpdateBaseData"); - wlRecordService.addOrUpdateBaseData(appAutoDataMessage); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - -} +//package com.njcn.stat.controller; +// +//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.mq.message.AppAutoDataMessage; +//import com.njcn.stat.service.IWlRecordService; +//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.validation.annotation.Validated; +//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; +// +///** +// * 类的介绍: +// * +// * @author xuyang +// * @version 1.0.0 +// * @createTime 2024/9/10 9:23 +// */ +//@Slf4j +//@RestController +//@RequestMapping("/record") +//@Api(tags = "便携式基础数据录入") +//@AllArgsConstructor +//public class WlRecordController extends BaseController { +// +// private final IWlRecordService wlRecordService; +// +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @PostMapping("/addOrUpdateBaseData") +// @ApiOperation("新增或更新装置基础数据") +// @ApiImplicitParam(name = "appAutoDataMessage", value = "数据实体", required = true) +// public HttpResult addOrUpdateBaseData(@RequestBody @Validated AppAutoDataMessage appAutoDataMessage){ +// String methodDescribe = getMethodDescribe("addOrUpdateBaseData"); +// wlRecordService.addOrUpdateBaseData(appAutoDataMessage); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// } +// +//} diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/IWlRecordService.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/IWlRecordService.java index 7963840..955e025 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/IWlRecordService.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/IWlRecordService.java @@ -1,12 +1,12 @@ -package com.njcn.stat.service; - -import com.njcn.mq.message.AppAutoDataMessage; - -/** - * @author xy - */ -public interface IWlRecordService { - - void addOrUpdateBaseData(AppAutoDataMessage appAutoDataMessage); - -} +//package com.njcn.stat.service; +// +//import com.njcn.mq.message.AppAutoDataMessage; +// +///** +// * @author xy +// */ +//public interface IWlRecordService { +// +// void addOrUpdateBaseData(AppAutoDataMessage appAutoDataMessage); +// +//} 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 521c3e2..150e2f6 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 @@ -9,7 +9,6 @@ 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.stat.api.WlRecordFeignClient; import com.njcn.system.api.RocketMqLogFeignClient; import com.njcn.system.pojo.po.RocketmqMsgErrorLog; import lombok.extern.slf4j.Slf4j; @@ -46,8 +45,8 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler