给各品种及各自数量增加模拟数据

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

@@ -6,6 +6,7 @@ import com.huimv.production.datasource.dao.repo.TDeliveryRepo;
 import com.huimv.production.datasource.service.IErpDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,28 +22,27 @@ import java.util.List;
 @Service
 @Slf4j
 public class ErpDataServiceImpl implements IErpDataService {
-//    private String testFarm = "油车港";
-//    private String testFarm = "海盐";
+    @Value("${apiService.data.getStorage.isDemo}")
+    private String isDemo;
     @Autowired
     private TDeliveryRepo tDeliveryRepo;
 
 
     /**
-     * @Method      : getPsy
+     * @Method : getPsy
      * @Description : Psy
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:40
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:40
      */
     @Override
-    public String getPsy(String farmID,String startDate,String endDate) {
-        log.info(" 开始日期（PSY） startDate:"+startDate);
-        log.info(" 结束日期（PSY） endDate:"+endDate);
-        List<Object[]> psyFieldList = tDeliveryRepo.getPsy(startDate,endDate,farmID);
-        log.info(" 返情率查询数量:"+psyFieldList.size());
+    public String getPsy(String farmID, String startDate, String endDate) {
+        log.info(" 开始日期（PSY） startDate:" + startDate);
+        log.info(" 结束日期（PSY） endDate:" + endDate);
+        List<Object[]> psyFieldList = tDeliveryRepo.getPsy(startDate, endDate, farmID);
+        log.info(" 返情率查询数量:" + psyFieldList.size());
         String psy = "";
         for (Object[] goodsObj : psyFieldList) {
             psy = goodsObj[0].toString();
@@ -51,31 +51,30 @@ public class ErpDataServiceImpl implements IErpDataService {
     }
 
     /**
-     * @Method      : getReEstrusRate
+     * @Method : getReEstrusRate
      * @Description : 返情率
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:41
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:41
      */
     @Override
-    public String getReEstrusRate(String startDate,String endDate,String farmName) {
-        log.info(" 开始日期（返情率） startDate:"+startDate);
-        log.info(" 结束日期（返情率） endDate:"+endDate);
-        log.info(" 牧场名称（返情率） farmName:"+farmName);
-        List<Object[]> reEstrusRateFieldList = tDeliveryRepo.getReEstrusRate(startDate,endDate,farmName);
-        log.info(" 返情率查询数量:"+reEstrusRateFieldList.size());
+    public String getReEstrusRate(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（返情率） startDate:" + startDate);
+        log.info(" 结束日期（返情率） endDate:" + endDate);
+        log.info(" 牧场名称（返情率） farmName:" + farmName);
+        List<Object[]> reEstrusRateFieldList = tDeliveryRepo.getReEstrusRate(startDate, endDate, farmName);
+        log.info(" 返情率查询数量:" + reEstrusRateFieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : reEstrusRateFieldList) {
             String farmVal = fieldObj[0].toString();
 //            String varietyVal = fieldObj[1].toString();
             String reEstrusRateVal = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farmVal);
+            dataJo.put("farm", farmVal);
 //            dataJo.put("variety",varietyVal);
-            dataJo.put("reestrus_rate",reEstrusRateVal);
+            dataJo.put("reestrus_rate", reEstrusRateVal);
             resultJa.add(dataJo);
         }
 
@@ -83,30 +82,29 @@ public class ErpDataServiceImpl implements IErpDataService {
     }
 
     /**
-     * @Method      : getParturitionRate
+     * @Method : getParturitionRate
      * @Description : 分娩率
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:41
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:41
      */
     @Override
-    public String getParturitionRate(String startDate,String endDate,String farmName) {
-        log.info(" 开始日期（分娩率） startDate:"+startDate);
-        log.info(" 结束日期（分娩率） endDate:"+endDate);
-        log.info(" 牧场名称（分娩率） farmName:"+farmName);
-        List<Object[]> fieldList = tDeliveryRepo.getParturitionRate(startDate,endDate,farmName);
-        log.info(" 分娩率查询数量:"+fieldList.size());
+    public String getParturitionRate(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（分娩率） startDate:" + startDate);
+        log.info(" 结束日期（分娩率） endDate:" + endDate);
+        log.info(" 牧场名称（分娩率） farmName:" + farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getParturitionRate(startDate, endDate, farmName);
+        log.info(" 分娩率查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farmVal = fieldObj[0].toString();
 //            String varietyVal = fieldObj[1].toString();
             String reEstrusRateVal = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farmVal);
-            dataJo.put("parturition_rate",reEstrusRateVal);
+            dataJo.put("farm", farmVal);
+            dataJo.put("parturition_rate", reEstrusRateVal);
             resultJa.add(dataJo);
         }
 
@@ -114,79 +112,98 @@ public class ErpDataServiceImpl implements IErpDataService {
     }
 
     /**
-     * @Method      : getStorage
+     * @Method : getStorage
      * @Description : 各品种及各自存栏
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:42
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:42
      */
     @Override
     public String getStorage(String farmName) {
-        log.info(" 牧场名称（各品种及各自存栏） farmName:"+farmName);
+        log.info(" 牧场名称（各品种及各自存栏） farmName:" + farmName);
         List<Object[]> fieldList = tDeliveryRepo.getStorage(farmName);
-        log.info(" 各种存栏查询数量:"+fieldList.size());
+        log.info(" 各种存栏查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             //
             String farm = "";
-            if(fieldObj[0] == null){
+            if (fieldObj[0] == null) {
                 farm = "";
-            }else{
+            } else {
                 farm = fieldObj[0].toString();
             }
             //
             String name = "";
-            if(fieldObj[1] == null){
+            if (fieldObj[1] == null) {
                 name = "";
-            }else{
+            } else {
                 name = fieldObj[1].toString();
             }
             //
             String quantity = "";
-            if(quantity == null)
-            {
+            if (quantity == null) {
                 quantity = "";
-            }else{
+            } else {
                 quantity = fieldObj[2].toString();
             }
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
-            dataJo.put("name",name);
-            dataJo.put("quantity",quantity);
+            dataJo.put("farm", farm);
+            dataJo.put("name", name);
+            dataJo.put("quantity", quantity);
             resultJa.add(dataJo);
         }
-        // 返回真实结果
-//        return resultJa.toJSONString();
-        //模拟结果
-        JSONArray demoJa = new JSONArray();
-        JSONObject demoJo1 = new JSONObject();
-        JSONObject demoJo2 = new JSONObject();
-        JSONObject demoJo3 = new JSONObject();
-        JSONObject demoJo4 = new JSONObject();
+        if (isDemo.equalsIgnoreCase("0")) {
+            // 返回真实结果
+            return resultJa.toJSONString();
+        } else {
+            //模拟结果
+            JSONArray demoJa = new JSONArray();
+            JSONObject demoJo1 = new JSONObject();
+            demoJa.add(demoJo1);
+            demoJo1.put("farm", "海盐曙光");
+            demoJo1.put("name", "杜巴嘉");
+            demoJo1.put("quantity", "2873");
 
-        return demoJa.toJSONString();
+            JSONObject demoJo2 = new JSONObject();
+            demoJa.add(demoJo2);
+            demoJo2.put("farm", "海盐曙光");
+            demoJo2.put("name", "杜杜巴嘉");
+            demoJo2.put("quantity", "545");
+
+            JSONObject demoJo3 = new JSONObject();
+            demoJa.add(demoJo3);
+            demoJo3.put("farm", "海盐曙光");
+            demoJo3.put("name", "三元");
+            demoJo3.put("quantity", "555");
+
+            JSONObject demoJo4 = new JSONObject();
+            demoJa.add(demoJo4);
+            demoJo4.put("farm", "海盐曙光");
+            demoJo4.put("name", "嘉兴黑猪");
+            demoJo4.put("quantity", "239");
+
+            return demoJa.toJSONString();
+        }
     }
 
     /**
-     * @Method      : getPigletInfo
+     * @Method : getPigletInfo
      * @Description : 均产仔数，仔猪存活率
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:43
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:43
      */
     @Override
-    public String getPigletInfo(String startDate,String endDate,String farmName) {
-        log.info(" 开始日期（均产仔数，仔猪存活率） startDate:"+startDate);
-        log.info(" 结束日期（均产仔数，仔猪存活率） endDate:"+endDate);
-        log.info(" 牧场名称（均产仔数，仔猪存活率） farmName:"+farmName);
-        List<Object[]> fieldList = tDeliveryRepo.getPigletInfo(startDate,endDate,farmName);
-        log.info(" 均产仔数，仔猪存活率查询数量:"+fieldList.size());
+    public String getPigletInfo(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（均产仔数，仔猪存活率） startDate:" + startDate);
+        log.info(" 结束日期（均产仔数，仔猪存活率） endDate:" + endDate);
+        log.info(" 牧场名称（均产仔数，仔猪存活率） farmName:" + farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getPigletInfo(startDate, endDate, farmName);
+        log.info(" 均产仔数，仔猪存活率查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farm = fieldObj[0].toString();
@@ -194,10 +211,10 @@ public class ErpDataServiceImpl implements IErpDataService {
             String total = fieldObj[2].toString();
             String dead_quantity = fieldObj[3].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
-            dataJo.put("birth_number",birth_number);
-            dataJo.put("total",total);
-            dataJo.put("dead_quantity",dead_quantity);
+            dataJo.put("farm", farm);
+            dataJo.put("birth_number", birth_number);
+            dataJo.put("total", total);
+            dataJo.put("dead_quantity", dead_quantity);
             resultJa.add(dataJo);
         }
 
@@ -205,31 +222,30 @@ public class ErpDataServiceImpl implements IErpDataService {
     }
 
     /**
-     * @Method      : getMateQuantity
+     * @Method : getMateQuantity
      * @Description : 配种数量
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:44
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:44
      */
     @Override
-    public String getMateQuantity(String startDate, String endDate,String farmName) {
-        log.info(" 开始日期（配种数量） startDate:"+startDate);
-        log.info(" 结束日期（配种数量） endDate:"+endDate);
-        log.info(" 牧场名称（配种数量） farmName:"+farmName);
-        List<Object[]> fieldList = tDeliveryRepo.getMateQuantity(startDate,endDate,farmName);
-        log.info(" 配种查询数量:"+fieldList.size());
+    public String getMateQuantity(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（配种数量） startDate:" + startDate);
+        log.info(" 结束日期（配种数量） endDate:" + endDate);
+        log.info(" 牧场名称（配种数量） farmName:" + farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getMateQuantity(startDate, endDate, farmName);
+        log.info(" 配种查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farm = fieldObj[0].toString();
 //            String variety = fieldObj[1].toString();
             String mate_quantity = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
+            dataJo.put("farm", farm);
 //            dataJo.put("variety",variety);
-            dataJo.put("mate_quantity",mate_quantity);
+            dataJo.put("mate_quantity", mate_quantity);
             resultJa.add(dataJo);
         }
 
@@ -237,89 +253,87 @@ public class ErpDataServiceImpl implements IErpDataService {
     }
 
     /**
-     * @Method      : getConceptionRate
+     * @Method : getConceptionRate
      * @Description : 受胎率
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:45
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:45
      */
     @Override
-    public String getConceptionRate(String startDate, String endDate,String farmName) {
-        log.info(" 开始日期（受胎率） startDate:"+startDate);
-        log.info(" 结束日期（受胎率） endDate:"+endDate);
-        log.info(" 牧场名称（受胎率） farmName:"+farmName);
-        List<Object[]> fieldList = tDeliveryRepo.getConceptionRate(startDate,endDate,farmName);
-        log.info(" 受胎率查询数量:"+fieldList.size());
+    public String getConceptionRate(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（受胎率） startDate:" + startDate);
+        log.info(" 结束日期（受胎率） endDate:" + endDate);
+        log.info(" 牧场名称（受胎率） farmName:" + farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getConceptionRate(startDate, endDate, farmName);
+        log.info(" 受胎率查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farm = fieldObj[0].toString();
             String conception_rate = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
-            dataJo.put("conception_rate",conception_rate);
+            dataJo.put("farm", farm);
+            dataJo.put("conception_rate", conception_rate);
             resultJa.add(dataJo);
         }
         return resultJa.toJSONString();
     }
 
     /**
-     * @Method      : getAllStorage
+     * @Method : getAllStorage
      * @Description : 总存栏，母猪存栏
-     * @Params      : []
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/5/15       
-     * @Time        : 11:45
+     * @Params : []
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/5/15
+     * @Time : 11:45
      */
     @Override
     public String getAllStorage(String farmName) {
-        log.info(" 牧场名称（总存栏，母猪存栏） farmName:"+farmName);
+        log.info(" 牧场名称（总存栏，母猪存栏） farmName:" + farmName);
         List<Object[]> fieldList = tDeliveryRepo.getAllStorage(farmName);
-        log.info(" 总存栏，母猪存栏查询数量:"+fieldList.size());
+        log.info(" 总存栏，母猪存栏查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farm = fieldObj[0].toString();
             String sow_quantity = fieldObj[1].toString();
             String total = fieldObj[2].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
-            dataJo.put("sow_quantity",sow_quantity);
-            dataJo.put("total",total);
+            dataJo.put("farm", farm);
+            dataJo.put("sow_quantity", sow_quantity);
+            dataJo.put("total", total);
             resultJa.add(dataJo);
         }
         return resultJa.toJSONString();
     }
 
     /**
-     * @Method      : getPigletSurvivalRate
+     * @Method : getPigletSurvivalRate
      * @Description : 仔猪存活率
-     * @Params      : [startDate, endDate, farmName]
-     * @Return      : java.lang.Object
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/6/30       
-     * @Time        : 13:28
+     * @Params : [startDate, endDate, farmName]
+     * @Return : java.lang.Object
+     * @Author : ZhuoNing
+     * @Date : 2021/6/30
+     * @Time : 13:28
      */
     @Override
     public Object getPigletSurvivalRate(String startDate, String endDate, String farmID) {
-        log.info(" 开始日期（仔猪存活率） startDate:"+startDate);
-        log.info(" 结束日期（仔猪存活率） endDate:"+endDate);
-        log.info(" 牧场名称（仔猪存活率） farmID:"+farmID);
-        List<Object[]> fieldList = tDeliveryRepo.getPigletSurvivalRate(startDate,endDate,farmID);
-        log.info(" 仔猪存活率查询数量:"+fieldList.size());
+        log.info(" 开始日期（仔猪存活率） startDate:" + startDate);
+        log.info(" 结束日期（仔猪存活率） endDate:" + endDate);
+        log.info(" 牧场名称（仔猪存活率） farmID:" + farmID);
+        List<Object[]> fieldList = tDeliveryRepo.getPigletSurvivalRate(startDate, endDate, farmID);
+        log.info(" 仔猪存活率查询数量:" + fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
-            String pigletSurvivalRate= fieldObj[1].toString();
-            String farm  = fieldObj[0].toString();
+            String pigletSurvivalRate = fieldObj[0].toString();
+            String farm = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
-            dataJo.put("farm",farm);
-            dataJo.put("piglet_survival_rate",pigletSurvivalRate);
+            dataJo.put("farm", farm);
+            dataJo.put("piglet_survival_rate", pigletSurvivalRate);
             resultJa.add(dataJo);
         }
+        System.out.println("resultJa>>" + resultJa);
         return resultJa.toJSONString();
     }
 }

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

@@ -5,7 +5,8 @@ spring:
     name: huimv-hy-erp-datasource
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://115.238.57.190:1433;DatabaseName=yz
+#    url: jdbc:sqlserver://115.238.57.190:1433;DatabaseName=qlyz
+    url: jdbc:sqlserver://192.168.1.8:1433;DatabaseName=qlyz
     username: sa
     password: hm123456@
     maxActive: 20
@@ -19,7 +20,6 @@ spring:
     testOnBorrow: true
     testOnReturn: true
     poolPreparedStatements: true
-
     maxOpenPreparedStatements: 20
   jpa:
     show-sql: true

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

@@ -5,7 +5,7 @@ spring:
     name: huimv-hy-erp-datasource
   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.8:1433;DatabaseName=qlyz
     username: sa
     password: hm123456@
     maxActive: 20

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

@@ -1,3 +1,4 @@
 spring.profiles.active=prod
 
-apiService.client= 20210501
+apiService.client= 20210501
+apiService.data.getStorage.isDemo=1