update

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -1114,6 +1114,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 			equipmentInfo.setManufacturerID(Constants.OPERATORID_LIANLIAN);
 			equipmentInfo.setManufacturerName(Constants.MANUFACTURER_NAME);
 			equipmentInfo.setConstructionTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileBasicInfo.getCreateTime()));
+			equipmentInfo.setProductionDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileBasicInfo.getCreateTime()));
 
 			PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByPileSn(pileSn);
 			equipmentInfo.setEquipmentType(Integer.valueOf(modelInfo.getSpeedType()));
@@ -1211,6 +1212,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 			connectorInfo.setCurrent(Integer.valueOf(modelInfo.getRatedCurrent()));
 			connectorInfo.setConnectorName(pileConnectorInfo.getPileConnectorCode());
 			connectorInfo.setOperateStatus(50); // 50-正常使用
+			connectorInfo.setOpreateStatus(50); // 50-正常使用
 			connectorInfo.setNationalStandard(2); // 2-2015
 			connectorInfo.setAuxPower(3); // 3-兼容12V和24V
 

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/ConnectorInfo.java

@@ -82,6 +82,17 @@ public class ConnectorInfo {
     @JSONField(name = "OperateStatus")
     private Integer operateStatus;
 
+    /**
+     * 运营状态
+     * 0-未知
+     * 1-建设中
+     * 5-关闭下线
+     * 6-维护中
+     * 50-正常使用
+     */
+    @JSONField(name = "OpreateStatus")
+    private Integer opreateStatus;
+
     /**
      * 国家标准
      */

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java

@@ -53,7 +53,8 @@ public class EquipmentInfo {
      * 设备生产日期  N
      * YYYY-MM-DD
      */
-    // private String ProductionDate;
+    @JSONField(name = "ProductionDate")
+     private String productionDate;
 
     /**
      * 建设时间  Y

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java

@@ -25,6 +25,7 @@ import com.jsowell.pile.dto.QueryOperatorInfoDTO;
 import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
+import com.jsowell.pile.thirdparty.ConnectorInfo;
 import com.jsowell.pile.thirdparty.EquipmentInfo;
 import com.jsowell.pile.util.MerchantUtils;
 import com.jsowell.pile.vo.SupStationStatsVO;
@@ -35,6 +36,7 @@ import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
 import com.jsowell.pile.vo.web.PileConnectorInfoVO;
 import com.jsowell.pile.vo.web.PileMerchantInfoVO;
+import com.jsowell.pile.vo.web.PileModelInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
@@ -87,6 +89,8 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
     @Autowired
     private OrderBasicInfoService orderBasicInfoService;
     @Autowired
+    private PileModelInfoService pileModelInfoService;
+    @Autowired
     private PileBillingTemplateService pileBillingTemplateService;
     @Autowired
     private RedisCache redisCache;
@@ -238,6 +242,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
             stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat()));
             stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction()));
             stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay()));
+            stationInfo.setPeriodFee(1);
             // stationInfo.setMinElectricityPrice(pileStationInfo); // 最低充电电费率
             // stationInfo.setElectricityFee(); // 电费 xx元/度
             // stationInfo.setServiceFee(); // 服务费 xx元/度
@@ -245,6 +250,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
             stationInfo.setPayment(pileStationInfo.getPayment());
             stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder()));
             // stationInfo.setParkFeeType(pileStationInfo); // 停车收费类型
+            stationInfo.setBusinessExpandType(Integer.parseInt(pileStationInfo.getAloneApply()));
             stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag()));
             stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag()));
             stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag()));
@@ -310,6 +316,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
                 .parkFree(Integer.valueOf(pileStationInfo.getParkFree()))
                 .supportOrder(Integer.valueOf(pileStationInfo.getSupportOrder()))
                 .parkFeeType(0)
+                .periodFee(1) // 峰谷分时 0-否；1-是
                 .toiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag()))
                 .storeFlag(Integer.valueOf(pileStationInfo.getStoreFlag()))
                 .restaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag()))