添加从工作计划接口取数和数据入库功能；

添加从待分娩、待断奶和待配种接口取数和数据入库功能；

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/entity/ProdSowPigletStatusEntity.java

@@ -0,0 +1,104 @@
+package com.huimv.production.autoGetData.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "prod_sow_piglet_status")
+public class ProdSowPigletStatusEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "farm_name")
+    private String farmName;
+
+    @Column(name = "status_1")
+    private Integer status1;
+
+    @Column(name = "status_2")
+    private Integer status2;
+
+    @Column(name = "status_3")
+    private Integer status3;
+
+    @Column(name = "add_date")
+    private Date addDate;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setFarmName(String farmName) {
+        this.farmName = farmName;
+    }
+
+    public String getFarmName() {
+        return farmName;
+    }
+
+    public void setStatus1(Integer status1) {
+        this.status1 = status1;
+    }
+
+    public Integer getStatus1() {
+        return status1;
+    }
+
+    public void setStatus2(Integer status2) {
+        this.status2 = status2;
+    }
+
+    public Integer getStatus2() {
+        return status2;
+    }
+
+    public void setStatus3(Integer status3) {
+        this.status3 = status3;
+    }
+
+    public Integer getStatus3() {
+        return status3;
+    }
+
+    public void setAddDate(Date addDate) {
+        this.addDate = addDate;
+    }
+
+    public Date getAddDate() {
+        return addDate;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdSowPigletStatusEntity{" +
+                "id=" + id + '\'' +
+                "farmId=" + farmId + '\'' +
+                "farmName=" + farmName + '\'' +
+                "status1=" + status1 + '\'' +
+                "status2=" + status2 + '\'' +
+                "status3=" + status3 + '\'' +
+                "addDate=" + addDate + '\'' +
+                '}';
+    }
+}

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/entity/ProdWorkPlanEntity.java

@@ -0,0 +1,104 @@
+package com.huimv.production.autoGetData.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "prod_work_plan")
+public class ProdWorkPlanEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "farm_name")
+    private String farmName;
+
+    @Column(name = "plan_times")
+    private Integer planTimes;
+
+    @Column(name = "pig_quantity")
+    private Integer pigQuantity;
+
+    @Column(name = "plan_name")
+    private String planName;
+
+    @Column(name = "add_time")
+    private Date addTime;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setFarmName(String farmName) {
+        this.farmName = farmName;
+    }
+
+    public String getFarmName() {
+        return farmName;
+    }
+
+    public void setPlanTimes(Integer planTimes) {
+        this.planTimes = planTimes;
+    }
+
+    public Integer getPlanTimes() {
+        return planTimes;
+    }
+
+    public void setPigQuantity(Integer pigQuantity) {
+        this.pigQuantity = pigQuantity;
+    }
+
+    public Integer getPigQuantity() {
+        return pigQuantity;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdWorkPlanEntity{" +
+                "id=" + id + '\'' +
+                "farmId=" + farmId + '\'' +
+                "farmName=" + farmName + '\'' +
+                "planTimes=" + planTimes + '\'' +
+                "pigQuantity=" + pigQuantity + '\'' +
+                "planName=" + planName + '\'' +
+                "addTime=" + addTime + '\'' +
+                '}';
+    }
+}

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/repo/ProdSowPigletStatusRepo.java

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

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/repo/ProdWorkPlanRepo.java

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

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/service/IAutoGetErpData.java

@@ -31,5 +31,23 @@ public interface IAutoGetErpData {
 
     void getCostWithManyFarm() throws IOException;
 
+    //预警接口取数
     void getWarningMessage() throws IOException, ParseException;
+
+    //工作计划接口取数
+    void getWorkPlan() throws IOException, ParseException;
+
+    //待分娩、待配种、待断奶接口取数
+    void getPrepareStatusQuantity() throws IOException, ParseException;
+
+    //应付接口取数（无数据）
+    void getPayable();
+
+    //销售接口取数
+    void getSales();
+
+
+
+
+
 }

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/service/impl/AutoGetErpDataImpl.java

@@ -24,6 +24,8 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.*;
 
+import static org.apache.tomcat.jni.Time.now;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -47,6 +49,12 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
     private String apiPort;
     @Value("${erp.datasource.serviceName}")
     private String serviceName;
+    @Value("${timeout.connectTimeout}")
+    private String connectTimeout;
+    @Value("${timeout.requestTimeout}")
+    private String requestTimeout;
+    @Value("${timeout.socketTimeout}")
+    private String socketTimeout;
     @Autowired
     private HttpTemplete httpClientUtil;
     @Autowired
@@ -65,6 +73,8 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
     private ProdStockRepo prodStockRepo;
     @Autowired
     private MathUtil mathUtil;
+    @Autowired
+    private ProdWorkPlanRepo workPlanRepo;
 
     //PSY
     @Override
@@ -449,7 +459,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
             JSONObject contentJo = outJo.getJSONObject("content");
             if (contentJo.getBoolean("success")) {
                 JSONArray dataJa = contentJo.getJSONArray("data");
-                if(dataJa.size()>0){
+                if (dataJa.size() > 0) {
                     //获取牧场所有名称数据
                     List<ProdFarmNameEntity> farmNameEntityList = prodFarmNameRepo.findAll();
 
@@ -459,7 +469,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity1.setYear(Integer.parseInt(year));
                     delStockEntity1.setMonth(Integer.parseInt(month));
                     delStockEntity1.setStockType("grice_rate");
-                    Example<ProdStockEntity> example1 =Example.of(delStockEntity1);
+                    Example<ProdStockEntity> example1 = Example.of(delStockEntity1);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example10).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example1));
                     //删除保育成活率
@@ -467,216 +477,212 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity2.setYear(Integer.parseInt(year));
                     delStockEntity2.setMonth(Integer.parseInt(month));
                     delStockEntity2.setStockType("piglet_rate");
-                    Example<ProdStockEntity> example2 =Example.of(delStockEntity2);
+                    Example<ProdStockEntity> example2 = Example.of(delStockEntity2);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example2));
                     //删除育肥成活率
                     ProdStockEntity delStockEntity3 = new ProdStockEntity();
                     delStockEntity3.setYear(Integer.parseInt(year));
                     delStockEntity3.setMonth(Integer.parseInt(month));
                     delStockEntity3.setStockType("fatpig_rate");
-                    Example<ProdStockEntity> example3 =Example.of(delStockEntity3);
+                    Example<ProdStockEntity> example3 = Example.of(delStockEntity3);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example3));
                     //删除7日内断配率
                     ProdStockEntity delStockEntity4 = new ProdStockEntity();
                     delStockEntity4.setYear(Integer.parseInt(year));
                     delStockEntity4.setMonth(Integer.parseInt(month));
                     delStockEntity4.setStockType("break_rate");
-                    Example<ProdStockEntity> example4 =Example.of(delStockEntity4);
+                    Example<ProdStockEntity> example4 = Example.of(delStockEntity4);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example4));
                     //删除平均窝产仔猪
                     ProdStockEntity delStockEntity5 = new ProdStockEntity();
                     delStockEntity5.setYear(Integer.parseInt(year));
                     delStockEntity5.setMonth(Integer.parseInt(month));
                     delStockEntity5.setStockType("avg_farrow_1");
-                    Example<ProdStockEntity> example5 =Example.of(delStockEntity5);
+                    Example<ProdStockEntity> example5 = Example.of(delStockEntity5);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example5));
                     //删除平均窝产活仔数
                     ProdStockEntity delStockEntity6 = new ProdStockEntity();
                     delStockEntity6.setYear(Integer.parseInt(year));
                     delStockEntity6.setMonth(Integer.parseInt(month));
                     delStockEntity6.setStockType("avg_farrow_2");
-                    Example<ProdStockEntity> example6 =Example.of(delStockEntity6);
+                    Example<ProdStockEntity> example6 = Example.of(delStockEntity6);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example6));
                     //删除平均窝产正常仔数
                     ProdStockEntity delStockEntity7 = new ProdStockEntity();
                     delStockEntity7.setYear(Integer.parseInt(year));
                     delStockEntity7.setMonth(Integer.parseInt(month));
                     delStockEntity7.setStockType("avg_farrow_3");
-                    Example<ProdStockEntity> example7 =Example.of(delStockEntity7);
+                    Example<ProdStockEntity> example7 = Example.of(delStockEntity7);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example7));
                     //删除窝断奶仔猪数
                     ProdStockEntity delStockEntity8 = new ProdStockEntity();
                     delStockEntity8.setYear(Integer.parseInt(year));
                     delStockEntity8.setMonth(Integer.parseInt(month));
                     delStockEntity8.setStockType("break_grice");
-                    Example<ProdStockEntity> example8 =Example.of(delStockEntity8);
+                    Example<ProdStockEntity> example8 = Example.of(delStockEntity8);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example8));
                     //删除平均窝断奶重
                     ProdStockEntity delStockEntity9 = new ProdStockEntity();
                     delStockEntity9.setYear(Integer.parseInt(year));
                     delStockEntity9.setMonth(Integer.parseInt(month));
                     delStockEntity9.setStockType("avg_weight");
-                    Example<ProdStockEntity> example9 =Example.of(delStockEntity9);
+                    Example<ProdStockEntity> example9 = Example.of(delStockEntity9);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example9));
                     //删除产房成活率
                     ProdStockEntity delStockEntity10 = new ProdStockEntity();
                     delStockEntity10.setYear(Integer.parseInt(year));
                     delStockEntity10.setMonth(Integer.parseInt(month));
                     delStockEntity10.setStockType("nest_times");
-                    Example<ProdStockEntity> example10 =Example.of(delStockEntity10);
+                    Example<ProdStockEntity> example10 = Example.of(delStockEntity10);
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example10));
-                    //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-                // 添加入库
-                for (int a = 0; a < dataJa.size(); a++) {
-                    JSONObject dataJo = dataJa.getJSONObject(a);
-                    System.out.println((a + 1) + " " + dataJo);
-                    String fullName = dataJo.getString("mcmc");
-                    //
-                   int farmId =  _getFarmIdByFullName(fullName,farmNameEntityList);
-                    //产房成活率
-                    String cfchl = dataJo.getString("cfchl");
-                    if(cfchl == null || cfchl.trim().length()==0){
-                        cfchl = "0";
-                    }
-                    ProdStockEntity stockEntity1 = new ProdStockEntity();
-                    stockEntity1.setFarmId(farmId);
-                    stockEntity1.setStockType("grice_rate");
-                    stockEntity1.setStockName("产房成活率");
-                    stockEntity1.setStockQuantity(mathUtil.countRate(Float.parseFloat(cfchl),1));
+                    // 添加入库
+                    for (int a = 0; a < dataJa.size(); a++) {
+                        JSONObject dataJo = dataJa.getJSONObject(a);
+                        System.out.println((a + 1) + " " + dataJo);
+                        String fullName = dataJo.getString("mcmc");
+                        //
+                        int farmId = _getFarmIdByFullName(fullName, farmNameEntityList);
+                        //产房成活率
+                        String cfchl = dataJo.getString("cfchl");
+                        if (cfchl == null || cfchl.trim().length() == 0) {
+                            cfchl = "0";
+                        }
+                        ProdStockEntity stockEntity1 = new ProdStockEntity();
+                        stockEntity1.setFarmId(farmId);
+                        stockEntity1.setStockType("grice_rate");
+                        stockEntity1.setStockName("产房成活率");
+                        stockEntity1.setStockQuantity(mathUtil.countRate(Float.parseFloat(cfchl), 1));
 //                    stockEntity1.setRate();
-                    stockEntity1.setMonth(Integer.valueOf(month));
-                    stockEntity1.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity1);
-
-                    //保育成活率
-                    String bychl = dataJo.getString("bychl");
-                    if(bychl == null || bychl.trim().length()==0){
-                        bychl = "0";
-                    }
-                    ProdStockEntity stockEntity2 = new ProdStockEntity();
-                    stockEntity2.setFarmId(farmId);
-                    stockEntity2.setStockType("piglet_rate");
-                    stockEntity2.setStockName("保育成活率");
-                    stockEntity2.setStockQuantity(mathUtil.countRate(Float.parseFloat(bychl),1));
+                        stockEntity1.setMonth(Integer.valueOf(month));
+                        stockEntity1.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity1);
+
+                        //保育成活率
+                        String bychl = dataJo.getString("bychl");
+                        if (bychl == null || bychl.trim().length() == 0) {
+                            bychl = "0";
+                        }
+                        ProdStockEntity stockEntity2 = new ProdStockEntity();
+                        stockEntity2.setFarmId(farmId);
+                        stockEntity2.setStockType("piglet_rate");
+                        stockEntity2.setStockName("保育成活率");
+                        stockEntity2.setStockQuantity(mathUtil.countRate(Float.parseFloat(bychl), 1));
 //                    stockEntity2.setRate();
-                    stockEntity2.setMonth(Integer.valueOf(month));
-                    stockEntity2.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity2);
-                    //肥猪成活率
-                    String fzchl = dataJo.getString("fzchl");
-                    if(fzchl == null || fzchl.trim().length()==0){
-                        fzchl = "0";
-                    }
-                    ProdStockEntity stockEntity3 = new ProdStockEntity();
-                    stockEntity3.setFarmId(farmId);
-                    stockEntity3.setStockType("fatpig_rate");
-                    stockEntity3.setStockName("肥猪成活率");
-                    stockEntity3.setStockQuantity(mathUtil.countRate(Float.parseFloat(fzchl),1));
+                        stockEntity2.setMonth(Integer.valueOf(month));
+                        stockEntity2.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity2);
+                        //肥猪成活率
+                        String fzchl = dataJo.getString("fzchl");
+                        if (fzchl == null || fzchl.trim().length() == 0) {
+                            fzchl = "0";
+                        }
+                        ProdStockEntity stockEntity3 = new ProdStockEntity();
+                        stockEntity3.setFarmId(farmId);
+                        stockEntity3.setStockType("fatpig_rate");
+                        stockEntity3.setStockName("肥猪成活率");
+                        stockEntity3.setStockQuantity(mathUtil.countRate(Float.parseFloat(fzchl), 1));
 //                    stockEntity3.setRate();
-                    stockEntity3.setMonth(Integer.valueOf(month));
-                    stockEntity3.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity3);
-                    //平均窝产仔猪
-                    String pjwczz = dataJo.getString("pjwczz");
-                    if(pjwczz == null || pjwczz.trim().length()==0){
-                        pjwczz = "0";
-                    }
-                    ProdStockEntity stockEntity4 = new ProdStockEntity();
-                    stockEntity4.setFarmId(farmId);
-                    stockEntity4.setStockType("avg_farrow_1");
-                    stockEntity4.setStockName("平均窝产仔猪");
-                    stockEntity4.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczz),1));
+                        stockEntity3.setMonth(Integer.valueOf(month));
+                        stockEntity3.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity3);
+                        //平均窝产仔猪
+                        String pjwczz = dataJo.getString("pjwczz");
+                        if (pjwczz == null || pjwczz.trim().length() == 0) {
+                            pjwczz = "0";
+                        }
+                        ProdStockEntity stockEntity4 = new ProdStockEntity();
+                        stockEntity4.setFarmId(farmId);
+                        stockEntity4.setStockType("avg_farrow_1");
+                        stockEntity4.setStockName("平均窝产仔猪");
+                        stockEntity4.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczz), 1));
 //                    stockEntity4.setRate();
-                    stockEntity4.setMonth(Integer.valueOf(month));
-                    stockEntity4.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity4);
-                    //平均窝产活仔数
-                    String pjwchzs = dataJo.getString("pjwchzs");
-                    if(pjwchzs == null || pjwchzs.trim().length()==0){
-                        pjwchzs = "0";
-                    }
-                    ProdStockEntity stockEntity5 = new ProdStockEntity();
-                    stockEntity5.setFarmId(farmId);
-                    stockEntity5.setStockType("avg_farrow_2");
-                    stockEntity5.setStockName("平均窝产活仔数");
-                    stockEntity5.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwchzs),1));
+                        stockEntity4.setMonth(Integer.valueOf(month));
+                        stockEntity4.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity4);
+                        //平均窝产活仔数
+                        String pjwchzs = dataJo.getString("pjwchzs");
+                        if (pjwchzs == null || pjwchzs.trim().length() == 0) {
+                            pjwchzs = "0";
+                        }
+                        ProdStockEntity stockEntity5 = new ProdStockEntity();
+                        stockEntity5.setFarmId(farmId);
+                        stockEntity5.setStockType("avg_farrow_2");
+                        stockEntity5.setStockName("平均窝产活仔数");
+                        stockEntity5.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwchzs), 1));
 //                    stockEntity5.setRate();
-                    stockEntity5.setMonth(Integer.valueOf(month));
-                    stockEntity5.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity5);
-                    //平均窝产正常仔数
-                    String pjwczczs = dataJo.getString("pjwczczs");
-                    if(pjwczczs == null || pjwczczs.trim().length()==0){
-                        pjwczczs = "0";
-                    }
-                    ProdStockEntity stockEntity6 = new ProdStockEntity();
-                    stockEntity6.setFarmId(farmId);
-                    stockEntity6.setStockType("avg_farrow_3");
-                    stockEntity6.setStockName("平均窝产正常仔数");
-                    stockEntity6.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczczs),1));
+                        stockEntity5.setMonth(Integer.valueOf(month));
+                        stockEntity5.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity5);
+                        //平均窝产正常仔数
+                        String pjwczczs = dataJo.getString("pjwczczs");
+                        if (pjwczczs == null || pjwczczs.trim().length() == 0) {
+                            pjwczczs = "0";
+                        }
+                        ProdStockEntity stockEntity6 = new ProdStockEntity();
+                        stockEntity6.setFarmId(farmId);
+                        stockEntity6.setStockType("avg_farrow_3");
+                        stockEntity6.setStockName("平均窝产正常仔数");
+                        stockEntity6.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjwczczs), 1));
 //                    stockEntity6.setRate();
-                    stockEntity6.setMonth(Integer.valueOf(month));
-                    stockEntity6.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity6);
-                    //窝断奶仔猪数
-                    String wdnzzs = dataJo.getString("wdnzzs");
-                    if(wdnzzs == null || wdnzzs.trim().length()==0){
-                        wdnzzs = "0";
-                    }
-                    ProdStockEntity stockEntity7 = new ProdStockEntity();
-                    stockEntity7.setFarmId(farmId);
-                    stockEntity7.setStockType("break_grice");
-                    stockEntity7.setStockName("窝断奶仔猪数");
-                    stockEntity7.setStockQuantity(mathUtil.countRate(Float.parseFloat(wdnzzs),1));
+                        stockEntity6.setMonth(Integer.valueOf(month));
+                        stockEntity6.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity6);
+                        //窝断奶仔猪数
+                        String wdnzzs = dataJo.getString("wdnzzs");
+                        if (wdnzzs == null || wdnzzs.trim().length() == 0) {
+                            wdnzzs = "0";
+                        }
+                        ProdStockEntity stockEntity7 = new ProdStockEntity();
+                        stockEntity7.setFarmId(farmId);
+                        stockEntity7.setStockType("break_grice");
+                        stockEntity7.setStockName("窝断奶仔猪数");
+                        stockEntity7.setStockQuantity(mathUtil.countRate(Float.parseFloat(wdnzzs), 1));
 //                    stockEntity7.setRate();
-                    stockEntity7.setMonth(Integer.valueOf(month));
-                    stockEntity7.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity7);
-                    //平均断奶窝重
-                    String pjdnwz = dataJo.getString("pjdnwz");
-                    if(pjdnwz == null || pjdnwz.trim().length()==0){
-                        pjdnwz = "0";
-                    }
-                    ProdStockEntity stockEntity8 = new ProdStockEntity();
-                    stockEntity8.setFarmId(farmId);
-                    stockEntity8.setStockType("avg_weight");
-                    stockEntity8.setStockName("平均断奶窝重");
-                    stockEntity8.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjdnwz),1));
+                        stockEntity7.setMonth(Integer.valueOf(month));
+                        stockEntity7.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity7);
+                        //平均断奶窝重
+                        String pjdnwz = dataJo.getString("pjdnwz");
+                        if (pjdnwz == null || pjdnwz.trim().length() == 0) {
+                            pjdnwz = "0";
+                        }
+                        ProdStockEntity stockEntity8 = new ProdStockEntity();
+                        stockEntity8.setFarmId(farmId);
+                        stockEntity8.setStockType("avg_weight");
+                        stockEntity8.setStockName("平均断奶窝重");
+                        stockEntity8.setStockQuantity(mathUtil.countRate(Float.parseFloat(pjdnwz), 1));
 //                    stockEntity8.setRate();
-                    stockEntity8.setMonth(Integer.valueOf(month));
-                    stockEntity8.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity8);
-                    //7日断配率
-                    String dpl7r = dataJo.getString("7rdpl");
-                    if(dpl7r == null || dpl7r.trim().length()==0){
-                        dpl7r = "0";
-                    }
-                    ProdStockEntity stockEntity9 = new ProdStockEntity();
-                    stockEntity9.setFarmId(farmId);
-                    stockEntity9.setStockType("break_rate");
-                    stockEntity9.setStockName("7日断配率");
-                    stockEntity9.setStockQuantity(mathUtil.countRate(Float.parseFloat(dpl7r),1));
+                        stockEntity8.setMonth(Integer.valueOf(month));
+                        stockEntity8.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity8);
+                        //7日断配率
+                        String dpl7r = dataJo.getString("7rdpl");
+                        if (dpl7r == null || dpl7r.trim().length() == 0) {
+                            dpl7r = "0";
+                        }
+                        ProdStockEntity stockEntity9 = new ProdStockEntity();
+                        stockEntity9.setFarmId(farmId);
+                        stockEntity9.setStockType("break_rate");
+                        stockEntity9.setStockName("7日断配率");
+                        stockEntity9.setStockQuantity(mathUtil.countRate(Float.parseFloat(dpl7r), 1));
 //                    stockEntity9.setRate();
-                    stockEntity9.setMonth(Integer.valueOf(month));
-                    stockEntity9.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity9);
-                    //年产窝数
-                    String ncws = dataJo.getString("ncws");
-                    if(ncws == null || ncws.length()==0){
-                        ncws = "0";
-                    }
-                    ProdStockEntity stockEntity10 = new ProdStockEntity();
-                    stockEntity10.setFarmId(farmId);
-                    stockEntity10.setStockType("nest_times");
-                    stockEntity10.setStockName("年产窝数");
-                    stockEntity10.setStockQuantity(mathUtil.countRate(Float.parseFloat(ncws),1));
+                        stockEntity9.setMonth(Integer.valueOf(month));
+                        stockEntity9.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity9);
+                        //年产窝数
+                        String ncws = dataJo.getString("ncws");
+                        if (ncws == null || ncws.length() == 0) {
+                            ncws = "0";
+                        }
+                        ProdStockEntity stockEntity10 = new ProdStockEntity();
+                        stockEntity10.setFarmId(farmId);
+                        stockEntity10.setStockType("nest_times");
+                        stockEntity10.setStockName("年产窝数");
+                        stockEntity10.setStockQuantity(mathUtil.countRate(Float.parseFloat(ncws), 1));
 //                    stockEntity10.setRate();
-                    stockEntity10.setMonth(Integer.valueOf(month));
-                    stockEntity10.setYear(Integer.parseInt(year));
-                    prodStockRepo.saveAndFlush(stockEntity10);
-
-                    //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                        stockEntity10.setMonth(Integer.valueOf(month));
+                        stockEntity10.setYear(Integer.parseInt(year));
+                        prodStockRepo.saveAndFlush(stockEntity10);
                     }
                 }
             } else {
@@ -700,7 +706,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
             }
         }
         if (!isExist) {
-            log.info("牧场简称‘" + pigfarm + "’在prod_farm_name表中不存在对应的数据.");
+            log.info("牧场全称‘" + pigfarm + "’在prod_farm_name表中不存在对应的数据.");
         }
         return farmId;
     }
@@ -723,9 +729,9 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
         paramsMap.put("sign", "7fa431325504e01e9fa87ed0e274c40c");
 
         Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
-        timeoutMap.put("connectTimeout", 5000);
-        timeoutMap.put("requestTimeout", 5000);
-        timeoutMap.put("socketTimeout", 5000);
+        timeoutMap.put("connectTimeout", Integer.parseInt(connectTimeout));
+        timeoutMap.put("requestTimeout", Integer.parseInt(requestTimeout));
+        timeoutMap.put("socketTimeout", Integer.parseInt(socketTimeout));
         String url = apiIp + apiPort + "/token/getToken";
         //
         JSONObject outJo = httpClientUtil.doGet(url, paramsMap, timeoutMap);
@@ -770,7 +776,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity1.setYear(Integer.parseInt(year));
                     delStockEntity1.setMonth(Integer.parseInt(month));
                     delStockEntity1.setStockType("sow_stock");
-                    Example<ProdStockEntity> example =Example.of(delStockEntity1);
+                    Example<ProdStockEntity> example = Example.of(delStockEntity1);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example));
                     //公猪存栏
@@ -778,7 +784,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity2.setYear(Integer.parseInt(year));
                     delStockEntity2.setMonth(Integer.parseInt(month));
                     delStockEntity2.setStockType("boar_stock");
-                    Example<ProdStockEntity> example2 =Example.of(delStockEntity2);
+                    Example<ProdStockEntity> example2 = Example.of(delStockEntity2);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example2).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example2));
                     //哺乳猪存栏/仔猪存栏
@@ -786,7 +792,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity3.setYear(Integer.parseInt(year));
                     delStockEntity3.setMonth(Integer.parseInt(month));
                     delStockEntity3.setStockType("grice_stock");
-                    Example<ProdStockEntity> example3 =Example.of(delStockEntity3);
+                    Example<ProdStockEntity> example3 = Example.of(delStockEntity3);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example3).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example3));
                     //保育猪存栏
@@ -794,7 +800,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity4.setYear(Integer.parseInt(year));
                     delStockEntity4.setMonth(Integer.parseInt(month));
                     delStockEntity4.setStockType("piglet_stock");
-                    Example<ProdStockEntity> example4 =Example.of(delStockEntity4);
+                    Example<ProdStockEntity> example4 = Example.of(delStockEntity4);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example4).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example4));
                     //育肥猪存栏
@@ -802,7 +808,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity5.setYear(Integer.parseInt(year));
                     delStockEntity5.setMonth(Integer.parseInt(month));
                     delStockEntity5.setStockType("fatpig_stock");
-                    Example<ProdStockEntity> example5 =Example.of(delStockEntity5);
+                    Example<ProdStockEntity> example5 = Example.of(delStockEntity5);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example5).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example5));
                     //总存栏
@@ -810,7 +816,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity6.setYear(Integer.parseInt(year));
                     delStockEntity6.setMonth(Integer.parseInt(month));
                     delStockEntity6.setStockType("total_stock");
-                    Example<ProdStockEntity> example6 =Example.of(delStockEntity6);
+                    Example<ProdStockEntity> example6 = Example.of(delStockEntity6);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example6).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example6));
                     //妊娠
@@ -818,7 +824,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity7.setYear(Integer.parseInt(year));
                     delStockEntity7.setMonth(Integer.parseInt(month));
                     delStockEntity7.setStockType("sow_stock_1");
-                    Example<ProdStockEntity> example7 =Example.of(delStockEntity7);
+                    Example<ProdStockEntity> example7 = Example.of(delStockEntity7);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example7).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example7));
                     //哺乳
@@ -826,7 +832,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity8.setYear(Integer.parseInt(year));
                     delStockEntity8.setMonth(Integer.parseInt(month));
                     delStockEntity8.setStockType("sow_stock_2");
-                    Example<ProdStockEntity> example8 =Example.of(delStockEntity8);
+                    Example<ProdStockEntity> example8 = Example.of(delStockEntity8);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example8).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example8));
                     //空怀(空怀包含返情)
@@ -835,7 +841,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity9.setMonth(Integer.parseInt(month));
                     delStockEntity9.setStockType("sow_stock_3");
                     prodStockRepo.delete(delStockEntity9);
-                    Example<ProdStockEntity> example9 =Example.of(delStockEntity9);
+                    Example<ProdStockEntity> example9 = Example.of(delStockEntity9);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example9).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example9));
                     //后备
@@ -843,7 +849,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     delStockEntity10.setYear(Integer.parseInt(year));
                     delStockEntity10.setMonth(Integer.parseInt(month));
                     delStockEntity10.setStockType("sow_stock_5");
-                    Example<ProdStockEntity> example10 =Example.of(delStockEntity10);
+                    Example<ProdStockEntity> example10 = Example.of(delStockEntity10);
 //                    prodStockRepo.delete(prodStockRepo.findOne(example10).get());
                     prodStockRepo.deleteAll(prodStockRepo.findAll(example10));
 //                    prodStockRepo.deleteByYearAndMonth(Integer.parseInt(year),Integer.parseInt(month));
@@ -852,7 +858,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                     for (int a = 0; a < dataJa.size(); a++) {
                         JSONObject dataJo = dataJa.getJSONObject(a);
                         System.out.println((a + 1) + " " + dataJo);
-                        int farmId = _getFarmId2(dataJo.getString("mcmc"), farmNameEntityList);
+                        int farmId = _getFarmIdByShortName(dataJo.getString("mcmc"), farmNameEntityList);
                         int mz = dataJo.getInteger("mz");
                         int gz = dataJo.getInteger("gz");
                         int zz = dataJo.getInteger("zz");
@@ -866,7 +872,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity1.setStockType("sow_stock");
                         stockEntity1.setStockName("母猪存栏");
                         stockEntity1.setStockQuantity(dataJo.getString("mz"));
-                        stockEntity1.setRate(Float.parseFloat(mathUtil.countRate(mz,total,1)));
+                        stockEntity1.setRate(Float.parseFloat(mathUtil.countRate(mz, total, 1)));
                         stockEntity1.setMonth(Integer.valueOf(month));
                         stockEntity1.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity1);
@@ -876,7 +882,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity2.setStockType("boar_stock");
                         stockEntity2.setStockName("公猪存栏");
                         stockEntity2.setStockQuantity(dataJo.getString("gz"));
-                        stockEntity2.setRate(Float.parseFloat(mathUtil.countRate(gz,total,1)));
+                        stockEntity2.setRate(Float.parseFloat(mathUtil.countRate(gz, total, 1)));
                         stockEntity2.setMonth(Integer.valueOf(month));
                         stockEntity2.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity2);
@@ -886,7 +892,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity3.setStockType("grice_stock");
                         stockEntity3.setStockName("哺乳猪存栏");
                         stockEntity3.setStockQuantity(dataJo.getString("zz"));
-                        stockEntity3.setRate(Float.parseFloat(mathUtil.countRate(zz,total,1)));
+                        stockEntity3.setRate(Float.parseFloat(mathUtil.countRate(zz, total, 1)));
                         stockEntity3.setMonth(Integer.valueOf(month));
                         stockEntity3.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity3);
@@ -896,7 +902,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity4.setStockType("piglet_stock");
                         stockEntity4.setStockName("保育猪存栏");
                         stockEntity4.setStockQuantity(dataJo.getString("by"));
-                        stockEntity4.setRate(Float.parseFloat(mathUtil.countRate(by,total,1)));
+                        stockEntity4.setRate(Float.parseFloat(mathUtil.countRate(by, total, 1)));
                         stockEntity4.setMonth(Integer.valueOf(month));
                         stockEntity4.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity4);
@@ -906,7 +912,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity5.setStockType("fatpig_stock");
                         stockEntity5.setStockName("育肥猪存栏");
                         stockEntity5.setStockQuantity(dataJo.getString("yf"));
-                        stockEntity5.setRate(Float.parseFloat(mathUtil.countRate(yf,total,1)));
+                        stockEntity5.setRate(Float.parseFloat(mathUtil.countRate(yf, total, 1)));
                         stockEntity5.setMonth(Integer.valueOf(month));
                         stockEntity5.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity5);
@@ -969,10 +975,8 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
         }
     }
 
-
-
     //读取ERP数据中对应的名称
-    private int _getFarmId2(String pigfarm, List<ProdFarmNameEntity> farmNameEntityList) {
+    private int _getFarmIdByShortName(String pigfarm, List<ProdFarmNameEntity> farmNameEntityList) {
         //
         int farmId = 0;
         boolean isExist = false;
@@ -1050,9 +1054,9 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
         paramsMap.put("accessToken", token);
         //
         Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
-        timeoutMap.put("connectTimeout", 120000);
-        timeoutMap.put("requestTimeout", 120000);
-        timeoutMap.put("socketTimeout", 120000);
+        timeoutMap.put("connectTimeout", Integer.parseInt(connectTimeout));
+        timeoutMap.put("requestTimeout", Integer.parseInt(requestTimeout));
+        timeoutMap.put("socketTimeout", Integer.parseInt(socketTimeout));
         String url = apiIp + apiPort + serviceName + "/getWarningMessage";
         log.info("获取预警数据访问地址=" + url);
         log.info("业务请求参数=" + paramsMap.toString());
@@ -1130,6 +1134,124 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
         return farmId;
     }
 
+    @Override
+    public void getWorkPlan() throws IOException, ParseException {
+        //
+        Map timeoutMap = httpClientUtil.setTimeout(connectTimeout, requestTimeout, socketTimeout);
+        //
+        String token = getRemoteToken();
+        //
+        Map<String, String> paramsMap = new HashMap<String, String>();
+        paramsMap.put("accessToken", token);
+        //未来1天日期
+        String startDate = dateUtil.getFetureDate(1);
+        //未来7天日期
+        String endDate = dateUtil.getFetureDate(7);
+        paramsMap.put("startDate", startDate);
+        paramsMap.put("endDate", endDate);
+
+
+        String url = apiIp + apiPort + serviceName + "/getWorkPlan";
+        log.info("获取工作计划数据访问地址=" + url);
+        log.info("业务请求参数=" + paramsMap.toString());
+        log.info("开始取数=" + new Date(System.currentTimeMillis()));
+        //
+        JSONObject outJo = httpClientUtil.doGet(url, paramsMap);
+        log.info("返回结果=" + outJo);
+        log.info("结束取数=" + new Date(System.currentTimeMillis()));
+        if (outJo.getBoolean("status")) {
+            JSONObject contentJo = outJo.getJSONObject("content");
+            if (contentJo.getBoolean("success")) {
+                JSONArray dataJa = contentJo.getJSONArray("data");
+                if (dataJa.size() == 0) {
+                    log.info("未取到数据 。");
+                } else {
+                    //删除旧数据
+                    ProdWorkPlanEntity delWorkPlanEntity = new ProdWorkPlanEntity();
+                    delWorkPlanEntity.setAddTime(dateUtil.getTodayDate());
+                    Example<ProdWorkPlanEntity> example = Example.of(delWorkPlanEntity);
+                    workPlanRepo.deleteAll(workPlanRepo.findAll(example));
+                    //获取牧场所有名称数据
+                    List<ProdFarmNameEntity> farmNameEntityList = prodFarmNameRepo.findAll();
+                    for (int a = 0; a < dataJa.size(); a++) {
+                        JSONObject dataJo = dataJa.getJSONObject(a);
+                        ProdWorkPlanEntity workPlanEntity = new ProdWorkPlanEntity();
+                        workPlanEntity.setFarmId(_getFarmIdByFullName(dataJo.getString("mcmc"), farmNameEntityList));
+                        workPlanEntity.setFarmName(dataJo.getString("mcmc"));
+                        workPlanEntity.setPigQuantity(dataJo.getInteger("zzsl"));
+                        workPlanEntity.setPlanName(dataJo.getString("jhmc"));
+                        workPlanEntity.setPlanTimes(dataJo.getInteger("jhts"));
+                        workPlanEntity.setAddTime(new Timestamp(new Date().getTime()));
+                        workPlanRepo.save(workPlanEntity);
+                    }
+                }
+            }
+        }
+    }
+
+    @Autowired
+    private ProdSowPigletStatusRepo sowPigletStatusRepo;
+
+    @Override
+    public void getPrepareStatusQuantity() throws IOException, ParseException {
+        //
+        Map timeoutMap = httpClientUtil.setTimeout(connectTimeout, requestTimeout, socketTimeout);
+        //
+        String token = getRemoteToken();
+        //
+        Map<String, String> paramsMap = new HashMap<String, String>();
+        paramsMap.put("accessToken", token);
+
+        String url = apiIp + apiPort + serviceName + "/getPrepareStatusQuantity";
+        log.info("获取工作计划数据访问地址=" + url);
+        log.info("业务请求参数=" + paramsMap.toString());
+        log.info("开始取数=" + new Date(System.currentTimeMillis()));
+        //
+        JSONObject outJo = httpClientUtil.doGet(url, paramsMap);
+        log.info("返回结果=" + outJo);
+        log.info("结束取数=" + new Date(System.currentTimeMillis()));
+        if (outJo.getBoolean("status")) {
+            JSONObject contentJo = outJo.getJSONObject("content");
+            if (contentJo.getBoolean("success")) {
+                JSONArray dataJa = contentJo.getJSONArray("data");
+                if (dataJa.size() == 0) {
+                    log.info("未取到数据 。");
+                } else {
+                    //删除旧数据
+                    ProdSowPigletStatusEntity delSowPigletStatusEntity = new ProdSowPigletStatusEntity();
+                    delSowPigletStatusEntity.setAddDate(dateUtil.getTodayDate());
+                    Example<ProdSowPigletStatusEntity> example = Example.of(delSowPigletStatusEntity);
+                    sowPigletStatusRepo.deleteAll(sowPigletStatusRepo.findAll(example));
+                    //获取牧场所有名称数据
+                    List<ProdFarmNameEntity> farmNameEntityList = prodFarmNameRepo.findAll();
+                    //获取牧场所有名称数据
+                    for (int a = 0; a < dataJa.size(); a++) {
+                        JSONObject dataJo = dataJa.getJSONObject(a);
+                        ProdSowPigletStatusEntity sowPigletStatusEntity = new ProdSowPigletStatusEntity();
+                        sowPigletStatusEntity.setFarmName(dataJo.getString("mcmc"));
+                        sowPigletStatusEntity.setFarmId(_getFarmIdByShortName(dataJo.getString("mcmc"), farmNameEntityList));
+                        sowPigletStatusEntity.setStatus1(dataJo.getInteger("dfm"));
+                        sowPigletStatusEntity.setStatus2(dataJo.getInteger("ddn"));
+                        sowPigletStatusEntity.setStatus3(dataJo.getInteger("dpz"));
+                        sowPigletStatusEntity.setAddDate(new Timestamp(new Date().getTime()));
+                        sowPigletStatusRepo.save(sowPigletStatusEntity);
+                    }
+
+                }
+            }
+        }
+    }
+
+    @Override
+    public void getPayable() {
+
+    }
+
+    @Override
+    public void getSales() {
+
+    }
+
    /* public static void main(String[] args) {
         RestTemplate restTemplate = new RestTemplate();
 

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/utils/DateUtil.java

@@ -1,9 +1,12 @@
 package com.huimv.production.autoGetData.utils;
 
+import cn.hutool.core.date.DateTime;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -16,6 +19,7 @@ import java.util.Date;
  * @Create : 2020-12-25
  **/
 @Component
+@Slf4j
 public class DateUtil {
 
     //格式化本年
@@ -53,6 +57,62 @@ public class DateUtil {
         return sdf.parse(sdf.format(new Date()));
     }
 
+    public String getTodayDateText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(new Date());
+    }
+
+    public String getStartDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (cn.hutool.core.date.DateUtil.beginOfMonth(date) + "").substring(0, 10);
+    }
 
+    public String getEndDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (date + "").substring(0, 10);
+    }
 
+    /**
+     * 获取过去或者未来 任意天内的日期数组
+     * @param intervals      intervals天内
+     * @return              日期数组
+     */
+    public ArrayList<String> test(int intervals ) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        ArrayList<String> fetureDaysList = new ArrayList<>();
+        for (int i = 0; i <intervals; i++) {
+            pastDaysList.add(getPastDate(i));
+            fetureDaysList.add(getFetureDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * 获取过去第几天的日期
+     *
+     * @param past
+     * @return
+     */
+    public String getPastDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    /**
+     * 获取未来 第 past 天的日期
+     * @param past
+     * @return
+     */
+    public String getFetureDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
 }

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/utils/HttpTemplete.java

@@ -36,6 +36,12 @@ public class HttpTemplete {
 ////        client.testGetRequest1();
 //        client.testGetRequest2();
 //    }
+    private Integer connectTimeout = null;
+    private Integer requestTimeout = null;
+    private Integer socketTimeout = null;
+
+    static {
+    }
 
     /**
      * @Method      : doPost
@@ -107,6 +113,138 @@ public class HttpTemplete {
         }
     }
 
+    /**
+     * @Method      : setTimeout
+     * @Description : 
+     * @Params      : [connectTimeout, requestTimeout, socketTimeout]
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/23       
+     * @Time        : 9:36
+     */
+    public Map<String, Integer> setTimeout(Integer connectTimeout, Integer requestTimeout, Integer socketTimeout){
+        //
+        if(connectTimeout == null){
+            this.connectTimeout = 3000;
+        }else{
+            this.connectTimeout = connectTimeout;
+        }
+        //
+        if(requestTimeout == null){
+            this.requestTimeout = 3000;
+        }else{
+            this.requestTimeout = requestTimeout;
+        }
+        //
+        if(socketTimeout == null){
+            this.socketTimeout = 3000;
+        }else{
+            this.socketTimeout = socketTimeout;
+        }
+        Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
+        timeoutMap.put("connectTimeout", this.connectTimeout);
+        timeoutMap.put("requestTimeout", this.requestTimeout);
+        timeoutMap.put("socketTimeout", this.socketTimeout);
+        return timeoutMap;
+    }
+
+    /**
+     * @Method      : setTimeout
+     * @Description : 
+     * @Params      : [connectTimeout, requestTimeout, socketTimeout]
+     * @Return      : java.util.Map<java.lang.String,java.lang.Integer>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/23       
+     * @Time        : 9:41
+     */
+    public Map<String, Integer> setTimeout(String connectTimeout, String requestTimeout, String socketTimeout){
+        //
+        if(connectTimeout == null){
+            this.connectTimeout = 3000;
+        }else{
+            this.connectTimeout = Integer.parseInt(connectTimeout);
+        }
+        //
+        if(requestTimeout == null){
+            this.requestTimeout = 3000;
+        }else{
+            this.requestTimeout = Integer.parseInt(requestTimeout);
+        }
+        //
+        if(socketTimeout == null){
+            this.socketTimeout = 3000;
+        }else{
+            this.socketTimeout = Integer.parseInt(socketTimeout);
+        }
+        Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
+        timeoutMap.put("connectTimeout", this.connectTimeout);
+        timeoutMap.put("requestTimeout", this.requestTimeout);
+        timeoutMap.put("socketTimeout", this.socketTimeout);
+        return timeoutMap;
+    }
+
+    /**
+     * @Method      : doGet
+     * @Description : 
+     * @Params      : [url, paramsMap]
+     * @Return      : com.alibaba.fastjson.JSONObject
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/23       
+     * @Time        : 9:34
+     */
+    public JSONObject doGet(String url, Map<String, String> paramsMap) throws IOException {
+        //
+        if(this.connectTimeout == null){
+            this.connectTimeout = 3000;
+        }
+        //
+        if(this.requestTimeout == null)
+        {
+            this.requestTimeout = 3000;
+        }
+        //
+        if(this.socketTimeout == null){
+            this.socketTimeout = 3000;
+        }
+        Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
+        timeoutMap.put("connectTimeout", this.connectTimeout);
+        timeoutMap.put("requestTimeout", this.requestTimeout);
+        timeoutMap.put("socketTimeout", this.socketTimeout);
+        //
+        CloseableHttpClient httpClient = getHttpClientConnection();
+        //执行//获取请求内容
+        CloseableHttpResponse response = httpClient.execute(getHttpRequest(url, paramsMap, timeoutMap));
+        try {
+            // 获取响应实体
+            HttpEntity entity = response.getEntity();
+            // 打印响应状态
+            if (response.getStatusLine().getStatusCode() == 200) {
+                // 打印响应内容
+                String text = EntityUtils.toString(entity, "utf-8");
+                JSONObject resultJo = new JSONObject();
+                resultJo.put("status", true);
+                resultJo.put("content", text);
+                return resultJo;
+            } else {
+                String text = EntityUtils.toString(entity, "utf-8");
+                JSONObject resultJo = new JSONObject();
+                resultJo.put("status", false);
+                resultJo.put("content", text);
+                return resultJo;
+            }
+        } finally {
+            //释放资源
+            if (response != null) {
+                response.close();
+            }
+            if (httpClient != null) {
+                httpClient.close();
+            }
+        }
+    }
 
     /**
      * @Method : doGet
@@ -205,6 +343,9 @@ public class HttpTemplete {
         int connectTimeout = timeoutMap.get("connectTimeout");
         int requestTimeout = timeoutMap.get("requestTimeout");
         int socketTimeout = timeoutMap.get("socketTimeout");
+//        System.out.println("core connectTimeout="+connectTimeout);
+//        System.out.println("core requestTimeout="+requestTimeout);
+//        System.out.println("core socketTimeout="+socketTimeout);
 
         List<NameValuePair> params = new ArrayList<NameValuePair>();
         Set<Map.Entry<String, String>> entrySet = map.entrySet();

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

@@ -33,4 +33,24 @@ public class MathUtil {
         //所占百分比
         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);
+    }
+
 }