添加产房智能管家管理等

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MChildbirthRatioEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MChildbirthRatioService;
+import com.huimv.production.service.MSowStateService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/childbirthRatio")
+public class MChildbirthRatioController {
+
+    @Autowired
+    private MChildbirthRatioService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MChildbirthRatioEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MChildbirthRatioEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MChildbirthTimesEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MChildbirthTimesService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/childbirthTimes")
+public class MChildbirthTimesController {
+
+    @Autowired
+    private MChildbirthTimesService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MChildbirthTimesEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MChildbirthTimesEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MConceptionRatioEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MConceptionRatioService;
+import com.huimv.production.service.MSowStateService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/conceptionRatio")
+public class MConceptionRatioController {
+
+    @Autowired
+    private MConceptionRatioService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MConceptionRatioEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MConceptionRatioEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MIncubatorHeatEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MIncubatorHeatService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/incubatorHeat")
+public class MIncubatorHeatController {
+
+    @Autowired
+    private MIncubatorHeatService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MIncubatorHeatEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MIncubatorHeatEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MLaborRoomHeatEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MLaborRoomHeatService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/laborRoomHeat")
+public class MLaborRoomHeatController {
+
+    @Autowired
+    private MLaborRoomHeatService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MLaborRoomHeatEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MLaborRoomHeatEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigletLiveEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigletLiveService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/pigletLive")
+public class MPigletLiveController {
+
+    @Autowired
+    private MPigletLiveService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MPigletLiveEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MPigletLiveEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MPigletLiveRatioEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigletLiveRatioService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/pigletLiveRatio")
+public class MPigletLiveRatioController {
+
+    @Autowired
+    private MPigletLiveRatioService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MPigletLiveRatioEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MPigletLiveRatioEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,46 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MReestrusRatioEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MResstrusRatioService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/resstrusRatio")
+public class MResstrusRatioController {
+
+    @Autowired
+    private MResstrusRatioService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MReestrusRatioEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MReestrusRatioEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -44,4 +44,14 @@ public class MSowChildbirthRecordController {
         return childcareService.findAll();
     }
 
+    @RequestMapping("/findAllByLaborRoomState")
+    public Result findAllByLaborRoomState(Integer laborRoomState){
+        return childcareService.findAllByLaborRoomState(laborRoomState);
+    }
+
+
+    @RequestMapping("/findById")
+    public Result findById(Integer id){
+        return childcareService.findById(id);
+    }
 }

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

@@ -44,4 +44,6 @@ public class MSowController {
         return childcareService.findAll();
     }
 
+
+
 }

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowPregnancyTestEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowPregnancyTestService;
+import com.huimv.production.service.MSowService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/sowPregnancyTest")
+public class MSowPregnancyTestController {
+
+    @Autowired
+    private MSowPregnancyTestService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MSowPregnancyTestEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MSowPregnancyTestEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowService;
+import com.huimv.production.service.MSowStateService;
+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;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:44
+ **/
+@RestController
+@CrossOrigin
+@RequestMapping("/sowState")
+public class MSowStateController {
+
+    @Autowired
+    private MSowStateService childcareService;
+
+    @RequestMapping("/add")
+    public Result add(MSowStateEntity childcareEntity){
+        return childcareService.add(childcareEntity);
+    }
+
+    @RequestMapping("/remove")
+    public Result add(Integer[] ids){
+        return childcareService.remove(ids);
+    }
+
+    @RequestMapping("/update")
+    public Result update(MSowStateEntity childcareEntity){
+        return childcareService.update(childcareEntity);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(){
+        return childcareService.findAll();
+    }
+
+}

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

@@ -1,11 +1,9 @@
 package com.huimv.production.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 @Entity
 @Data
@@ -19,9 +17,8 @@ public class MChildbirthProgressEntity implements Serializable {
     @Column(name = "id", nullable = false)
     private Integer id;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "birth_date")
-    private Date birthDate;
+    private String birthDate;
 
     @Column(name = "total")
     private Integer total;
@@ -32,4 +29,7 @@ public class MChildbirthProgressEntity implements Serializable {
     @Column(name = "sow_id")
     private Integer sowId;
 
+    @Column(name = "room_code")
+    private String roomCode;
+
 }

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

@@ -0,0 +1,29 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_childbirth_ratio")
+@Data
+public class MChildbirthRatioEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "year")
+    private Integer year;
+
+    @Column(name = "month")
+    private Integer month;
+
+    @Column(name = "ratio")
+    private Integer ratio;
+
+}

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

@@ -0,0 +1,26 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_childbirth_times")
+@Data
+public class MChildbirthTimesEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "year")
+    private Integer year;
+
+    @Column(name = "birth_times")
+    private Float birthTimes;
+
+}

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

@@ -0,0 +1,29 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_conception_ratio")
+@Data
+public class MConceptionRatioEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "year")
+    private Integer year;
+
+    @Column(name = "date")
+    private String date;
+
+    @Column(name = "ratio")
+    private Integer ratio;
+
+}

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

@@ -1,6 +1,5 @@
 package com.huimv.production.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -20,7 +19,6 @@ public class MFeedDetailEntity implements Serializable {
     private Integer id;
 
     @Column(name = "feed_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date feedDate;
 
     @Column(name = "quantity")
@@ -32,4 +30,7 @@ public class MFeedDetailEntity implements Serializable {
     @Column(name = "sow_id")
     private Integer sowId;
 
+    @Column(name = "room_code")
+    private String roomCode;
+
 }

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

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "m_incubator_heat")
+@Data
+public class MIncubatorHeatEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "date")
+    private String date;
+
+    @Column(name = "heat")
+    private Float heat;
+
+    @Column(name = "room_code")
+    private String roomCode;
+
+}

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

@@ -0,0 +1,30 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name = "m_labor_room_heat")
+public class MLaborRoomHeatEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "date")
+    private String date;
+
+    @Column(name = "heat")
+    private Float heat;
+
+    @Column(name = "room_code")
+    private String roomCode;
+
+}

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

@@ -17,22 +17,28 @@ public class MPigletHealthCountEntity implements Serializable {
     @Column(name = "id", nullable = false)
     private Integer id;
 
-    @Column(name = "health_state_id")
-    private Integer healthStateId;
+    @Column(name = "health")
+    private Integer health;
 
-    @Column(name = "health_state_name")
-    private String healthStateName;
+    @Column(name = "mummy")
+    private Integer mummy;
 
-    @Column(name = "quantity")
-    private Integer quantity;
+    @Column(name = "dead_born")
+    private Integer deadBorn;
 
-    @Column(name = "birth_code")
-    private String birthCode;
+    @Column(name = "catface")
+    private Integer catface;
 
-    @Column(name = "sow_id")
-    private Integer sowId;
+    @Column(name = "weak_piglet")
+    private Integer weakPiglet;
 
     @Column(name = "room_code")
     private String roomCode;
 
+    @Column(name = "birth_code")
+    private String birthCode;
+
+    @Column(name = "sow_code")
+    private Integer sowCode;
+
 }

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

@@ -0,0 +1,29 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_piglet_live")
+@Data
+public class MPigletLiveEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    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/MPigletLiveRatioEntity.java

@@ -0,0 +1,29 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_piglet_live_ratio")
+@Data
+public class MPigletLiveRatioEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "year")
+    private Integer year;
+
+    @Column(name = "month")
+    private Integer month;
+
+    @Column(name = "ratio")
+    private String ratio;
+
+}

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

@@ -0,0 +1,29 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_reestrus_ratio")
+@Data
+public class MReestrusRatioEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "year")
+    private Integer year;
+
+    @Column(name = "month")
+    private Integer month;
+
+    @Column(name = "ratio")
+    private Integer ratio;
+
+}

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

@@ -58,30 +58,26 @@ public class MSowChildbirthRecordEntity implements Serializable {
     /**
      * 怀孕时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "conception_date")
-    private Date conceptionDate;
+    private String conceptionDate;
 
     /**
      * 上床时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "into_room_date")
-    private Date intoRoomDate;
+    private String intoRoomDate;
 
     /**
      * 生产时间（生产第一头时间）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "first_date")
-    private Date firstDate;
+    private String firstDate;
 
     /**
      * 产完时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @Column(name = "finish_date")
-    private Date finishDate;
+    private String finishDate;
 
     /**
      * 产仔数

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

@@ -1,11 +1,9 @@
 package com.huimv.production.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.sql.Date;
 
 @Entity
 @Table(name = "m_sow_copulation")
@@ -23,8 +21,7 @@ public class MSowCopulationEntity implements Serializable {
     private String sowCode;
 
     @Column(name = "copulation_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date copulationDate;
+    private String copulationDate;
 
     @Column(name = "boar_code")
     private String boarCode;
@@ -33,11 +30,10 @@ public class MSowCopulationEntity implements Serializable {
     private Integer score;
 
     @Column(name = "due_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date dueDate;
+    private String dueDate;
 
-    @Column(name = "interval")
-    private Integer interval;
+    @Column(name = "intervals")
+    private Integer intervals;
 
     @Column(name = "birth_no")
     private Integer birthNo;

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

@@ -1,6 +1,5 @@
 package com.huimv.production.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -22,9 +21,8 @@ public class MSowEntity implements Serializable {
     @Column(name = "sow_code")
     private String sowCode;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    @Column(name = "birth_date", nullable = false)
-    private Date birthDate;
+    @Column(name = "birth_date")
+    private String birthDate;
 
     @Column(name = "childbirth_times")
     private Integer childbirthTimes;

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

@@ -0,0 +1,33 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "m_sow_pregnancy_test")
+@Data
+public class MSowPregnancyTestEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "sow_code")
+    private String sowCode;
+
+    @Column(name = "date")
+    private String date;
+
+    @Column(name = "result")
+    private String result;
+
+    @Column(name = "birth_no")
+    private Integer birthNo;
+
+}

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

@@ -0,0 +1,35 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "m_sow_state")
+@Data
+public class MSowStateEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "total")
+    private Integer total;
+
+    @Column(name = "gravidity_birth")
+    private Integer gravidityBirth;
+
+    @Column(name = "birth_ablactation")
+    private Integer birthAblactation;
+
+    @Column(name = "ablactation_copulation")
+    private Integer ablactationCopulation;
+
+    @Column(name = "copulation")
+    private Integer copulation;
+
+}

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

@@ -4,6 +4,9 @@ import com.huimv.production.domain.MChildbirthProgressEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface MChildbirthProgressEntityRepo extends JpaRepository<MChildbirthProgressEntity, Integer>, JpaSpecificationExecutor<MChildbirthProgressEntity> {
+    List findAllByRoomCode(String roomCode);
 
 }

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

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

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

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

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

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

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

@@ -4,6 +4,8 @@ import com.huimv.production.domain.MFeedDetailEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-public interface MFeedDetailEntityRepo extends JpaRepository<MFeedDetailEntity, Integer>, JpaSpecificationExecutor<MFeedDetailEntity> {
+import java.util.List;
 
+public interface MFeedDetailEntityRepo extends JpaRepository<MFeedDetailEntity, Integer>, JpaSpecificationExecutor<MFeedDetailEntity> {
+        List findAllByRoomCode(String roomCode);
 }

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

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

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

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

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

@@ -4,6 +4,11 @@ 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);
+
 }

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

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

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

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

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

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

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

@@ -4,6 +4,11 @@ import com.huimv.production.domain.MSowChildbirthRecordEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface MSowChildbirthRecordEntityRepo extends JpaRepository<MSowChildbirthRecordEntity, Integer>, JpaSpecificationExecutor<MSowChildbirthRecordEntity> {
 
+
+    List findAllByLaborRoomState(Integer laborRoomState);
+
 }

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

@@ -4,6 +4,10 @@ import com.huimv.production.domain.MSowCopulationEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface MSowCopulationEntityRepo extends JpaRepository<MSowCopulationEntity, Integer>, JpaSpecificationExecutor<MSowCopulationEntity> {
 
+    List findAllBySowCode(String sowCode);
+
 }

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

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

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

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

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

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

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MChildbirthRatioService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MChildbirthRatioEntity;
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MChildbirthRatioService {
+
+
+    Result add(MChildbirthRatioEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MChildbirthRatioEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MChildbirthTimesService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MChildbirthTimesEntity;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MChildbirthTimesService {
+
+
+    Result add(MChildbirthTimesEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MChildbirthTimesEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MConceptionRatioService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MConceptionRatioEntity;
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MConceptionRatioService {
+
+
+    Result add(MConceptionRatioEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MConceptionRatioEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MIncubatorHeatService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MIncubatorHeatEntity;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MIncubatorHeatService {
+
+
+    Result add(MIncubatorHeatEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MIncubatorHeatEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MLaborRoomHeatService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MLaborRoomHeatEntity;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MLaborRoomHeatService {
+
+
+    Result add(MLaborRoomHeatEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MLaborRoomHeatEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveRatioService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MPigletLiveRatioEntity;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MPigletLiveRatioService {
+
+
+    Result add(MPigletLiveRatioEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MPigletLiveRatioEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MPigletLiveEntity;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MPigletLiveService {
+
+
+    Result add(MPigletLiveEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MPigletLiveEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MResstrusRatioService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MReestrusRatioEntity;
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MResstrusRatioService {
+
+
+    Result add(MReestrusRatioEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MReestrusRatioEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowChildbirthRecordService.java

@@ -22,4 +22,7 @@ public interface MSowChildbirthRecordService {
 
     Result findAll();
 
+    Result findAllByLaborRoomState(Integer laborRoomState);
+
+    Result findById(Integer id);
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPregnancyTestService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.domain.MSowPregnancyTestEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MSowPregnancyTestService {
+
+
+    Result add(MSowPregnancyTestEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MSowPregnancyTestEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowStateService.java

@@ -0,0 +1,25 @@
+package com.huimv.production.service;
+
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.result.Result;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+public interface MSowStateService {
+
+
+    Result add(MSowStateEntity fattenEntity);
+
+    Result remove(Integer[] ids);
+
+    Result update(MSowStateEntity fattenEntity);
+
+    Result findAll();
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MChildbirthRatioServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MChildbirthRatioEntity;
+import com.huimv.production.repo.MChildbirthRatioEntityRepo;
+import com.huimv.production.repo.MChildbirthRatioEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MChildbirthRatioService;
+import com.huimv.production.service.MSowStateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MChildbirthRatioServiceImpl implements MChildbirthRatioService {
+    @Autowired
+    private MChildbirthRatioEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MChildbirthRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MChildbirthRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MChildbirthRatioEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MChildbirthTimesServiceImpl.java

@@ -0,0 +1,77 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MChildbirthTimesEntity;
+import com.huimv.production.repo.MChildbirthTimesEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MChildbirthTimesService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MChildbirthTimesServiceImpl implements MChildbirthTimesService {
+    @Autowired
+    private MChildbirthTimesEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MChildbirthTimesEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MChildbirthTimesEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MChildbirthTimesEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MConceptionRatioServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MConceptionRatioEntity;
+import com.huimv.production.repo.MConceptionRatioEntityRepo;
+import com.huimv.production.repo.MConceptionRatioEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MConceptionRatioService;
+import com.huimv.production.service.MSowStateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MConceptionRatioServiceImpl implements MConceptionRatioService {
+    @Autowired
+    private MConceptionRatioEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MConceptionRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MConceptionRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MConceptionRatioEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MIncubatorHeaServiceImpl.java

@@ -0,0 +1,77 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MIncubatorHeatEntity;
+import com.huimv.production.repo.MIncubatorHeatEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MIncubatorHeatService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MIncubatorHeaServiceImpl implements MIncubatorHeatService {
+    @Autowired
+    private MIncubatorHeatEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MIncubatorHeatEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MIncubatorHeatEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MIncubatorHeatEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MLaborRoomHeatServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MLaborRoomHeatEntity;
+import com.huimv.production.repo.MLaborRoomHeatEntityRepo;
+import com.huimv.production.repo.MLaborRoomHeatEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MLaborRoomHeatService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MLaborRoomHeatServiceImpl implements MLaborRoomHeatService {
+    @Autowired
+    private MLaborRoomHeatEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MLaborRoomHeatEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MLaborRoomHeatEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MLaborRoomHeatEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveRatioServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MPigletLiveRatioEntity;
+import com.huimv.production.repo.MPigletLiveRatioEntityRepo;
+import com.huimv.production.repo.MPigletLiveRatioEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigletLiveRatioService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MPigletLiveRatioServiceImpl implements MPigletLiveRatioService {
+    @Autowired
+    private MPigletLiveRatioEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MPigletLiveRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MPigletLiveRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MPigletLiveRatioEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MPigletLiveServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MPigletLiveEntity;
+import com.huimv.production.repo.MPigletLiveEntityRepo;
+import com.huimv.production.repo.MPigletLiveEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MPigletLiveService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MPigletLiveServiceImpl implements MPigletLiveService {
+    @Autowired
+    private MPigletLiveEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MPigletLiveEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MPigletLiveEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MPigletLiveEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MResstrusRatioServiceImpl.java

@@ -0,0 +1,76 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MReestrusRatioEntity;
+import com.huimv.production.repo.MReestrusRatioEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MResstrusRatioService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MResstrusRatioServiceImpl implements MResstrusRatioService {
+    @Autowired
+    private MReestrusRatioEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MReestrusRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MReestrusRatioEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MReestrusRatioEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowChildbitrhRecordServiceImpl.java

@@ -1,14 +1,16 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MLaborRoomHeatEntity;
 import com.huimv.production.domain.MSowChildbirthRecordEntity;
-import com.huimv.production.repo.MSowChildbirthRecordEntityRepo;
+import com.huimv.production.domain.MSowEntity;
+import com.huimv.production.repo.*;
 import com.huimv.production.result.Result;
 import com.huimv.production.service.MSowChildbirthRecordService;
 import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -22,6 +24,8 @@ public class MSowChildbitrhRecordServiceImpl implements MSowChildbirthRecordServ
     @Autowired
     private MSowChildbirthRecordEntityRepo childcareEntityRepo;
 
+
+
     @Override
     public Result add(MSowChildbirthRecordEntity childcareEntity) {
         if (childcareEntity == null){
@@ -73,5 +77,182 @@ public class MSowChildbitrhRecordServiceImpl implements MSowChildbirthRecordServ
             return new Result(10001,"查询失败",null);
         }
     }
-    
+
+    @Override
+    public Result findAllByLaborRoomState(Integer laborRoomState) {
+
+        List<MSowChildbirthRecordEntity> allByLaborRoomState = childcareEntityRepo.findAllByLaborRoomState(laborRoomState);
+
+        List list  = new ArrayList();
+        switch (laborRoomState){
+            case 0:
+                for (MSowChildbirthRecordEntity record : allByLaborRoomState) {
+                    Map map = new HashMap();
+                    map.put("roomNo",record.getRoomCode());
+                    map.put("roomState","空闲");
+                    map.put("id",record.getId());
+                    list.add(map);
+                }
+                break;
+            case 1:
+                for (MSowChildbirthRecordEntity record : allByLaborRoomState) {
+                    Map map = new HashMap();
+                    map.put("roomNo",record.getRoomCode());
+                    map.put("sowCode",record.getSowCode());
+                    map.put("roomState","待产");
+                    map.put("conceptionDate",record.getConceptionDate());
+                    map.put("intoRoomDate",record.getIntoRoomDate());
+                    map.put("id",record.getId());
+                    list.add(map);
+                }
+                break;
+            case 2:
+                for (MSowChildbirthRecordEntity record : allByLaborRoomState) {
+                    Map map = new HashMap();
+                    map.put("roomNo",record.getRoomCode());
+                    map.put("sowCode",record.getSowCode());
+                    map.put("birthState",record.getBirthState());
+                    map.put("conceptionDate",record.getConceptionDate());
+                    map.put("intoRoomDate",record.getIntoRoomDate());
+                    map.put("id",record.getId());
+//                    map.put("")
+                    list.add(map);
+                }
+                break;
+            case 3:
+                for (MSowChildbirthRecordEntity record : allByLaborRoomState) {
+                    Map map = new HashMap();
+                    map.put("roomNo",record.getRoomCode());
+                    map.put("sowCode",record.getSowCode());
+                    map.put("state","哺乳");
+                    map.put("conceptionDate",record.getConceptionDate());
+                    map.put("intoRoomDate",record.getIntoRoomDate());
+                    map.put("finishDate",record.getFinishDate());
+                    map.put("id",record.getId());
+                    list.add(map);
+                }
+                break;
+            default:
+                for (MSowChildbirthRecordEntity record : allByLaborRoomState) {
+                    Map map = new HashMap();
+                    map.put("roomNo",record.getRoomCode());
+                    map.put("sowCode",record.getSowCode());
+                    map.put("state","断奶");
+                    map.put("days",record.getDays());
+                    map.put("quantity",record.getQuantity());
+                    map.put("incubatorHeat",record.getIncubatorHeat());
+                    map.put("id",record.getId());
+                    list.add(map);
+                }
+                break;
+
+        }
+
+        return new Result(10000,"成功",list);
+    }
+
+    @Autowired
+    private MLaborRoomHeatEntityRepo roomRepo;
+    @Autowired
+    private MSowAnimalHeatEntityRepo sowRepo;
+    @Autowired
+    private MIncubatorHeatEntityRepo boxRepo;
+    @Autowired
+    private MChildbirthProgressEntityRepo progressEntityRepo;
+    @Autowired
+    private MFeedDetailEntityRepo detailEntityRepo;
+    @Autowired
+    private MPigletHealthCountEntityRepo countEntityRepo;
+    @Autowired
+    private MSowEntityRepo sowEntityRepo;
+    @Autowired
+    private MSowCopulationEntityRepo sowCopulationEntityRepo;
+    @Autowired
+    private  MSowPregnancyTestEntityRepo testEntityRepo;
+
+    @Override
+    public Result findById(Integer id) {
+
+        MSowChildbirthRecordEntity record = childcareEntityRepo.findById(id).get();
+        Map endMap = new HashMap();
+
+        endMap.put("sowNo",record.getSowCode());
+        endMap.put("age",record.getAge());
+        endMap.put("birthNo",record.getBirthNo());
+        endMap.put("quantity",record.getQuantity());
+        //母猪信息
+        endMap.put("sow",sowEntityRepo.findBySowCode(record.getSowCode()));
+        //配种信息
+        endMap.put("sowCopulationEntityRepo",sowCopulationEntityRepo.findAllBySowCode(record.getSowCode()));
+        //娠检信息
+        endMap.put("pregnancy",testEntityRepo.findAllBySowCode(record.getSowCode()));
+        //产仔分布图
+        endMap.put("littlePig",countEntityRepo.findAllBySowCode(Integer.parseInt(record.getSowCode())));
+
+
+        endMap.put("day",record.getDays());
+        endMap.put("total",record.getTotal());
+        endMap.put("boyPig",record.getBoarPigletTotal());
+        endMap.put("girlPig",record.getSowPigletTotal());
+        switch (record.getLaborRoomState()){
+            case 1:
+                //产房温度
+                List<MLaborRoomHeatEntity> allByRoomCode = roomRepo.findAllByRoomCode(record.getRoomCode());
+                endMap.put("roomHeat",allByRoomCode);
+               /* List list = new ArrayList();
+                for (MLaborRoomHeatEntity roomHeat : allByRoomCode) {
+                    Map map = new HashMap();
+                    map.put("time",roomHeat.getDate());
+                    map.put("heat",roomHeat.getDate());
+                    list.add(map);
+                }
+                endMap.put("roomHeat",list);*/
+                //母猪温度
+                List allByLocationId = sowRepo.findAllByLocationId(Integer.parseInt(record.getSowCode()));
+                endMap.put("sowHeat",allByLocationId);
+                break;
+            case 2:
+
+
+                //产房温度
+                endMap.put("roomHeat",roomRepo.findAllByRoomCode(record.getRoomCode()));
+                //母猪温度
+                endMap.put("sowHeat",sowRepo.findAllByLocationId(Integer.parseInt(record.getSowCode())));
+                //保温箱温度
+                endMap.put("boxHeat",boxRepo.findAllByRoomCode(record.getRoomCode()));
+                //产仔进度图
+                endMap.put("progress",progressEntityRepo.findAllByRoomCode(record.getRoomCode()));
+
+                break;
+            case 3:
+                endMap.put("startTime",record.getFirstDate());
+                endMap.put("endTime",record.getFinishDate());
+                endMap.put("total",record.getTotal());
+                endMap.put("weight",record.getAverageWeight());
+                //产房温度
+                endMap.put("roomHeat",roomRepo.findAllByRoomCode(record.getRoomCode()));
+                //母猪温度
+                endMap.put("sowHeat",sowRepo.findAllByLocationId(Integer.parseInt(record.getSowCode())));
+                //保温箱温度
+                endMap.put("boxHeat",boxRepo.findAllByRoomCode(record.getRoomCode()));
+                //智能饲喂
+                endMap.put("eat",detailEntityRepo.findAllByRoomCode(record.getRoomCode()));
+//                //猪仔分布图
+//                endMap.put("littlePig",countEntityRepo.findAllByRoomCode(record.getRoomCode()));
+
+                break;
+            default:
+                endMap.put("startTime",record.getFirstDate());
+                endMap.put("endTime",record.getFinishDate());
+                endMap.put("total",record.getTotal());
+                endMap.put("weight",record.getAverageWeight());
+                //保温箱温度
+                endMap.put("boxHeat",boxRepo.findAllByRoomCode(record.getRoomCode()));
+//                //猪仔分布图
+//                endMap.put("littlePig",countEntityRepo.findAllByRoomCode(record.getRoomCode()));
+                break;
+        }
+        return new Result(10000,"成功",endMap);
+    }
+
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowCopulationServiceImpl.java

@@ -26,12 +26,12 @@ public class MSowCopulationServiceImpl implements MSowCopulationService {
         if (childcareEntity == null){
             return new Result(10002,"请输入参数");
         }
-        try {
+//        try {
             childcareEntityRepo.save(childcareEntity);
             return new Result(10000,"添加成功");
-        }catch (Exception e){
-            return new Result(10001,"添加失败");
-        }
+//        }catch (Exception e){
+//            return new Result(10001,"添加失败");
+//        }
     }
 
     @Override

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPregnancyTestServiceImpl.java

@@ -0,0 +1,77 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MSowPregnancyTestEntity;
+import com.huimv.production.repo.MSowPregnancyTestEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowPregnancyTestService;
+import com.huimv.production.service.MSowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MSowPregnancyTestServiceImpl implements MSowPregnancyTestService {
+    @Autowired
+    private MSowPregnancyTestEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MSowPregnancyTestEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MSowPregnancyTestEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MSowPregnancyTestEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowServiceImpl.java

@@ -74,5 +74,5 @@ public class MSowServiceImpl implements MSowService {
             return new Result(10001,"查询失败",null);
         }
     }
-    
+
 }

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowStateServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.huimv.production.domain.MSowStateEntity;
+import com.huimv.production.repo.MSowStateEntityRepo;
+import com.huimv.production.repo.MSowStateEntityRepo;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MSowService;
+import com.huimv.production.service.MSowStateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.production.service.impl
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/3/9 0009 17:43
+ **/
+@Service
+public class MSowStateServiceImpl implements MSowStateService {
+    @Autowired
+    private MSowStateEntityRepo childcareEntityRepo;
+
+    @Override
+    public Result add(MSowStateEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请输入参数");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"添加成功");
+        }catch (Exception e){
+            return new Result(10001,"添加失败");
+        }
+    }
+
+    @Override
+    public Result remove(Integer[] ids) {
+        if (ids == null || ids.length==0){
+            return new Result(10002,"请选择要删除的数据");
+        }
+        try {
+            for (Integer id : ids) {
+                childcareEntityRepo.deleteById(id);
+            }
+
+            return new Result(10000,"删除成功");
+        }catch (Exception e){
+            return new Result(10001,"删除失败");
+        }
+    }
+
+    @Override
+    public Result update(MSowStateEntity childcareEntity) {
+        if (childcareEntity == null){
+            return new Result(10002,"请选择要修改的值");
+        }
+        try {
+            childcareEntityRepo.save(childcareEntity);
+            return new Result(10000,"修改成功");
+        }catch (Exception e){
+            return new Result(10001,"修改失败");
+        }
+    }
+
+    @Override
+    public Result findAll() {
+        try {
+            List<MSowStateEntity> all = childcareEntityRepo.findAll();
+            return new Result(10000,"查询成功",all);
+        }catch (Exception e){
+            return new Result(10001,"查询失败",null);
+        }
+    }
+    
+}