所以类添加查询接口

huimv-smart-management/src/main/java/com/huimv/management/controller/PeriodController.java

@@ -1,6 +1,7 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.Api;
@@ -83,4 +84,11 @@ public class PeriodController {
         return R.ok();
     }
 
+    @RequestMapping("/findAll")
+    public R findAll(){
+        List list = periodService.findAll();
+
+        return R.ok().put("all",list);
+    }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/PigstyController.java

@@ -79,9 +79,16 @@ public class PigstyController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		pigstyService.removeByIds(Arrays.asList(ids));
+//		pigstyService.removeByIds(Arrays.asList(ids));
+        Integer delete = pigstyService.delete(ids);
+        if (delete == 1){
+            pigstyService.removeByIds(Arrays.asList(ids));
+            return R.ok();
+        }else {
+            return R.error().put("msg","猪舍中有猪未处理");
+        }
+
 
-        return R.ok();
     }
 
     /**

huimv-smart-management/src/main/java/com/huimv/management/entity/PeriodEntity.java

@@ -37,16 +37,19 @@ public class PeriodEntity implements Serializable {
      */
     private Integer pastureId;
     /**
-     * 删除状态 0.正常 1.已删除
+     * 删除状态 0正常 1已删除
      */
+    @TableLogic
     private Boolean deleted;
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date gmtCreate;
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gmtModified;
 
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigBaseEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -66,6 +67,7 @@ public class YearPigBaseEntity implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
     /**

huimv-smart-management/src/main/java/com/huimv/management/service/PeriodService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.PeriodEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface PeriodService extends IService<PeriodEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll();
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/PigstyService.java

@@ -19,5 +19,7 @@ public interface PigstyService extends IService<PigstyEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     List findAll();
+
+    Integer delete(Integer[] ids);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PeriodServiceImpl.java

@@ -3,7 +3,11 @@ package com.huimv.management.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.entity.PeriodEntity;
+import com.huimv.management.entity.PeriodEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +23,9 @@ import com.huimv.management.service.PeriodService;
 @Service("periodService")
 public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> implements PeriodService {
 
+    @Autowired
+    private PeriodDao periodDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
@@ -42,4 +49,11 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
         return new PageUtils(page);
     }
 
+    @Override
+    public List findAll() {
+        LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
+        List<PeriodEntity> pastureEntities = periodDao.selectList(lambdaQuery);
+        return pastureEntities;
+    }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyServiceImpl.java

@@ -2,8 +2,10 @@ package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.dao.YearPigBaseDao;
 import com.huimv.management.entity.PigstyEntity;
 import com.huimv.management.entity.PigstyEntity;
+import com.huimv.management.entity.YearPigBaseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +28,9 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     @Autowired
     private PigstyDao pigstyDao;
 
+    @Autowired
+    private YearPigBaseDao pigBaseDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
@@ -56,6 +61,21 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
         return pastureEntities;
     }
 
+
+    @Override
+    public Integer delete(Integer[] ids) {
+        LambdaQueryWrapper<YearPigBaseEntity> lambdaQuery = Wrappers.lambdaQuery();
+        for (Integer id : ids) {
+            lambdaQuery.eq(YearPigBaseEntity::getPigstyId,id);
+            List<YearPigBaseEntity> yearPigBaseEntities = pigBaseDao.selectList(lambdaQuery);
+            if (yearPigBaseEntities != null && yearPigBaseEntities.size() >0){
+                return 2;
+            }
+        }
+
+       return 1;
+    }
+
    /* @Override
     public PageUtils queryPage(Map<String, Object> params) {