更新密码

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/RawDataController.java

@@ -1,9 +1,12 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.service.IRawDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,7 +17,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-06-25
  */
 @RestController
-@RequestMapping("/raw-data")
+@RequestMapping("/rawData")
+@CrossOrigin
 public class RawDataController {
 
+    @Autowired
+    IRawDataService rawDataService;
+
+    @PostMapping("/listByDevicCode")
+    public Result listInfo(@RequestBody Map<String, String> paramsMap){
+        return rawDataService.listInfo(paramsMap);
+    }
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/RawData.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,7 +34,9 @@ public class RawData implements Serializable {
     private String deviceCode;
 
     private String data;
+    private String battery;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IRawDataService.java

@@ -1,8 +1,11 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.RawData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IRawDataService extends IService<RawData> {
 
+    Result listInfo(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/RawDataServiceImpl.java

@@ -1,11 +1,21 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.RawData;
 import com.huimv.guowei.admin.mapper.RawDataMapper;
 import com.huimv.guowei.admin.service.IRawDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +27,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class RawDataServiceImpl extends ServiceImpl<RawDataMapper, RawData> implements IRawDataService {
 
+    @Override
+    public Result listInfo(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate");
+        QueryWrapper<RawData> wrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(deviceCode)){
+            return new Result(10001,"称编码不能为空",false);
+        }
+        System.out.println("ss");
+        wrapper.eq("device_code",deviceCode);
+        if (StringUtils.isBlank(startDate)){
+            wrapper.ge("create_time", DateUtil.beginOfDay(new Date()));
+        }else {
+
+            wrapper.between("create_time", startDate,endDate);
+        }
+        wrapper.orderByDesc("id");
+        return new Result(ResultCode.SUCCESS, this.list(wrapper));
+    }
 }

input/src/main/java/com/huimv/input/entity/RawData.java

@@ -38,6 +38,8 @@ public class RawData implements Serializable {
 
     private Date createTime;
     private BigDecimal lastWeight;
+    private String battery;
+
 
 
 }