脚环读取

huimv-admin/src/main/java/com/huimv/guowei/admin/group/controller/GroupBatchController.java

@@ -54,7 +54,7 @@ public class GroupBatchController {
     @RequestMapping("/list")
     public Result list(@RequestBody Map<String, String> paramsMap) {
         return new Result(ResultCode.SUCCESS,batchService.list(new QueryWrapper<GroupBatch>().eq("farm_id",paramsMap.get("farmId"))
-                .orderByDesc("create_time")));
+                .orderByDesc("id")));
     }
 
     //大屏平养区健康评估

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

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.group.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,14 +57,13 @@ public class GroupBatchServiceImpl extends ServiceImpl<GroupBatchMapper, GroupBa
         Page<GroupBatch> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<GroupBatch> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum)
-                .orderByDesc("create_time");
+                .orderByDesc("id");
         return new Result(ResultCode.SUCCESS, batchMapper.selectPage(page, queryWrapper));
     }
 
     @Override
     public Result add(GroupBatch groupBatch) {
-        Integer count = batchMapper.selectCount(new QueryWrapper<GroupBatch>().eq("batch_num", groupBatch.getBatchNum())
-                .eq("farm_id", groupBatch.getFarmId()));
+        Integer count = batchMapper.selectCount(new QueryWrapper<GroupBatch>().eq("batch_num", groupBatch.getBatchNum()));
         if (count != 0) {
             return new Result(10001, "添加失败，批次号已存在", false);
         }
@@ -94,9 +94,13 @@ public class GroupBatchServiceImpl extends ServiceImpl<GroupBatchMapper, GroupBa
         String id = paramsMap.get("id");
         GroupBatch groupBatch = batchMapper.selectById(id);
         String duckId = groupBatch.getDuckId();
-        if (groupBatch.getDisable() == 0) {
+//        if (groupBatch.getDisable() == 0) {
+//            return new Result(10001,"删除失败，批次号未离场",false);
+//        }
+
+        if (ObjectUtil.isNotEmpty(groupBatch.getDuckId()) && groupBatch.getDisable() == 0 ) {
             return new Result(10001,"删除失败，批次号未离场",false);
-        } else {
+        }else {
             if (StringUtils.isNotBlank(duckId)) {
                 String[] split = duckId.split(",");
                 for (String muskId : split) {

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

@@ -94,6 +94,8 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
             queryWrapper.and(wrapper -> wrapper.like(StringUtils.isNotBlank(keyword), "device_code", keyword)
                     .or().like(StringUtils.isNotBlank(keyword), "batch_num", keyword));
         }
+
+        queryWrapper.orderByDesc("id");
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }
 

huimv-admin/src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ mybatis-plus:
 #  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml
 
 img:
-  url: https://img.ifarmcloud.com/images/
+  url: http://img.ifarmcloud.com/images/
   basePath: /home/huimv/img/
   ip: 139.9.167.178
   user:  huimv

huimv-admin/src/main/resources/application-prod.yml

@@ -22,7 +22,7 @@ mybatis-plus:
 #  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml
 
 img:
-  url: https://img.ifarmcloud.com/images/
+  url: http://img.ifarmcloud.com/images/
   basePath: /home/huimv/img/
   ip: 119.3.44.183
   user:  huimv