Browse Source

设备统计数据

李进 2 years ago
parent
commit
c295300e0a

+ 10 - 0
device-api-cloud/src/main/java/com/xy/feign/DeviceDataFeign.java

@@ -0,0 +1,10 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceDataService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceDataFeign extends DeviceDataService {
+}

+ 2 - 3
device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -69,10 +68,10 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         return R.ok(toPageBean(DeviceDataDto.Vo.class, iPage));
     }
 
-    @PostMapping("saveOrAccum")
+    @Override
     @ApiOperation("添加/累加")
     @Lock(value = "saveOrAccum.deviceId", prefix = "data_save_accum_")
-    public R saveOrAccum(@RequestBody @Validated DeviceDataDto.SaveOrAccum saveOrAccum) {
+    public R saveOrAccum(DeviceDataDto.SaveOrAccum saveOrAccum) {
         LocalDateTime now = LocalDateTime.now();
         String stringTime = DataTime.toString(now, "yyyyMMdd");
         //获取字典

+ 12 - 0
device-api/src/main/java/com/xy/service/DeviceDataService.java

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceDataDto;
+import com.xy.utils.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +18,11 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("/device-data")
 public interface DeviceDataService {
 
+    /**
+     * 添加/累加
+     * @param saveOrAccum
+     * @return
+     */
+    @PostMapping("saveOrAccum")
+    R saveOrAccum(@RequestBody @Validated DeviceDataDto.SaveOrAccum saveOrAccum);
 }