移动电子秤修改

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,27 +37,33 @@ public class TaskController {
         SendData sendData = new SendData();
         sendData.start();
         Thread.sleep(3500);
-        QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", paramsMap.get("farmId")).eq("call_code", paramsMap.get("callCode"))
-                .orderByDesc("call_date").last("limit 1");
-        EnvMoveCall one = callService.getOne(queryWrapper);
-        if (ObjectUtil.isEmpty(one)) {
-            return new Result(10001, "请开启电子秤！", false);
-        }
-        QueryWrapper<EnvMoveCall> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", paramsMap.get("farmId")).eq("call_code", paramsMap.get("callCode"));
-        List<EnvMoveCall> list = callService.list(queryWrapper1);
-        for (EnvMoveCall envMoveCall : list) {
-            if (("").equals(envMoveCall.getDuckNum())|| null==envMoveCall.getDuckNum() ) {
-                callService.removeById(envMoveCall);
+        String callCode = paramsMap.get("callCode");
+        if (callCode.equals("865328066116350")) {
+            QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", 1)
+                    .orderByDesc("id").last(" limit 1");
+            EnvMoveCall one = callService.getOne(queryWrapper);
+            if (ObjectUtil.isEmpty(one)) {
+                return new Result(10001, "称已失去连接，请重启电子秤！", false);
             }
-        }
-        if ("".equals(one.getDuckWeight()) || null == one.getDuckWeight()) {
-            return new Result(10001, "称已失去连接，请重启电子秤！", false);
+            BigDecimal weight = one.getDuckWeight();
+            callService.remove(new QueryWrapper<EnvMoveCall>().eq("farm_id",paramsMap.get("farmId")).in("duck_num",1,2));
+            return new Result(ResultCode.SUCCESS, weight);
+        } else {
+            QueryWrapper<EnvMoveCall> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", 2)
+                    .orderByDesc("id").last(" limit 1");
+            EnvMoveCall one1 = callService.getOne(queryWrapper1);
+            if (ObjectUtil.isEmpty(one1)) {
+                return new Result(10001, "称已失去连接，请重启电子秤！", false);
+            }
+            BigDecimal weight = one1.getDuckWeight();
+            callService.remove(new QueryWrapper<EnvMoveCall>().eq("farm_id",paramsMap.get("farmId")).in("duck_num",1,2));
+            return new Result(ResultCode.SUCCESS, weight);
         }
 
-        return new Result(ResultCode.SUCCESS, one.getDuckWeight());
     }
+
     @PostMapping("/update")
     public Result update(@RequestBody EnvDeviceEquipment envDeviceEquipment) {
     /*    try {

huimv-admin/src/main/java/com/huimv/guowei/admin/mqtt/moveScale/DataBack.java

@@ -57,6 +57,7 @@ public class DataBack implements MqttCallback {
             envMoveCall.setCallCode(s1);
             envMoveCall.setCallName("移动电子秤1");
             envMoveCall.setDuckWeight(bg);
+            envMoveCall.setDuckNum("1");
             envMoveCall.setFarmId(21);
             iEnvMoveCallService.save(envMoveCall);
             System.out.println(bg);
@@ -73,6 +74,7 @@ public class DataBack implements MqttCallback {
             envMoveCall.setCallCode(s1);
             envMoveCall.setCallName("移动电子秤2");
             envMoveCall.setDuckWeight(bg);
+            envMoveCall.setDuckNum("2");
             envMoveCall.setFarmId(21);
             iEnvMoveCallService.save(envMoveCall);
             System.out.println(bg);