新增批次重量接口的查询。

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/WeightController.java

@@ -32,57 +32,82 @@ public class WeightController {
 
     //指定查询日期期间
     @RequestMapping(value = "/getWeight")
-    public Result getDayWeight(@RequestParam(value = "farmId",required = true) Integer farmId,@RequestParam(value = "startDate",required = true) String startDate,@RequestParam(value = "endDate",required = true) String endDate){
-        log.info("farmId>>"+farmId);
-        log.info("startDate>>"+startDate);
-        log.info("endDate>>"+endDate);
+    public Result getDayWeight(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "startDate", required = true) String startDate, @RequestParam(value = "endDate", required = true) String endDate) {
+        log.info("farmId>>" + farmId);
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
         //
-        return weight.getDayWeight(farmId,startDate,endDate);
+        return weight.getDayWeight(farmId, startDate, endDate);
     }
 
     //近7次卖猪数据
     @RequestMapping(value = "/getWeightLastNtimes")
-    public Result getDayWeightLastNtimes(@RequestParam(value = "farmId",required = true) Integer farmId,@RequestParam(value = "days",required = true) Integer days){
-        log.info("farmId>>"+farmId);
-        log.info("days>>"+days);
+    public Result getDayWeightLastNtimes(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "days", required = true) Integer days) {
+        log.info("farmId>>" + farmId);
+        log.info("days>>" + days);
         //
-        return weight.getDayWeightLastNtimes(farmId,days);
+        return weight.getDayWeightLastNtimes(farmId, days);
     }
 
     //本月统计
     @RequestMapping(value = "/getWeightInOneMonth")
-    public Result getDayWeightInOneMonth(@RequestParam(value = "farmId",required = true) Integer farmId){
-        log.info("farmId>>"+farmId);
+    public Result getDayWeightInOneMonth(@RequestParam(value = "farmId", required = true) Integer farmId) {
+        log.info("farmId>>" + farmId);
         String startDateText = dateUtil.getMonthStart();
-        log.info("startDateText>>"+startDateText);
+        log.info("startDateText>>" + startDateText);
         String endDateText = dateUtil.getMonthEnd();
-        log.info("endDateText>>"+endDateText);
+        log.info("endDateText>>" + endDateText);
         //
-        return weight.getDayWeight(farmId,startDateText,endDateText);
+        return weight.getDayWeight(farmId, startDateText, endDateText);
     }
 
     //当天统计
     @RequestMapping(value = "/getWeightOnToday")
-    public Result getDayWeightOnToday(@RequestParam(value = "farmId",required = true) Integer farmId) throws ParseException {
-        log.info("farmId>>"+farmId);
+    public Result getDayWeightOnToday(@RequestParam(value = "farmId", required = true) Integer farmId) throws ParseException {
+        log.info("farmId>>" + farmId);
         String todayDateText = dateUtil.getTodayDateText();
-        log.info("startDate>>"+todayDateText);
-        log.info("endDate>>"+todayDateText);
+        log.info("startDate>>" + todayDateText);
+        log.info("endDate>>" + todayDateText);
         //
-        return weight.getDayWeight(farmId,todayDateText,todayDateText);
+        return weight.getDayWeight(farmId, todayDateText, todayDateText);
     }
 
     //查询所有记录带分页
     @RequestMapping(value = "/getWeightOnPage")
-    public Result getWeightOnPage(@RequestParam(value = "farmId",required = true) Integer farmId,@RequestParam(value = "pageSize",required=true) Integer pageSize,
-                                  @RequestParam(value = "pageNo",required=true) Integer pageNo) throws ParseException {
-        log.info("farmId>>"+farmId);
+    public Result getWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                  @RequestParam(value = "pageNo", required = true) Integer pageNo) throws ParseException {
+        log.info("farmId>>" + farmId);
         String startDate = dateUtil.getYearStart();
         String endDate = dateUtil.getYearEnd();
-        log.info("pageNo>>"+pageNo);
-        log.info("pageSize>>"+pageSize);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
         //
-        return weight.getWeightOnPage(farmId,dateUtil.parseDate(startDate),dateUtil.parseDate(endDate),pageNo,pageSize);
+        return weight.getWeightOnPage(farmId, dateUtil.parseDate(startDate), dateUtil.parseDate(endDate), pageNo, pageSize);
     }
 
+    //分页查询批次重量记录
+    @RequestMapping(value = "/getBatchWeightOnPage")
+    public Result getBatchWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                       @RequestParam(value = "pageNo", required = true) Integer pageNo,
+                                       @RequestParam(value = "addTime", required = false) String addTime) throws ParseException {
+        log.info("farmId>>" + farmId);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        //
+        return weight.getBatchWeightOnPage(farmId, dateUtil.parseDate(addTime), pageNo, pageSize);
+    }
+
+    //分页查询批次重量记录
+    @RequestMapping(value = "/getBatchWeightOnPage2")
+    public Result getBatchWeightOnPage2(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                        @RequestParam(value = "pageNo", required = true) Integer pageNo,
+                                        @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate) throws ParseException {
+        log.info("farmId>>" + farmId);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
+        //
+        return weight.getBatchWeightOnPage(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(endDate), pageNo, pageSize);
+    }
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/repo/ProdBatchWeightEntity.java

@@ -0,0 +1,128 @@
+package com.huimv.produce.repo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "prod_batch_weight")
+public class ProdBatchWeightEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "batch_code")
+    private String batchCode;
+
+    @Column(name = "batch_sort")
+    private Integer batchSort;
+
+    @Column(name = "gross_weight")
+    private Float grossWeight;
+
+    @Column(name = "tare_weight")
+    private Float tareWeight;
+
+    @Column(name = "net_weight")
+    private Float netWeight;
+
+    @Column(name = "trade_id")
+    private Integer tradeId;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "add_time")
+    private Timestamp addTime;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchSort(Integer batchSort) {
+        this.batchSort = batchSort;
+    }
+
+    public Integer getBatchSort() {
+        return batchSort;
+    }
+
+    public void setGrossWeight(Float grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public Float getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setTareWeight(Float tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public Float getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setNetWeight(Float netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Float getNetWeight() {
+        return netWeight;
+    }
+
+    public void setTradeId(Integer tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getTradeId() {
+        return tradeId;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setAddTime(Timestamp addTime) {
+        this.addTime = addTime;
+    }
+
+    public Timestamp getAddTime() {
+        return addTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdBatchWeightEntity{" +
+                "id=" + id + '\'' +
+                "batchCode=" + batchCode + '\'' +
+                "batchSort=" + batchSort + '\'' +
+                "grossWeight=" + grossWeight + '\'' +
+                "tareWeight=" + tareWeight + '\'' +
+                "netWeight=" + netWeight + '\'' +
+                "tradeId=" + tradeId + '\'' +
+                "farmId=" + farmId + '\'' +
+                "addTime=" + addTime + '\'' +
+                '}';
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/repo/ProdBatchWeightRepo.java

@@ -0,0 +1,8 @@
+package com.huimv.produce.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ProdBatchWeightRepo extends JpaRepository<ProdBatchWeightEntity, Integer>, JpaSpecificationExecutor<ProdBatchWeightEntity> {
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/IWeight.java

@@ -13,4 +13,10 @@ public interface IWeight {
 
     //分页查询称重记录
     Result getWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize);
+
+    //分页查询批次称重记录
+    Result getBatchWeightOnPage(Integer farmId, Date parseDate, Integer pageNo, Integer pageSize);
+
+    //分页查询批次称重记录
+    Result getBatchWeightOnPage(Integer farmId, Date parseDate, Date parseDate1, Integer pageNo, Integer pageSize);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/WeightImpl.java

@@ -3,6 +3,8 @@ package com.huimv.produce.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.repo.ProdBatchWeightEntity;
+import com.huimv.produce.repo.ProdBatchWeightRepo;
 import com.huimv.produce.repo.ProdDayWeightEntity;
 import com.huimv.produce.repo.ProdDayWeightRepo;
 import com.huimv.produce.service.IWeight;
@@ -29,6 +31,8 @@ import java.util.List;
 public class WeightImpl implements IWeight {
     @Autowired
     private ProdDayWeightRepo dayWeightRepo;
+    @Autowired
+    private ProdBatchWeightRepo batchWeightRepo;
 
     /**
      * @Method      : getDayWeight
@@ -131,4 +135,75 @@ public class WeightImpl implements IWeight {
 //        return new Result(ResultCode.SUCCESS,applyRepo.listApply(pageable,applyId));
             return new Result(ResultCode.SUCCESS, dayWeightRepo.findAll(sf, pageable));
     }
+
+    /**
+     * @Method      : getBatchWeightOnPage
+     * @Description : 分页查询批次重量记录
+     * @Params      : [farmId, addTime, pageNo, pageSize]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/12/7       
+     * @Time        : 20:31
+     */
+    @Override
+    public Result getBatchWeightOnPage(Integer farmId, Date addTime, Integer pageNo, Integer pageSize) {
+        Specification<ProdBatchWeightEntity> sf = (Specification<ProdBatchWeightEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != addTime) {
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("addTime").as(Date.class), addTime));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of( pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, batchWeightRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method      : getBatchWeightOnPage
+     * @Description : 
+     * @Params      : [farmId, startDate, endDate, pageNo, pageSize]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/12/7       
+     * @Time        : 20:36
+     */
+    @Override
+    public Result getBatchWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) {
+        Specification<ProdBatchWeightEntity> sf = (Specification<ProdBatchWeightEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != startDate) {
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("addTime").as(Date.class), startDate));
+            }
+            if (null != endDate) {
+                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("addTime").as(Date.class), endDate));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of( pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, batchWeightRepo.findAll(sf, pageable));
+    }
 }