称重秤修改

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

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -57,6 +59,17 @@ public class EnvMoveCallController {
             QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", envMoveCall.getFarmId()).eq("duck_num", envMoveCall.getDuckNum());
             BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);
+
+            Date callDate = envMoveCall.getCallDate();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String month = sdf.format(callDate);
+            Date date = new Date();
+            SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm:ss");
+            String time = sdf1.format(date);
+            String endDate = month + " " + time;
+            SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            envMoveCall.setCallDate(sdf2.parse(endDate));
             envMoveCall.setDayage(duckInfo.getDayAge());
             envMoveCall.setDuckId(duckInfo.getId());
             moveCallService.save(envMoveCall);
@@ -92,4 +105,11 @@ public class EnvMoveCallController {
         String id = paramsMap.get("id");
         return new Result(ResultCode.SUCCESS,moveCallService.getById(id));
     }
+
+    public static void main(String[] args) {
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+        System.out.println(sdf.format(date));
+
+    }
 }

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

@@ -97,7 +97,7 @@ public class EnvMoveCallServiceImpl extends ServiceImpl<EnvMoveCallMapper, EnvMo
         String farmId = paramsMap.get("farmId");
         String unitName = paramsMap.get("unitName");
         QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId)
+        queryWrapper.eq("farm_id", farmId).ne("duck_num",1)
                 .like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
                 .orderByDesc("call_date").last(" limit 10");
         return new Result(ResultCode.SUCCESS, moveCallMapper.selectList(queryWrapper));

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

@@ -212,13 +212,22 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         String farmId = paramsMap.get("farmId");
         String duckNum = paramsMap.get("duckNum");
         String date = paramsMap.get("date");
-        date = date + " 00:00:00";
-        String date1 = date + " 23:59:59";
+        String date1 = date + " 00:00:00";
+
+        String date2 = date + " 23:59:59";
+
+        QueryWrapper<BaseDuckInfo> infoQueryWrapper = new QueryWrapper<>();
+        infoQueryWrapper.eq("farm_id", farmId).eq("duck_num", duckNum);
+        BaseDuckInfo duckInfo = infoMapper.selectOne(infoQueryWrapper);
+        if (duckInfo.getDuckSex() == 0) {
+            return new Result(10001, "雄鸭没有产蛋数量！", false);
+        }
 
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("duck_num", duckNum);
         queryWrapper.select(" IFNULL(SUM(egg_num),0) eggNum");
-        queryWrapper.between("call_date", date, date1);
+        queryWrapper.between("call_date", date1, date2);
+        EnvRegularCallEgg egg = eggMapper.selectOne(queryWrapper);
         return new Result(ResultCode.SUCCESS, eggMapper.selectOne(queryWrapper));
     }