添加所有

huimv-ql-farm/huimv-ql-environment/pom.xml

@@ -28,6 +28,15 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.5.9</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-starter-log4j2</artifactId>-->

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/HuimvEnvironmentApplication.java

@@ -3,7 +3,10 @@ package com.huimv.environment;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+//自动格式化返回时间
+@EnableJpaAuditing
 // 单数据源
 @SpringBootApplication
 // 多数据源

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/EnvironmentControlController.java

@@ -15,7 +15,8 @@ import org.springframework.web.bind.annotation.*;
  * @Create : 2020-12-25
  **/
 @RestController
-@RequestMapping(value = "/environmentControl",method = RequestMethod.GET)
+@RequestMapping(value = "/environmentControl")
+@CrossOrigin
 public class EnvironmentControlController {
     @Autowired
     private IEnvironmentControlService envControlService;
@@ -29,4 +30,18 @@ public class EnvironmentControlController {
     public Result getLastEnvData(@RequestParam(value = "lqId") Integer lqId){
         return envControlService.getLastEnvData(lqId);
     }
+
+    @RequestMapping(value = "/getAllFarm")
+    public Result getAllFarm(){
+        return envControlService.getAllFarm();
+    }
+
+
+    @RequestMapping(value = "/getAllBylqid")
+    public Result getAllBylaid(String lqid){
+        return envControlService.getAllBylqid(lqid);
+    }
+
+
+
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/FarmSm.java

@@ -0,0 +1,24 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "farm_sm")
+public class FarmSm implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "name")
+	private String name;
+
+	@Column(name = "LQID")
+	private String lqid;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/IndexEnvEntity.java

@@ -1,12 +1,18 @@
 package com.huimv.environment.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
 @Entity
 @Table(name = "index_env")
+@Data
 public class IndexEnvEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,75 +29,13 @@ public class IndexEnvEntity implements Serializable {
     private String data;
 
     @Column(name = "create_time", nullable = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
     @Column(name = "update_time", nullable = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
 
-    public IndexEnvEntity() {
-    }
-    public IndexEnvEntity(Integer id, String name, String data, Date createTime, Date updateTime) {
-        this.id = id;
-        this.name = name;
-        this.data = data;
-        this.createTime = createTime;
-        this.updateTime = updateTime;
-    }
-
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 
-    @Override
-    public String toString() {
-        return "IndexEnvEntity{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", data='" + data + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                '}';
-    }
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkAq.java

@@ -0,0 +1,33 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "sj_hk_aq")
+public class SjHkAq implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "ID")
+	private Double id;
+
+	@Column(name = "LQID")
+	private String lqid;
+
+	@Column(name = "CGQID")
+	private String cgqid;
+
+	@Column(name = "DQAQ")
+	private Double dqaq;
+
+	@Column(name = "CJSJ")
+	private java.util.Date cjsj;
+
+	@Column(name = "SCSJ")
+	private java.util.Date scsj;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkAqEntity.java

@@ -1,93 +0,0 @@
-package com.huimv.environment.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name = "sj_hk_aq")
-public class SjHkAqEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "ID", nullable = false)
-    private Double ID;
-
-    @Column(name = "LQID")
-    private Double LQID;
-
-    @Column(name = "CGQID")
-    private String CGQID;
-
-    @Column(name = "DQAQ")
-    private BigDecimal DQAQ;
-
-    @Column(name = "CJSJ", nullable = false)
-    private Timestamp CJSJ;
-
-    @Column(name = "SCSJ", nullable = false)
-    private Timestamp SCSJ;
-
-    public void setID(Double ID) {
-        this.ID = ID;
-    }
-
-    public Double getID() {
-        return ID;
-    }
-
-    public void setLQID(Double LQID) {
-        this.LQID = LQID;
-    }
-
-    public Double getLQID() {
-        return LQID;
-    }
-
-    public void setCGQID(String CGQID) {
-        this.CGQID = CGQID;
-    }
-
-    public String getCGQID() {
-        return CGQID;
-    }
-
-    public void setDQAQ(BigDecimal DQAQ) {
-        this.DQAQ = DQAQ;
-    }
-
-    public BigDecimal getDQAQ() {
-        return DQAQ;
-    }
-
-    public void setCJSJ(Timestamp CJSJ) {
-        this.CJSJ = CJSJ;
-    }
-
-    public Timestamp getCJSJ() {
-        return CJSJ;
-    }
-
-    public void setSCSJ(Timestamp SCSJ) {
-        this.SCSJ = SCSJ;
-    }
-
-    public Timestamp getSCSJ() {
-        return SCSJ;
-    }
-
-    @Override
-    public String toString() {
-        return "SjHkAqEntity{" +
-                "ID=" + ID + '\'' +
-                "LQID=" + LQID + '\'' +
-                "CGQID=" + CGQID + '\'' +
-                "DQAQ=" + DQAQ + '\'' +
-                "CJSJ=" + CJSJ + '\'' +
-                "SCSJ=" + SCSJ + '\'' +
-                '}';
-    }
-}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkSd.java

@@ -0,0 +1,33 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "sj_hk_sd")
+public class SjHkSd implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "ID")
+	private Double id;
+
+	@Column(name = "LQID")
+	private String lqid;
+
+	@Column(name = "CGQID")
+	private String cgqid;
+
+	@Column(name = "DQSD")
+	private Double dqsd;
+
+	@Column(name = "CJSJ")
+	private java.util.Date cjsj;
+
+	@Column(name = "SCSJ")
+	private java.util.Date scsj;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkSdEntity.java

@@ -1,93 +0,0 @@
-package com.huimv.environment.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name = "sj_hk_sd")
-public class SjHkSdEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "ID", nullable = false)
-    private Double ID;
-
-    @Column(name = "LQID")
-    private Double LQID;
-
-    @Column(name = "CGQID")
-    private String CGQID;
-
-    @Column(name = "DQSD")
-    private BigDecimal DQSD;
-
-    @Column(name = "CJSJ", nullable = false)
-    private Timestamp CJSJ;
-
-    @Column(name = "SCSJ", nullable = false)
-    private Timestamp SCSJ;
-
-    public void setID(Double ID) {
-        this.ID = ID;
-    }
-
-    public Double getID() {
-        return ID;
-    }
-
-    public void setLQID(Double LQID) {
-        this.LQID = LQID;
-    }
-
-    public Double getLQID() {
-        return LQID;
-    }
-
-    public void setCGQID(String CGQID) {
-        this.CGQID = CGQID;
-    }
-
-    public String getCGQID() {
-        return CGQID;
-    }
-
-    public void setDQSD(BigDecimal DQSD) {
-        this.DQSD = DQSD;
-    }
-
-    public BigDecimal getDQSD() {
-        return DQSD;
-    }
-
-    public void setCJSJ(Timestamp CJSJ) {
-        this.CJSJ = CJSJ;
-    }
-
-    public Timestamp getCJSJ() {
-        return CJSJ;
-    }
-
-    public void setSCSJ(Timestamp SCSJ) {
-        this.SCSJ = SCSJ;
-    }
-
-    public Timestamp getSCSJ() {
-        return SCSJ;
-    }
-
-    @Override
-    public String toString() {
-        return "SjHkSdEntity{" +
-                "ID=" + ID + '\'' +
-                "LQID=" + LQID + '\'' +
-                "CGQID=" + CGQID + '\'' +
-                "DQSD=" + DQSD + '\'' +
-                "CJSJ=" + CJSJ + '\'' +
-                "SCSJ=" + SCSJ + '\'' +
-                '}';
-    }
-}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkWd.java

@@ -0,0 +1,33 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "sj_hk_wd")
+public class SjHkWd implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "ID")
+	private Double id;
+
+	@Column(name = "LQID")
+	private String lqid;
+
+	@Column(name = "CGQID")
+	private String cgqid;
+
+	@Column(name = "DQWD")
+	private Double dqwd;
+
+	@Column(name = "CJSJ")
+	private java.util.Date cjsj;
+
+	@Column(name = "SCSJ")
+	private java.util.Date scsj;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkWdEntity.java

@@ -1,93 +0,0 @@
-package com.huimv.environment.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name = "sj_hk_wd")
-public class SjHkWdEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "ID", nullable = false)
-    private Double ID;
-
-    @Column(name = "LQID")
-    private Double LQID;
-
-    @Column(name = "CGQID")
-    private String CGQID;
-
-    @Column(name = "DQWD")
-    private BigDecimal DQWD;
-
-    @Column(name = "CJSJ", nullable = false)
-    private Timestamp CJSJ;
-
-    @Column(name = "SCSJ", nullable = false)
-    private Timestamp SCSJ;
-
-    public void setID(Double ID) {
-        this.ID = ID;
-    }
-
-    public Double getID() {
-        return ID;
-    }
-
-    public void setLQID(Double LQID) {
-        this.LQID = LQID;
-    }
-
-    public Double getLQID() {
-        return LQID;
-    }
-
-    public void setCGQID(String CGQID) {
-        this.CGQID = CGQID;
-    }
-
-    public String getCGQID() {
-        return CGQID;
-    }
-
-    public void setDQWD(BigDecimal DQWD) {
-        this.DQWD = DQWD;
-    }
-
-    public BigDecimal getDQWD() {
-        return DQWD;
-    }
-
-    public void setCJSJ(Timestamp CJSJ) {
-        this.CJSJ = CJSJ;
-    }
-
-    public Timestamp getCJSJ() {
-        return CJSJ;
-    }
-
-    public void setSCSJ(Timestamp SCSJ) {
-        this.SCSJ = SCSJ;
-    }
-
-    public Timestamp getSCSJ() {
-        return SCSJ;
-    }
-
-    @Override
-    public String toString() {
-        return "SjHkWdEntity{" +
-                "ID=" + ID + '\'' +
-                "LQID=" + LQID + '\'' +
-                "CGQID=" + CGQID + '\'' +
-                "DQWD=" + DQWD + '\'' +
-                "CJSJ=" + CJSJ + '\'' +
-                "SCSJ=" + SCSJ + '\'' +
-                '}';
-    }
-}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/FarmSmRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.FarmSm;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface FarmSmRepository extends JpaRepository<FarmSm, Integer>,JpaSpecificationExecutor<FarmSm>{}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkAqRepo.java

@@ -1,24 +1,27 @@
 package com.huimv.environment.repo;
 
-import com.huimv.environment.entity.SjHkAqEntity;
+import com.huimv.environment.entity.SjHkAq;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
-public interface SjHkAqRepo extends JpaRepository<SjHkAqEntity, Void>, JpaSpecificationExecutor<SjHkAqEntity> {
+public interface SjHkAqRepo extends JpaRepository<SjHkAq, Void>, JpaSpecificationExecutor<SjHkAq> {
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE id IN(SELECT MAX(id) FROM sj_hk_aq WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 GROUP BY lqid)")
-    List<SjHkAqEntity> getLastAq(List<Integer> lqids, String todayDate);
+    List<SjHkAq> getLastAq(List<Integer> lqids, String todayDate);
 
     //    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND function(\"date_format\",CJSJ,\"%Y-%m-%d\")=?2 ORDER BY cjsj DESC LIMIT 0,1)")
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND date_format(CJSJ,'%Y-%m-%d')= DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
-    SjHkAqEntity getLastAq(Integer lqid,String todayDate);
+    SjHkAq getLastAq(Integer lqid,String todayDate);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
-    List<SjHkAqEntity> getAmmoniaOnToday(Integer lqid, String beforeDateTime);
+    List<SjHkAq> getAmmoniaOnToday(Integer lqid, String beforeDateTime);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 10")
-    List<SjHkAqEntity> getAmmonia(Integer lqid, String beforeDateTime);
+    List<SjHkAq> getAmmonia(Integer lqid, String beforeDateTime);
+
+    List<SjHkAq> findAllByLqidAndScsjBetween(String LQID, Date startTime, Date endTime);
 
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkSdRepo.java

@@ -1,22 +1,25 @@
 package com.huimv.environment.repo;
 
-import com.huimv.environment.entity.SjHkSdEntity;
+import com.huimv.environment.entity.SjHkSd;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
-public interface SjHkSdRepo extends JpaRepository<SjHkSdEntity, Void>, JpaSpecificationExecutor<SjHkSdEntity> {
+public interface SjHkSdRepo extends JpaRepository<SjHkSd, Void>, JpaSpecificationExecutor<SjHkSd> {
     @Query(nativeQuery = true , value = "SELECT ID,LQID,CGQID,DQSD,CJSJ,SCSJ FROM sj_hk_sd WHERE id IN( SELECT MAX(id) FROM sj_hk_sd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
-    List<SjHkSdEntity> getLastSd(List lqidList, String date);
+    List<SjHkSd> getLastSd(List lqidList, String date);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,CJSJ,SCSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
-    SjHkSdEntity getLastSd(Integer lqid, String todayDate);
+    SjHkSd getLastSd(Integer lqid, String todayDate);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
-    List<SjHkSdEntity> getHumidityOnToday(Integer lqid, String beforeDateTime);
+    List<SjHkSd> getHumidityOnToday(Integer lqid, String beforeDateTime);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 ORDER BY cjsj DESC limit 10")
-    List<SjHkSdEntity> getHumidity(Integer lqid, String beforeDateTime);
+    List<SjHkSd> getHumidity(Integer lqid, String beforeDateTime);
+
+    List<SjHkSd> findAllByLqidAndScsjBetween(String LQID, Date startTime, Date endTime);
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkWdRepo.java

@@ -1,24 +1,25 @@
 package com.huimv.environment.repo;
 
-import com.huimv.environment.entity.SjHkWdEntity;
+import com.huimv.environment.entity.SjHkWd;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
-public interface SjHkWdRepo extends JpaRepository<SjHkWdEntity, Void>, JpaSpecificationExecutor<SjHkWdEntity> {
+public interface SjHkWdRepo extends JpaRepository<SjHkWd, Void>, JpaSpecificationExecutor<SjHkWd> {
     @Query(nativeQuery = true , value = "SELECT id,lqid,cgqid,dqwd,cjsj,scsj FROM sj_hk_wd WHERE id IN(SELECT MAX(id) FROM sj_hk_wd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
-    List<SjHkWdEntity> getLastWd(List lqidList, String date);
+    List<SjHkWd> getLastWd(List lqidList, String date);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,CJSJ,SCSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
-    SjHkWdEntity getLastWd(Integer lqid, String todayDate);
+    SjHkWd getLastWd(Integer lqid, String todayDate);
 
     /**
      * @Method      : getTemperatureOnToday
      * @Description : 获取今天的温度
      * @Params      : [lqid, todayDate]
-     * @Return      : com.huimv.env.dao.entity.SjHkWdEntity
+     * @Return      : com.huimv.env.dao.entity.SjHkWd
      *
      * @Author      : ZhuoNing
      * @Date        : 2020/12/29
@@ -26,8 +27,10 @@ public interface SjHkWdRepo extends JpaRepository<SjHkWdEntity, Void>, JpaSpecif
      */
 //    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC ")
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
-    List<SjHkWdEntity> getTemperatureOnToday(Integer lqid, String todayDate);
+    List<SjHkWd> getTemperatureOnToday(Integer lqid, String todayDate);
 
     @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 30")
-    List<SjHkWdEntity> getTemperature(Integer lqid, String beforeDateTime);
+    List<SjHkWd> getTemperature(Integer lqid, String beforeDateTime);
+
+    List<SjHkWd> findAllByLqidAndScsjBetween(String LQID, Date startTime, Date endTime);
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/IEnvironmentControlService.java

@@ -7,4 +7,9 @@ public interface IEnvironmentControlService {
     Result getPigpenByFarm(Integer farmId);
 
     Result getLastEnvData(Integer lqId);
+
+    Result getAllFarm();
+
+
+    Result getAllBylqid(String lqid);
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/EnvironmentControlServiceImpl.java

@@ -12,9 +12,8 @@ import com.huimv.environment.service.IEnvironmentControlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.text.ParseException;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -36,6 +35,8 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
     private SjHkSdRepo sdRepo;
     @Autowired
     private SjHkWdRepo wdRepo;
+    @Autowired
+    private FarmSmRepository farmSmRepository;
 
     @Override
     public Result getPigpenByFarm(Integer farmId) {
@@ -89,27 +90,198 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
         JSONObject envJo = new JSONObject();
         envJo.put("lqid",lqid);
         //--读取最新氨气
-        SjHkAqEntity aqEntity = aqRepo.getLastAq(lqid, todayDate);
+        SjHkAq aqEntity = aqRepo.getLastAq(lqid, todayDate);
         System.out.println("aqEntity>>" + aqEntity);
         if (aqEntity != null) {
-            envJo.put("ammonia", aqEntity.getDQAQ());
+            envJo.put("ammonia", aqEntity.getDqaq());
         } else {
             envJo.put("ammonia", "");
         }
         //--读取最新湿度
-        SjHkSdEntity sdEntity = sdRepo.getLastSd(lqid, todayDate);
+        SjHkSd sdEntity = sdRepo.getLastSd(lqid, todayDate);
         if (sdEntity != null) {
-            envJo.put("humidity", sdEntity.getDQSD());
+            envJo.put("humidity", sdEntity.getDqsd());
         } else {
             envJo.put("humidity", "");
         }
         //--读取最新温度
-        SjHkWdEntity wdEntity = wdRepo.getLastWd(lqid, todayDate);
+        SjHkWd wdEntity = wdRepo.getLastWd(lqid, todayDate);
         if (wdEntity != null) {
-            envJo.put("temp", wdEntity.getDQWD());
+            envJo.put("temp", wdEntity.getDqwd());
         } else {
             envJo.put("temp", "");
         }
         return new Result(ResultCode.SUCCESS, envJo);
     }
+
+//    @Override
+//    public Result getAllFarm() {
+//
+//
+//        List<FarmSm> all = farmSmRepository.findAll();
+//
+//        String dateStr = "2021-03-14 00:00:00";
+//        Date date = null;
+//        try {
+//             date = DateUtil.parseDateTime(dateStr);
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//
+//       List endList = new ArrayList();
+//
+//        for (FarmSm farmSm : all) {
+//            Map endMap = new HashMap();
+//            endMap.put("name",farmSm.getName());
+//
+//            String lqid = farmSm.getLqid();
+//            endMap.put("lqid",farmSm.getLqid());
+//
+//
+//
+//            List<SjHkAq> allByLqidAndScsjBetween = aqRepo.findAllByLqidAndScsjBetween(lqid, date, new Date());
+//
+//            List aqList = new ArrayList();
+//            for (SjHkAq sjHkAq : allByLqidAndScsjBetween) {
+//                Map map1 = new HashMap();
+//                map1.put("time",(sjHkAq.getScsj()+"").substring(11,19));
+//                map1.put("data",sjHkAq.getDqaq());
+//                aqList.add(map1);
+//            }
+//
+//            endMap.put("aq",aqList);
+//
+//            List<SjHkSd> allByLqidAndScsjBetween1 = sdRepo.findAllByLqidAndScsjBetween(lqid, date, new Date());
+//            List sdList = new ArrayList();
+//            for (SjHkSd sjHkAq : allByLqidAndScsjBetween1) {
+//                Map map1 = new HashMap();
+//                map1.put("time",(sjHkAq.getScsj()+"").substring(11,19));
+//                map1.put("data",sjHkAq.getDqsd());
+//                sdList.add(map1);
+//            }
+//            endMap.put("sd",sdList);
+//
+//
+//            List<SjHkWd> allByLqidAndScsjBetween2 = wdRepo.findAllByLqidAndScsjBetween(lqid, date, new Date());
+//            List wdList = new ArrayList();
+//            for (SjHkWd sjHkAq : allByLqidAndScsjBetween2) {
+//                Map map1 = new HashMap();
+//                map1.put("time",(sjHkAq.getScsj()+"").substring(11,19));
+//                map1.put("data",sjHkAq.getDqwd());
+//                wdList.add(map1);
+//            }
+//            endMap.put("wd",wdList);
+//            endList.add(endMap);
+//
+//        }
+//        return new Result(ResultCode.SUCCESS,endList);
+//    }
+
+    @Override
+    public Result getAllFarm() {
+
+
+        List<FarmSm> all = farmSmRepository.findAll();
+
+        String dateStr = "2021-03-14 00:00:00";
+        String endDateStr ="2021-03-14 "+ (new Date()+"").substring(11,19);
+        System.out.println(endDateStr);
+
+
+        Date date = null;
+        Date endDate = null;
+        try {
+            date = DateUtil.parseDateTime(dateStr);
+            endDate = DateUtil.parseDateTime(endDateStr);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        List endList = new ArrayList();
+
+        for (FarmSm farmSm : all) {
+            Map endMap = new HashMap();
+            endMap.put("name",farmSm.getName());
+
+            String lqid = farmSm.getLqid();
+            endMap.put("lqid",farmSm.getLqid());
+
+            List<SjHkAq> allByLqidAndScsjBetween = aqRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+            if ( allByLqidAndScsjBetween.size() >0){
+                SjHkAq sjHkAq1 = allByLqidAndScsjBetween.get(allByLqidAndScsjBetween.size()-1);
+                endMap.put("aq",sjHkAq1.getDqaq());
+            }
+
+            List<SjHkSd> allByLqidAndScsjBetween1 = sdRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+            if ( allByLqidAndScsjBetween1.size() >0){
+                SjHkSd sjHkAq1 = allByLqidAndScsjBetween1.get(allByLqidAndScsjBetween1.size()-1);
+                endMap.put("sd",sjHkAq1.getDqsd());
+            }
+
+            List<SjHkWd> allByLqidAndScsjBetween2 = wdRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+            if ( allByLqidAndScsjBetween2.size() >0){
+                SjHkWd sjHkAq2 = allByLqidAndScsjBetween2.get(allByLqidAndScsjBetween2.size()-1);
+                endMap.put("wd",sjHkAq2.getDqwd());
+            }
+
+            endList.add(endMap);
+
+        }
+        return new Result(ResultCode.SUCCESS,endList);
+    }
+
+    @Override
+    public Result getAllBylqid(String lqid) {
+
+        String dateStr = "2021-03-14 00:00:00";
+        String endDateStr ="2021-03-14 "+ (new Date()+"").substring(11,19);
+        System.out.println(endDateStr);
+
+
+        Date date = null;
+        Date endDate = null;
+        try {
+            date = DateUtil.parseDateTime(dateStr);
+            endDate = DateUtil.parseDateTime(endDateStr);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Map map =new HashMap();
+
+        List aqList = new ArrayList();
+        List<SjHkAq> allByLqidAndScsjBetween = aqRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+        for (SjHkAq sjHkAq : allByLqidAndScsjBetween) {
+                Map map1 = new HashMap();
+                map1.put("time",(sjHkAq.getScsj()+"").substring(11,19));
+                map1.put("data",sjHkAq.getDqaq());
+                 aqList.add(map1);
+        }
+        map.put("aq",aqList);
+
+
+        List sdList = new ArrayList();
+        List<SjHkSd> allByLqidAndScsjBetween1 = sdRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+        for (SjHkSd sjHkSd : allByLqidAndScsjBetween1) {
+            Map map1 = new HashMap();
+            map1.put("time",(sjHkSd.getScsj()+"").substring(11,19));
+            map1.put("data",sjHkSd.getDqsd());
+            sdList.add(map1);
+        }
+        map.put("sd",sdList);
+
+
+        List wdList = new ArrayList();
+        List<SjHkWd> allByLqidAndScsjBetween2 = wdRepo.findAllByLqidAndScsjBetween(lqid, date, endDate);
+        for (SjHkWd sjHkWd : allByLqidAndScsjBetween2) {
+            Map map1 = new HashMap();
+            map1.put("time",(sjHkWd.getScsj()+"").substring(11,19));
+            map1.put("data",sjHkWd.getDqwd());
+            wdList.add(map1);
+        }
+        map.put("wd",wdList);
+
+        return new Result(ResultCode.SUCCESS,map);
+    }
+
+
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/IndexEnvServiceImpl.java

@@ -30,6 +30,8 @@ public class IndexEnvServiceImpl implements IndexEnvService {
             return new Result(10002,"请输入参数",false);
         }
         try {
+         envEntity.setCreateTime(new Date());
+            envEntity.setUpdateTime(new Date());
             entityRepo.save(envEntity);
             return new Result(10000,"添加成功",true);
         }catch (Exception e){

huimv-ql-farm/huimv-ql-production/pom.xml

@@ -43,7 +43,10 @@
         <artifactId>hutool-all</artifactId>
         <version>5.5.9</version>
     </dependency>
-
+    <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+    </dependency>
 
     <dependency>
         <groupId>org.projectlombok</groupId>

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BLaborRoomStateController.java

@@ -24,23 +24,15 @@ public class BLaborRoomStateController {
     private BLaborRoomStateService childcareService;
 
     @RequestMapping("/add")
-    public Result add(BLaborRoomStateEntity childcareEntity){
-        return childcareService.add(childcareEntity);
-    }
+    public Result add(BLaborRoomStateEntity childcareEntity){ return childcareService.add(childcareEntity); }
 
     @RequestMapping("/remove")
-    public Result add(Integer[] ids){
-        return childcareService.remove(ids);
-    }
+    public Result add(Integer[] ids){ return childcareService.remove(ids); }
 
     @RequestMapping("/update")
-    public Result update(BLaborRoomStateEntity childcareEntity){
-        return childcareService.update(childcareEntity);
-    }
+    public Result update(BLaborRoomStateEntity childcareEntity){ return childcareService.update(childcareEntity); }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
-    }
+    public Result findAll(){ return childcareService.findAll(); }
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BaoyvCountController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.BaoyvCount;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.BaoyvCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/BaoyvCount")
+public class BaoyvCountController {
+
+	@Autowired
+	private BaoyvCountService service;
+
+	@RequestMapping("/add")
+	public Result add(BaoyvCount childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(BaoyvCount childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+@RequestMapping("/findAllById")
+public Result findAllById(Integer id){ return service.findAllById(id); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MCleanTimesController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MCleanTimes;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MCleanTimesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/cleanTimes")
+public class MCleanTimesController {
+
+	@Autowired
+	private MCleanTimesService service;
+
+	@RequestMapping("/add")
+	public Result add(MCleanTimes childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MCleanTimes childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MElectricQuantityController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MElectricQuantity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MElectricQuantityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/electricQuantity")
+public class MElectricQuantityController {
+
+	@Autowired
+	private MElectricQuantityService service;
+
+	@RequestMapping("/add")
+	public Result add(MElectricQuantity childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MElectricQuantity childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MFattenAreaController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MFattenArea;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MFattenAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/fattenArea")
+public class MFattenAreaController {
+
+	@Autowired
+	private MFattenAreaService service;
+
+	@RequestMapping("/add")
+	public Result add(MFattenArea childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MFattenArea childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+	@RequestMapping("/findAllBy")
+	public Result findAllBy(Integer locationId){ return service.findAllBy(locationId); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigFeed;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigFeedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/pigFeed")
+public class MPigFeedController {
+
+	@Autowired
+	private MPigFeedService service;
+
+	@RequestMapping("/add")
+	public Result add(MPigFeed childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MPigFeed childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenHumidityController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigPigpenHumidity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigPigpenHumidityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/pigPigpenHumidity")
+public class MPigPigpenHumidityController {
+
+	@Autowired
+	private MPigPigpenHumidityService service;
+
+	@RequestMapping("/add")
+	public Result add(MPigPigpenHumidity childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MPigPigpenHumidity childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenTemperatureController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigPigpenTemperature;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigPigpenTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/pigPigpenTemperature")
+public class MPigPigpenTemperatureController {
+
+	@Autowired
+	private MPigPigpenTemperatureService service;
+
+	@RequestMapping("/add")
+	public Result add(MPigPigpenTemperature childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MPigPigpenTemperature childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigWaterController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigWater;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/pigWater")
+public class MPigWaterController {
+
+	@Autowired
+	private MPigWaterService service;
+
+	@RequestMapping("/add")
+	public Result add(MPigWater childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MPigWater childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDayController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSaleDay;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSaleDayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/saleDay")
+public class MSaleDayController {
+
+@Autowired
+private MSaleDayService service;
+
+@RequestMapping("/add")
+public Result add(MSaleDay childcareEntity){ return service.add(childcareEntity); }
+
+@RequestMapping("/remove")
+public Result add(Integer[] ids){ return service.remove(ids); }
+
+@RequestMapping("/update")
+public Result update(MSaleDay childcareEntity){ return service.update(childcareEntity); }
+
+@RequestMapping("/findAll")
+public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDetailController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSaleDetail;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSaleDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/saleDetail")
+public class MSaleDetailController {
+
+@Autowired
+private MSaleDetailService service;
+
+@RequestMapping("/add")
+public Result add(MSaleDetail childcareEntity){ return service.add(childcareEntity); }
+
+@RequestMapping("/remove")
+public Result add(Integer[] ids){ return service.remove(ids); }
+
+@RequestMapping("/update")
+public Result update(MSaleDetail childcareEntity){ return service.update(childcareEntity); }
+
+@RequestMapping("/findAll")
+public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleMonthController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSaleMonth;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSaleMonthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/saleMonth")
+public class MSaleMonthController {
+
+@Autowired
+private MSaleMonthService service;
+
+@RequestMapping("/add")
+public Result add(MSaleMonth childcareEntity){ return service.add(childcareEntity); }
+
+@RequestMapping("/remove")
+public Result add(Integer[] ids){ return service.remove(ids); }
+
+@RequestMapping("/update")
+public Result update(MSaleMonth childcareEntity){ return service.update(childcareEntity); }
+
+@RequestMapping("/findAll")
+public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleYearController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSaleYear;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSaleYearService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/saleYear")
+public class MSaleYearController {
+
+@Autowired
+private MSaleYearService service;
+
+@RequestMapping("/add")
+public Result add(MSaleYear childcareEntity){ return service.add(childcareEntity); }
+
+@RequestMapping("/remove")
+public Result add(Integer[] ids){ return service.remove(ids); }
+
+@RequestMapping("/update")
+public Result update(MSaleYear childcareEntity){ return service.update(childcareEntity); }
+
+@RequestMapping("/findAll")
+public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartCountController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSmartCount;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSmartCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/smartCount")
+public class MSmartCountController {
+
+	@Autowired
+	private MSmartCountService service;
+
+	@RequestMapping("/add")
+	public Result add(MSmartCount childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSmartCount childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartWeightController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSmartWeight;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSmartWeightService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/smartWeight")
+public class MSmartWeightController {
+
+	@Autowired
+	private MSmartWeightService service;
+
+	@RequestMapping("/add")
+	public Result add(MSmartWeight childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSmartWeight childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAnimalHeatController.java

@@ -46,7 +46,7 @@ public class MSowAnimalHeatController {
     }
 
     @RequestMapping("/findAllById")
-    public Result findAllById( Integer locationId){
+    public Result findAllById( String locationId){
         return childcareService.findAllById(locationId);
     }
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAreaController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowArea;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowArea")
+public class MSowAreaController {
+
+	@Autowired
+	private MSowAreaService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowArea childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowArea childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+	@RequestMapping("/findAllBy")
+	public Result findAllBy(Integer locationId){ return service.findAllBy(locationId); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowFeedController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowFeed;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowFeedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowFeed")
+public class MSowFeedController {
+
+	@Autowired
+	private MSowFeedService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowFeed childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowFeed childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowHeat;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowHeatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowHeat")
+public class MSowHeatController {
+
+	@Autowired
+	private MSowHeatService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowHeat childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowHeat childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+	@RequestMapping("/findAllBy")
+	public Result findAllBy(String sowId){ return service.findAllBy(sowId); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowLivenessController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowLiveness;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowLivenessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowLiveness")
+public class MSowLivenessController {
+
+	@Autowired
+	private MSowLivenessService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowLiveness childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowLiveness childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenHumidityController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowPigpenHumidity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowPigpenHumidityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowPigpenHumidity")
+public class MSowPigpenHumidityController {
+
+	@Autowired
+	private MSowPigpenHumidityService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowPigpenHumidity childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowPigpenHumidity childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenTemperatureController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowPigpenTemperature;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowPigpenTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowPigpenTemperature")
+public class MSowPigpenTemperatureController {
+
+	@Autowired
+	private MSowPigpenTemperatureService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowPigpenTemperature childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowPigpenTemperature childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowWaterController.java

@@ -0,0 +1,31 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowWater;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/sowWater")
+public class MSowWaterController {
+
+	@Autowired
+	private MSowWaterService service;
+
+	@RequestMapping("/add")
+	public Result add(MSowWater childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MSowWater childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/SowCountController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.SowCount;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.SowCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/SowCount")
+public class SowCountController {
+
+	@Autowired
+	private SowCountService service;
+
+	@RequestMapping("/add")
+	public Result add(SowCount childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(SowCount childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+@RequestMapping("/findAllById")
+public Result findAllById(Integer id){ return service.findAllById(id); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/YvfeiCountController.java

@@ -0,0 +1,34 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.YvfeiCount;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.YvfeiCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/YvfeiCount")
+public class YvfeiCountController {
+
+	@Autowired
+	private YvfeiCountService service;
+
+	@RequestMapping("/add")
+	public Result add(YvfeiCount childcareEntity){ return service.add(childcareEntity); }
+
+	@RequestMapping("/remove")
+	public Result add(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(YvfeiCount childcareEntity){ return service.update(childcareEntity); }
+
+	@RequestMapping("/findAll")
+	public Result findAll(){ return service.findAll(); }
+
+@RequestMapping("/findAllById")
+public Result findAllById(Integer id){ return service.findAllById(id); }
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/BaoyvCount.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "baoyv_count")
+public class BaoyvCount implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "data")
+	private String data;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MChildbirthRatioEntity.java

@@ -21,9 +21,9 @@ public class MChildbirthRatioEntity implements Serializable {
     private Integer year;
 
     @Column(name = "month")
-    private Integer month;
+    private String month;
 
     @Column(name = "ratio")
-    private Integer ratio;
+    private Float ratio;
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MCleanTimes.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_clean_times")
+public class MCleanTimes implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "used_date")
+	private String usedDate;
+
+	@Column(name = "times")
+	private Double times;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MConceptionRatioEntity.java

@@ -24,6 +24,6 @@ public class MConceptionRatioEntity implements Serializable {
     private String date;
 
     @Column(name = "ratio")
-    private Integer ratio;
+    private Float ratio;
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MElectricQuantity.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_electric_quantity")
+public class MElectricQuantity implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "used_date")
+	private String usedDate;
+
+	@Column(name = "electric_quantity")
+	private Double electricQuantity;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MFattenArea.java

@@ -0,0 +1,45 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_fatten_area")
+public class MFattenArea implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "area_id")
+	private Integer areaId;
+
+	@Column(name = "area")
+	private String area;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "location")
+	private String location;
+
+	@Column(name = "temperature")
+	private Double temperature;
+
+	@Column(name = "humidity")
+	private Double humidity;
+
+	@Column(name = "feed")
+	private Double feed;
+
+	@Column(name = "water")
+	private Double water;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigFeed.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_pig_feed")
+public class MPigFeed implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "feed_date")
+	private String feedDate;
+
+	@Column(name = "feed_intake")
+	private Double feedIntake;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "pig_code")
+	private String pigCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigPigpenHumidity.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_pig_pigpen_humidity")
+public class MPigPigpenHumidity implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "humidity")
+	private Double humidity;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "pig_code")
+	private String pigCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigPigpenTemperature.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_pig_pigpen_temperature")
+public class MPigPigpenTemperature implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "temperature")
+	private Double temperature;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "pig_code")
+	private String pigCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigWater.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_pig_water")
+public class MPigWater implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "drink_date")
+	private String drinkDate;
+
+	@Column(name = "drink_water")
+	private Double drinkWater;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "pig_code")
+	private String pigCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigletHealthCountEntity.java

@@ -39,6 +39,7 @@ public class MPigletHealthCountEntity implements Serializable {
     private String birthCode;
 
     @Column(name = "sow_code")
-    private Integer sowCode;
+    private String sowCode;
+
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigletLiveEntity.java

@@ -21,7 +21,7 @@ public class MPigletLiveEntity implements Serializable {
     private Integer year;
 
     @Column(name = "month")
-    private Integer month;
+    private String month;
 
     @Column(name = "quantity")
     private Integer quantity;

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MPigletLiveRatioEntity.java

@@ -21,7 +21,7 @@ public class MPigletLiveRatioEntity implements Serializable {
     private Integer year;
 
     @Column(name = "month")
-    private Integer month;
+    private String month;
 
     @Column(name = "ratio")
     private String ratio;

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MReestrusRatioEntity.java

@@ -21,9 +21,9 @@ public class MReestrusRatioEntity implements Serializable {
     private Integer year;
 
     @Column(name = "month")
-    private Integer month;
+    private String month;
 
     @Column(name = "ratio")
-    private Integer ratio;
+    private Float ratio;
 
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSaleDay.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sale_day")
+public class MSaleDay implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "sale_date")
+	private String saleDate;
+
+	@Column(name = "total")
+	private Integer total;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSaleDetail.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sale_detail")
+public class MSaleDetail implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "sale_code")
+	private String saleCode;
+
+	@Column(name = "quantity")
+	private Integer quantity;
+
+	@Column(name = "weight")
+	private Double weight;
+
+	@Column(name = "sale_date")
+	private String saleDate;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSaleMonth.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sale_month")
+public class MSaleMonth implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "year")
+	private Integer year;
+
+	@Column(name = "month")
+	private Integer month;
+
+	@Column(name = "quantity")
+	private Integer quantity;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSaleYear.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sale_year")
+public class MSaleYear implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "year")
+	private Integer year;
+
+	@Column(name = "total")
+	private Integer total;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSmartCount.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_smart_count")
+public class MSmartCount implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "location")
+	private String location;
+
+	@Column(name = "lineage")
+	private String lineage;
+
+	@Column(name = "quantity")
+	private Integer quantity;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSmartWeight.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_smart_weight")
+public class MSmartWeight implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "age_days")
+	private Integer ageDays;
+
+	@Column(name = "smart_weight")
+	private Double smartWeight;
+
+	@Column(name = "actual_weight")
+	private Double actualWeight;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowAnimalHeatEntity.java

@@ -18,7 +18,7 @@ public class MSowAnimalHeatEntity implements Serializable {
     private Integer id;
 
     @Column(name = "location_id")
-    private Integer locationId;
+    private String locationId;
 
     @Column(name = "measure_datetime")
     private String measureDatetime;

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowArea.java

@@ -0,0 +1,45 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_area")
+public class MSowArea implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "area_id")
+	private Integer areaId;
+
+	@Column(name = "area")
+	private String area;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "location")
+	private String location;
+
+	@Column(name = "temperature")
+	private Double temperature;
+
+	@Column(name = "humidity")
+	private Double humidity;
+
+	@Column(name = "feed")
+	private Double feed;
+
+	@Column(name = "water")
+	private Double water;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowEntity.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 @Entity
 @Data
@@ -57,4 +56,13 @@ public class MSowEntity implements Serializable {
     @Column(name = "piglet_total")
     private Integer pigletTotal;
 
+    @Column(name = "gravidity_state")
+    private String gravidityState;
+
+    @Column(name = "weight")
+    private Float weight;
+
+    @Column(name = "animal_heat")
+    private Float animalHeat;
+
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowFeed.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_feed")
+public class MSowFeed implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "feed_date")
+	private String feedDate;
+
+	@Column(name = "feed_intake")
+	private Double feedIntake;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowHeat.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_heat")
+public class MSowHeat implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "measure_time")
+	private String measureTime;
+
+	@Column(name = "animal_heat")
+	private Double animalHeat;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowLiveness.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_liveness")
+public class MSowLiveness implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "measure_date")
+	private String measureDate;
+
+	@Column(name = "liveness")
+	private Integer liveness;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowPigpenHumidity.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_pigpen_humidity")
+public class MSowPigpenHumidity implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "humidity")
+	private Double humidity;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowPigpenTemperature.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_pigpen_temperature")
+public class MSowPigpenTemperature implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "temperature")
+	private Double temperature;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowPredeliveryEntity.java

@@ -21,7 +21,7 @@ public class MSowPredeliveryEntity implements Serializable {
     private String location;
 
     @Column(name = "days")
-    private Integer days;
+    private String days;
 
     @Column(name = "state")
     private Integer state;

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowWater.java

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_sow_water")
+public class MSowWater implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "drink_date")
+	private String drinkDate;
+
+	@Column(name = "drink_water")
+	private Double drinkWater;
+
+	@Column(name = "location_id")
+	private Integer locationId;
+
+	@Column(name = "sow_code")
+	private String sowCode;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/SowCount.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "sow_count")
+public class SowCount implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "data")
+	private String data;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/YvfeiCount.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "yvfei_count")
+public class YvfeiCount implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "date")
+	private String date;
+
+	@Column(name = "data")
+	private String data;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/BaoyvCountRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.BaoyvCount;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface BaoyvCountRepository extends JpaRepository<BaoyvCount, Integer>,JpaSpecificationExecutor<BaoyvCount>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MCleanTimesRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MCleanTimes;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MCleanTimesRepository extends JpaRepository<MCleanTimes, Integer>,JpaSpecificationExecutor<MCleanTimes>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MElectricQuantityRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MElectricQuantity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MElectricQuantityRepository extends JpaRepository<MElectricQuantity, Integer>,JpaSpecificationExecutor<MElectricQuantity>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MFattenAreaRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MFattenArea;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MFattenAreaRepository extends JpaRepository<MFattenArea, Integer>,JpaSpecificationExecutor<MFattenArea>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigFeedRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MPigFeed;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MPigFeedRepository extends JpaRepository<MPigFeed, Integer>,JpaSpecificationExecutor<MPigFeed>{
+    List findAllByLocationId(Integer locationId);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenHumidityRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MPigPigpenHumidity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MPigPigpenHumidityRepository extends JpaRepository<MPigPigpenHumidity, Integer>,JpaSpecificationExecutor<MPigPigpenHumidity>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenTemperatureRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MPigPigpenTemperature;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MPigPigpenTemperatureRepository extends JpaRepository<MPigPigpenTemperature, Integer>,JpaSpecificationExecutor<MPigPigpenTemperature>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigWaterRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MPigWater;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MPigWaterRepository extends JpaRepository<MPigWater, Integer>,JpaSpecificationExecutor<MPigWater>{
+    List findAllByLocationId(Integer locationId);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletHealthCountEntityRepo.java

@@ -4,11 +4,7 @@ import com.huimv.production.domain.MPigletHealthCountEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-import java.util.List;
-
 public interface MPigletHealthCountEntityRepo extends JpaRepository<MPigletHealthCountEntity, Integer>, JpaSpecificationExecutor<MPigletHealthCountEntity> {
 
-
-    List findAllBySowCode(Integer roomCode);
-
+    Object findAllBySowCode(String sowCode);
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDayRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSaleDay;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MSaleDayRepository extends JpaRepository<MSaleDay, Integer>,JpaSpecificationExecutor<MSaleDay>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDetailRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSaleDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MSaleDetailRepository extends JpaRepository<MSaleDetail, Integer>,JpaSpecificationExecutor<MSaleDetail>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleMonthRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSaleMonth;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MSaleMonthRepository extends JpaRepository<MSaleMonth, Integer>,JpaSpecificationExecutor<MSaleMonth>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleYearRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSaleYear;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MSaleYearRepository extends JpaRepository<MSaleYear, Integer>,JpaSpecificationExecutor<MSaleYear>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartCountRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSmartCount;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSmartCountRepository extends JpaRepository<MSmartCount, Integer>,JpaSpecificationExecutor<MSmartCount>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartWeightRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSmartWeight;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSmartWeightRepository extends JpaRepository<MSmartWeight, Integer>,JpaSpecificationExecutor<MSmartWeight>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAnimalHeatEntityRepo.java

@@ -6,13 +6,10 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
-import java.util.Map;
 
 public interface MSowAnimalHeatEntityRepo extends JpaRepository<MSowAnimalHeatEntity, Integer>, JpaSpecificationExecutor<MSowAnimalHeatEntity> {
 
-
-    List findAllByLocationId(Integer locationId);
-
+    List<MSowAnimalHeatEntity> findAllByLocationId(String locationId);
 
     @Query(nativeQuery = true,value = "SELECT AVG(heat), measure_time FROM `m_sow_animal_heat` GROUP BY measure_time")
     List<List> findAllBy();

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAreaRepository.java

@@ -0,0 +1,7 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowArea;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MSowAreaRepository extends JpaRepository<MSowArea, Integer>,JpaSpecificationExecutor<MSowArea>{}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowEntityRepo.java

@@ -4,8 +4,7 @@ import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-import java.util.List;
-
 public interface MSowEntityRepo extends JpaRepository<MSowEntity, Integer>, JpaSpecificationExecutor<MSowEntity> {
-    List<MSowEntity> findBySowCode(String sowCode);
+
+    Object findBySowCode(String sowCode);
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowFeedRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowFeed;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSowFeedRepository extends JpaRepository<MSowFeed, Integer>,JpaSpecificationExecutor<MSowFeed>{
+    List findAllByLocationId(Integer locationId);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowHeatRepository.java

@@ -0,0 +1,13 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowHeat;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSowHeatRepository extends JpaRepository<MSowHeat, Integer>,JpaSpecificationExecutor<MSowHeat>{
+
+    List findAllBySowCode(String sowCode);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowLivenessRepository.java

@@ -0,0 +1,13 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowLiveness;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSowLivenessRepository extends JpaRepository<MSowLiveness, Integer>,JpaSpecificationExecutor<MSowLiveness>{
+
+    List findAllBySowCode(String sowCode);
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenHumidityRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowPigpenHumidity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSowPigpenHumidityRepository extends JpaRepository<MSowPigpenHumidity, Integer>,JpaSpecificationExecutor<MSowPigpenHumidity>{
+
+    List findAllByLocationId(Integer locationId);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenTemperatureRepository.java

@@ -0,0 +1,13 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MSowPigpenTemperature;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface MSowPigpenTemperatureRepository extends JpaRepository<MSowPigpenTemperature, Integer>,JpaSpecificationExecutor<MSowPigpenTemperature>{
+
+    List findAllByLocationId(Integer locationId);
+
+}