添加青莲大屏工作计划，待分娩、待配种、待断奶，应付，销售等4个接口

huimv-hy-production/huimv.hy.erp.datasource/pom.xml

@@ -8,6 +8,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <version>0.3.0-SNAPSHOT</version>
 
     <artifactId>huimv.hy.erp.datasource</artifactId>
 
@@ -49,7 +50,11 @@
             <artifactId>org.apache.commons.codec</artifactId>
             <version>1.8</version>
         </dependency>
-
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.4</version>
+        </dependency>
     </dependencies>
 
 </project>

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/DemoController.java

@@ -0,0 +1,33 @@
+package com.huimv.production.datasource.controller;
+
+import com.huimv.common.result.Result;
+import com.huimv.common.result.ResultCode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@CrossOrigin
+@RestController
+@Slf4j
+@RequestMapping(value = "/demo")
+public class DemoController {
+
+    @RequestMapping(value = "/saveDemo",method = RequestMethod.POST)
+    public Result saveDemo(@RequestParam(value = "name",required = true) String name,@RequestParam(value = "age",required = false) String age,@RequestParam(value = "no",required = false) String no){
+        log.info("接收参数:");
+        log.info("name="+name);
+        log.info("age="+age);
+        log.info("no="+no);
+        //执行逻辑操作
+        System.out.println("已经保存数据.");
+
+        return new Result(ResultCode.SUCCESS);
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
 import java.util.Date;
 
 /**
@@ -244,6 +245,11 @@ public class ErpDataController {
 //            return result;
 //        }
         //
+        // 验证token
+        Result result = tokenUtil.verifyToken(accessToken);
+        if(!result.isSuccess()){
+            return result;
+        }
         return erpDataService.getCostWithManyFarm(yearMonth);
     }
 
@@ -259,13 +265,18 @@ public class ErpDataController {
      */
     @RequestMapping(value = "/getManyFarmStock",method = RequestMethod.GET)
     public  Result getManyFarmStock(@RequestParam(value = "accessToken",required = true) String accessToken){
+        // 验证token
+        Result result = tokenUtil.verifyToken(accessToken);
+        if(!result.isSuccess()){
+            return result;
+        }
         //
         return erpDataService.getManyFarmStock();
     }
 
     /**
      * @Method      : getManyFarmProduce
-     * @Description : 
+     * @Description : 获取多个牧场的生产数据
      * @Params      : [accessToken]
      * @Return      : com.huimv.common.result.Result
      * 
@@ -273,13 +284,125 @@ public class ErpDataController {
      * @Date        : 2021/11/13       
      * @Time        : 18:53
      */
-    @RequestMapping(value = "getManyFarmProduce",method = RequestMethod.GET)
+    @RequestMapping(value = "/getManyFarmProduce",method = RequestMethod.GET)
     public Result getManyFarmProduce(
             @RequestParam(value = "startDate",required = true) String startDate,
             @RequestParam(value = "endDate",required = true) String endDate,
             @RequestParam(value = "accessToken",required = true) String accessToken){
+        // 验证token
+        Result result = tokenUtil.verifyToken(accessToken);
+        if(!result.isSuccess()){
+            return result;
+        }
         //
         return erpDataService.getManyFarmProduce(startDate,endDate);
     }
 
+    /**
+     * @Method      : getWarning
+     * @Description : 获取预警信息
+     * @Params      : []
+     * @Return      : com.huimv.common.result.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/19
+     * @Time        : 15:41
+     */
+    @RequestMapping(value = "/getWarningMessage",method = RequestMethod.GET)
+    public Result getWarningMessage(@RequestParam(value = "accessToken",required = true) String accessToken) throws IOException {
+        // 验证token
+        Result result = tokenUtil.verifyToken(accessToken);
+        if(!result.isSuccess()){
+            return result;
+        }
+//
+        return erpDataService.getWarningMessage();
+    }
+
+    /**
+     * @Method      : getWorkPlan
+     * @Description : 工组计划
+     * @Params      : [startDate, endDate, accessToken]
+     * @Return      : com.huimv.common.result.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/22       
+     * @Time        : 17:47
+     */
+    @RequestMapping(value = "/getWorkPlan",method = RequestMethod.GET)
+    public Result getWorkPlan( @RequestParam(value = "startDate",required = true) String startDate,
+                               @RequestParam(value = "endDate",required = true) String endDate,
+                               @RequestParam(value = "accessToken",required = false) String accessToken) throws IOException {
+        // 验证token
+//        Result result = tokenUtil.verifyToken(accessToken);
+//        if(!result.isSuccess()){
+//            return result;
+//        }
+        //
+        return erpDataService.getWorkPlan(startDate,endDate);
+    }
+
+    /**
+     * @Method      : getPrepareStatusQuantity
+     * @Description : 获取各种准备状态数量
+     * @Params      : [accessToken]
+     * @Return      : com.huimv.common.result.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/22       
+     * @Time        : 17:58
+     */
+    @RequestMapping(value = "/getPrepareStatusQuantity",method = RequestMethod.GET)
+    public Result getPrepareStatusQuantity(@RequestParam(value = "accessToken",required = false) String accessToken){
+// 验证token
+//        Result result = tokenUtil.verifyToken(accessToken);
+//        if(!result.isSuccess()){
+//            return result;
+//        }
+        //
+        return erpDataService.getPrepareStatusQuantity();
+    }
+
+    /**
+     * @Method      : getPayable
+     * @Description : 读取应付数据
+     * @Params      : []
+     * @Return      : com.huimv.common.result.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/22       
+     * @Time        : 18:05
+     */
+    @RequestMapping(value = "/getPayable",method = RequestMethod.GET)
+    public Result getPayable(){
+//        验证token
+//        Result result = tokenUtil.verifyToken(accessToken);
+//        if(!result.isSuccess()){
+//            return result;
+//        }
+        //
+        return erpDataService.getPayable();
+    }
+
+    /**
+     * @Method      : getSales
+     * @Description : 读取销售数据
+     * @Params      : []
+     * @Return      : com.huimv.common.result.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/22
+     * @Time        : 19:11
+     */
+    @RequestMapping(value = "/getSales",method = RequestMethod.GET)
+    public Result getSales(){
+//        验证token
+//        Result result = tokenUtil.verifyToken(accessToken);
+//        if(!result.isSuccess()){
+//            return result;
+//        }
+        //
+        return erpDataService.getSales();
+    }
+
 }

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/IErpDataService.java

@@ -2,6 +2,7 @@ package com.huimv.production.datasource.service;
 
 import com.huimv.common.result.Result;
 
+import java.io.IOException;
 import java.util.Date;
 
 public interface IErpDataService {
@@ -34,4 +35,14 @@ public interface IErpDataService {
 
     //获取多个牧场的生产数据
     Result getManyFarmProduce(String startDate, String endDate);
+
+    Result getWarningMessage() throws IOException;
+
+    Result getWorkPlan(String startDate,String endDate);
+
+    Result getPrepareStatusQuantity();
+
+    Result getPayable();
+
+    Result getSales();
 }

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -8,6 +8,7 @@ import com.huimv.common.result.ResultCode;
 import com.huimv.production.datasource.dao.repo.TDeliveryRepo;
 import com.huimv.production.datasource.service.IErpDataService;
 import com.huimv.production.datasource.utils.DateUtils;
+import com.huimv.production.datasource.utils.MathUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +32,8 @@ public class ErpDataServiceImpl implements IErpDataService {
     private String isDemo;
     @Autowired
     private TDeliveryRepo tDeliveryRepo;
-
+    @Autowired
+    private MathUtil mathUtil;
 
     /**
      * @Method : getPsy
@@ -369,7 +371,29 @@ public class ErpDataServiceImpl implements IErpDataService {
         System.out.println("yearMonth="+yearMonth);
         //
         List<Object[]> costList = tDeliveryRepo.getCostWithManyFarm(yearMonth);
-        return new Result(ResultCode.SUCCESS,costList);
+        JSONArray costJa = new JSONArray();
+        for(int a=0;a<costList.size();a++){
+            Object[] costObj = (Object[]) costList.get(a);
+            JSONObject dataJo = new JSONObject();
+            costJa.add(dataJo);
+            //牧场名称
+            dataJo.put("mcmc", costObj[0]);
+            //基础猪群
+            dataJo.put("jczq", costObj[1]);
+            //保育猪群
+            dataJo.put("byzq", costObj[2]);
+            //育肥
+            dataJo.put("yf", costObj[3]);
+            //后备
+            dataJo.put("hb", costObj[4]);
+            //共同费用
+            dataJo.put("gtfy", costObj[5]);
+            //合计
+            dataJo.put("hj", costObj[6]);
+            //项目名称
+            dataJo.put("xmmc", costObj[7]);
+        }
+        return new Result(ResultCode.SUCCESS,costJa);
     }
     /**
      * @Method      : getManyFarmStock
@@ -385,7 +409,33 @@ public class ErpDataServiceImpl implements IErpDataService {
     public Result getManyFarmStock() {
         //
         List<Object[]> stockList = tDeliveryRepo.getManyFarmStock();
-        return new Result(ResultCode.SUCCESS,stockList);
+        JSONArray stockJa = new JSONArray();
+        for(int a=0;a<stockList.size();a++){
+            Object[] stockObj = (Object[]) stockList.get(a);
+            JSONObject dataJo = new JSONObject();
+            stockJa.add(dataJo);
+            //牧场名称
+            dataJo.put("mcmc", stockObj[0]);
+            //母猪
+            dataJo.put("mz", stockObj[1]);
+            //公猪
+            dataJo.put("gz", stockObj[2]);
+            //仔猪
+            dataJo.put("zz", stockObj[3]);
+            //保育
+            dataJo.put("by", stockObj[4]);
+            //育肥
+            dataJo.put("yf", stockObj[5]);
+            //后备
+            dataJo.put("hb", stockObj[6]);
+            //妊娠
+            dataJo.put("rs", stockObj[7]);
+            //哺乳
+            dataJo.put("br", stockObj[8]);
+            //空怀
+            dataJo.put("kh", stockObj[9]);
+        }
+        return new Result(ResultCode.SUCCESS,stockJa);
     }
 
     @Autowired
@@ -407,8 +457,192 @@ public class ErpDataServiceImpl implements IErpDataService {
         Date endDate = dateUtils.parseDate(endDateText);
         //
         List<Object[]> stockList = tDeliveryRepo.getManyFarmProduce(startDate,endDate);
-        log.info("stockList.size>>"+stockList.size());
-        return new Result(ResultCode.SUCCESS,stockList);
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<stockList.size();a++){
+            Object[] stockObj = (Object[]) stockList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            //牧场名称
+            dataJo.put("mcmc", stockObj[0]);
+            //产房成活率
+            dataJo.put("cfchl", stockObj[1]);
+            //保育成活率
+            dataJo.put("bychl", stockObj[2]);
+            //肥猪成活率
+            dataJo.put("fzchl", stockObj[3]);
+            //平均窝产仔猪
+            dataJo.put("pjwczz", stockObj[4]);
+            //平均窝产活仔数
+            dataJo.put("pjwchzs", stockObj[5]);
+            //平均窝产正常仔数
+            dataJo.put("pjwczczs", stockObj[6]);
+            //窝断奶仔猪数
+            dataJo.put("wdnzzs", stockObj[7]);
+            //平均断奶窝重
+            dataJo.put("pjdnwz", stockObj[8]);
+            //7日断配率
+            dataJo.put("7rdpl", stockObj[9]);
+            //年产窝数
+            dataJo.put("ncws", stockObj[10]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
+    }
+
+    @Override
+    public Result getWarningMessage() {
+        //
+        List<Object[]> stockList = tDeliveryRepo.getWarningMessage();
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<stockList.size();a++){
+            Object[] stockObj = (Object[]) stockList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            //消息内容
+            dataJo.put("xxnr", stockObj[0]);
+            //提示日期
+            dataJo.put("tsrq", stockObj[1]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
+    }
+
+    @Override
+    public Result getWorkPlan(String startDateText,String endDateText) {
+        Date startDate = dateUtils.parseDate(startDateText);
+        Date endDate = dateUtils.parseDate(endDateText);
+        //
+        List<Object[]> workPlanList = tDeliveryRepo.getWorkPlan(startDate,endDate);
+        System.out.println("workPlanList.size="+workPlanList.size());
+
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<workPlanList.size();a++){
+            Object[] planObj = (Object[]) workPlanList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            //计划名称
+            dataJo.put("jhmc", planObj[0]);
+            //计划数量
+            dataJo.put("jhsl", planObj[1]);
+            //实际数量
+            dataJo.put("sjsl", planObj[2]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
+    }
+
+    @Override
+    public Result getPrepareStatusQuantity() {
+        //
+        List<Object[]> prepareStatusList = tDeliveryRepo.getPrepareStatusQuantity();
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<prepareStatusList.size();a++){
+            Object[] planObj = (Object[]) prepareStatusList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            //牧场名称
+            dataJo.put("mcmc", planObj[0]);
+            //待分娩
+            dataJo.put("dfm", planObj[1]);
+            //待断奶
+            dataJo.put("ddn", planObj[2]);
+            //待配种
+            dataJo.put("dpz", planObj[3]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
+    }
+
+    @Override
+    public Result getPayable() {
+        //
+        List<Object[]> payableList = tDeliveryRepo.getPayable();
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<payableList.size();a++){
+            Object[] planObj = (Object[]) payableList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            //数据
+            dataJo.put("data", planObj[0]);
+            //名称
+            dataJo.put("mc", planObj[1]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
+    }
+
+    @Override
+    public Result getSales() {
+        //
+        List<Object[]> salesList = tDeliveryRepo.getSales();
+        System.out.println("salesList.size="+salesList.size());
+        JSONArray produceJa = new JSONArray();
+        for(int a=0;a<salesList.size();a++){
+            Object[] salesObj = (Object[]) salesList.get(a);
+            JSONObject dataJo = new JSONObject();
+            produceJa.add(dataJo);
+            System.out.println("planObj[0].toString()="+salesObj[0]);
+            System.out.println("planObj[1].toString()="+salesObj[1]);
+            System.out.println("planObj[2].toString()="+salesObj[2]);
+            System.out.println("planObj[3].toString()="+salesObj[3]);
+            System.out.println("planObj[4].toString()="+salesObj[4]);
+            System.out.println("planObj[5].toString()="+salesObj[5]);
+            System.out.println("planObj[6].toString()="+salesObj[6]);
+            System.out.println("planObj[7].toString()="+salesObj[7]);
+            System.out.println("planObj[8].toString()="+salesObj[8]);
+            //今日数量
+//            float f1 = 0;
+//            if(salesObj[0] != null){
+//                f1 = Float.parseFloat(salesObj[0].toString().replace(",",""));
+//            }else{
+//                System.out.println("==null");
+//            }
+            dataJo.put("today_quantity", salesObj[0]);
+            //今日重量
+//            float f2 = 0;
+//            if(salesObj[1] != null){
+//                f2 = Float.parseFloat(salesObj[1].toString().replace(",",""));
+//            }
+            dataJo.put("today_weight", salesObj[1]);
+            //今日金额
+//            float f3 = 0;
+//            if(salesObj[2] != null){
+//                f3 = Float.parseFloat(salesObj[2].toString().replace(",",""));
+//            }
+            dataJo.put("today_money",  salesObj[2]);
+            //本周数量
+//            float f4 = 0;
+//            if(salesObj[3] != null){
+//                f4 = Float.parseFloat(salesObj[3].toString().replace(",",""));
+//            }
+            dataJo.put("week_quantity", salesObj[3]);
+            //本周重量
+//            float f5 = 0;
+//            if(salesObj[4] != null){
+//                f5 = Float.parseFloat(salesObj[4].toString().replace(",",""));
+//            }
+            dataJo.put("week_weight", salesObj[4]);
+            //本周金额
+//            float f6 = 0;
+//            if(salesObj[5] != null){
+//                f6 = Float.parseFloat(salesObj[5].toString().replace(",",""));
+//            }
+            dataJo.put("week_money", salesObj[5]);
+            //本月数量
+//            float f7 = 0;
+//            if(salesObj[6] != null){
+//                f7 = Float.parseFloat(salesObj[6].toString().replace(",",""));
+//            }
+            dataJo.put("month_quantity", salesObj[6]);
+            //本月重量
+//            float f8 = 0;
+//            if(salesObj[7] != null){
+//                f8 = Float.parseFloat(salesObj[7].toString().replace(",",""));
+//            }
+            dataJo.put("month_weight", salesObj[7]);
+            //本月金额
+//            float f9 = 0;
+//            if(salesObj[8] != null){
+//                f9 = Float.parseFloat(salesObj[8].toString().replace(",",""));
+//            }
+            dataJo.put("month_money",  salesObj[8]);
+        }
+        return new Result(ResultCode.SUCCESS,produceJa);
     }
 
 }

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/utils/MathUtil.java

@@ -0,0 +1,55 @@
+package com.huimv.production.datasource.utils;
+
+import org.springframework.stereotype.Component;
+
+import java.text.NumberFormat;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+public class MathUtil {
+
+    //计算占比
+    public String countRate(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num * 100);//所占百分比
+    }
+
+    //计算占比
+    public String countRate(float num, float total,int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        //所占百分比
+        return numberFormat.format((float)  num/ (float)total* 100);
+    }
+
+    //格式化
+    public String format(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num * 100);//所占百分比
+    }
+
+    //格式化
+    public String format(float num, float total,int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        //所占百分比
+        return numberFormat.format((float)  num/ (float)total* 100);
+    }
+}

huimv-hy-production/huimv.hy.erp.datasource/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #    url: jdbc:sqlserver://115.238.57.190:1433;DatabaseName=qlyz
-    url: jdbc:sqlserver://192.168.1.26:1433;DatabaseName=qlyz
+    url: jdbc:sqlserver://192.168.1.20:1433;DatabaseName=qlyz
     username: sa
     password: hm123456@
     maxActive: 20

huimv-hy-production/huimv.hy.erp.datasource/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=prod
+spring.profiles.active=dev
 
 apiService.client= 20210501