所有类添加查询接口

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

@@ -59,9 +59,12 @@ public class PastureController {
      */
     @RequestMapping("/save")
     public R save(@RequestBody PastureEntity pasture){
-		pastureService.save(pasture);
-
-        return R.ok();
+        Boolean isExist = pastureService.findByName(pasture);
+        if (isExist){
+            pastureService.save(pasture);
+            return R.ok();
+        }
+        return R.error().put("msg","牧场名称名称重复");
     }
 
     /**
@@ -79,9 +82,16 @@ public class PastureController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		pastureService.removeByIds(Arrays.asList(ids));
+//		pigstyService.removeByIds(Arrays.asList(ids));
+        Integer delete = pastureService.delete(ids);
+        if (delete == 1){
+            pastureService.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/AnimalHeatEntity.java

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 体温信息表
  *

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 采食频次表
  *

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 养殖员信息表
  *

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 室内环境信息表
  *
@@ -21,7 +20,7 @@ public class IndoorEnvironmentEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     *
+     * id
      */
     @TableId
     private Integer id;
@@ -30,6 +29,11 @@ public class IndoorEnvironmentEntity implements Serializable {
      */
     private Integer pigstyId;
     /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date date;
+    /**
      * 温度
      */
     private Double temperature;
@@ -42,11 +46,6 @@ public class IndoorEnvironmentEntity implements Serializable {
      */
     private String gas;
     /**
-     * 日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date date;
-    /**
      * 采集时间
      */
     private Date collectTime;

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

@@ -1,12 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 室外环境信息表
  *
@@ -20,15 +20,28 @@ public class OutdoorEnvironmentEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     *
+     * id
      */
     @TableId
     private Integer id;
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date date;
     /**
+     * 温度
+     */
+    private Double temperature;
+    /**
+     * 湿度
+     */
+    private Double humidity;
+    /**
+     * 气体
+     */
+    private String gas;
+    /**
      * 采集时间
      */
     private Date collectTime;

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 牧场表
  * 

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

@@ -1,12 +1,12 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 栏期信息表
  *
@@ -37,19 +37,16 @@ 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/PigstyEntity.java

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 猪舍表
  *
@@ -35,7 +34,7 @@ public class PigstyEntity implements Serializable {
     /**
      * 养殖员名称
      */
-    private Integer feederId;
+    private String feederId;
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 猪舍和猪关联表
  *
@@ -27,7 +26,7 @@ public class PigstyPigEntity implements Serializable {
     /**
      * 猪舍id
      */
-    private Integer pigsty;
+    private Integer pigstyId;
     /**
      * 栏位
      */

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 睡眠状态表
  *
@@ -37,7 +36,7 @@ public class SleepStatusEntity implements Serializable {
     /**
      * 睡眠时长
      */
-    private String sleepCount;
+    private Double sleepCount;
     /**
      * 采集时间
      */

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 运动频次表
  *
@@ -33,7 +32,7 @@ public class SportTimeEntity implements Serializable {
     /**
      * 运动量
      */
-    private String sportCount;
+    private Integer sportCount;
     /**
      * 采集时间
      */

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

@@ -1,11 +1,10 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
 
 /**
  * @author yinhao

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 单元信息表
  *

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

@@ -1,13 +1,12 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 饮用水指标
  *

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

@@ -1,13 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
 /**
  * 年猪基本
  *
@@ -21,7 +19,7 @@ public class YearPigBaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     *
+     * id
      */
     @TableId
     private Integer id;
@@ -67,10 +65,14 @@ public class YearPigBaseEntity implements Serializable {
     /**
      * 出生日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
     /**
+     * 产地
+     */
+    private String originPlace;
+
+    /**
      * 豬舍id
      */
     private Integer pigstyId;
@@ -79,6 +81,22 @@ public class YearPigBaseEntity implements Serializable {
      * 栏期id
      */
     private Integer periodId;
+
+    /**
+     * 出栏状态
+     */
+    private Integer outFenceStatus;
+
+    /**
+     * 母亲耳标
+     */
+    private String motherEartag;
+
+    /**
+     * 父亲耳标
+     */
+    private String fatherEartag;
+
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 年猪历史体重
  *

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 年猪历史照片
  *

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

@@ -1,12 +1,11 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 /**
  * 年猪谱系
  *

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

@@ -19,5 +19,9 @@ public interface PastureService extends IService<PastureEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     List findAll();
+
+    Integer delete(Integer[] ids);
+
+    Boolean findByName(PastureEntity pasture);
 }
 

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

@@ -2,7 +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.PigstyDao;
 import com.huimv.management.dao.UnitDao;
+import com.huimv.management.dao.YearPigBaseDao;
+import com.huimv.management.entity.*;
 import com.huimv.management.entity.PastureEntity;
 import com.huimv.management.entity.PastureEntity;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,9 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
     @Autowired
     private PastureDao pastureDao;
 
+    @Autowired
+    private PigstyDao pigstyDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
@@ -56,6 +62,32 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
         List<PastureEntity> pastureEntities = pastureDao.selectList(lambdaQuery);
         return pastureEntities;
     }
+
+    @Override
+    public Integer delete(Integer[] ids) {
+        LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
+        for (Integer id : ids) {
+            lambdaQuery.eq(PigstyEntity::getPastureId,id);
+            List<PigstyEntity> yearPigBaseEntities = pigstyDao.selectList(lambdaQuery);
+            if (yearPigBaseEntities != null && yearPigBaseEntities.size() >0){
+                return 2;
+            }
+        }
+
+        return 1;
+    }
+
+    @Override
+    public Boolean findByName(PastureEntity pasture) {
+        LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PastureEntity::getName,pasture.getName());
+        PastureEntity pastureEntity = pastureDao.selectOne(lambdaQuery);
+        if (pastureEntity == null){
+            return true;
+        }
+        return false;
+
+    }
     
    /* @Override
     public PageUtils queryPage(Map<String, Object> params) {

huimv-smart-management/src/main/resources/application-dev.yml

@@ -25,9 +25,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.54:3306/huimv_smart_mgt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.7:3306/huimv_smart_apiservice?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
       username: root
-      password: root
+      password: hm123456
       # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时
       initial-size: 10
       # 最大连接池连接数量，最大活跃连接数