Merge remote-tracking branch 'origin/master'

device-api-cloud/src/main/java/com/xy/feign/DeviceTempRecordsFeign.java

@@ -0,0 +1,18 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceTempRecordsService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/3
+ */
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceTempRecordsFeign extends DeviceTempRecordsService {
+}

device-api-service/src/main/java/com/xy/service/DeviceTempRecordsServiceImpl.java

@@ -38,9 +38,9 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "设备温度日志表")
 public class DeviceTempRecordsServiceImpl extends ServiceImpl<DeviceTempRecordsMapper, DeviceTempRecords> implements DeviceTempRecordsService {
 
-    @PostMapping("page")
+    @Override
     @ApiOperation("分页查询")
-    private R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page) {
+    public R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page) {
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<DeviceTempRecords> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceTempRecords.class)
                 .ge(DeviceTempRecords::getCreateTime, page.getBeginCreateTime())

device-api/src/main/java/com/xy/service/DeviceTempRecordsService.java

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceTempRecordsDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -12,5 +17,6 @@ import com.xy.annotate.RestMappingController;
  */
 @RestMappingController("/device-temp-records")
 public interface DeviceTempRecordsService {
-
-}
+    @PostMapping("page")
+    R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page);
+}