Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -231,6 +231,8 @@ public interface OrderBasicInfoMapper {
      */
     List<OrderBasicInfo> getUnpaidOrderListOver15Min(@Param("createTime") String createTime);
 
+    List<OrderBasicInfo> getUnpaidOrderList(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
     /**
      * 根据orderId批量修改订单状态
      *

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

@@ -2261,9 +2261,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public List<OrderBasicInfo> getUnpaidOrderListOver15Min() {
-        Date now = DateUtils.addMinute(new Date(), -15);
-        String nowString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, now);
-        List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderListOver15Min(nowString);
+        String startString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+        String endString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinute(new Date(), -15));
+        List<OrderBasicInfo> list = orderBasicInfoMapper.getUnpaidOrderList(startString, endString);
         return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList();
     }
 

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-pile/src/main/java/com/jsowell/pile/thirdparty/ParameterConfigData.java

@@ -0,0 +1,88 @@
+package com.jsowell.pile.thirdparty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 0x17参数配置对象
+ *
+ * @author Lemon
+ * @Date 2024/11/28 14:43:28
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ParameterConfigData {
+    /**
+     * 交易流水号
+     */
+    private String transactionCode;
+
+    /**
+     * 桩编码
+     */
+    private String pileSn;
+
+    /**
+     * 枪号
+     */
+    private String pileConnectorCode;
+
+    /**
+     * BMS 单体动力蓄电池最高允许充电电压   0.01 V/位， 0 V 偏移量；  数据范围： 0~24 V
+     */
+    private String bmsMaxVoltage;
+
+    /**
+     * BMS 最高允许充电电流   0.1 A/位， -400A 偏移量
+     */
+    private String bmsMaxCurrent;
+
+    /**
+     * BMS 动力蓄电池标称总能量   0.1 kWh/位， 0 kWh 偏移量；  数据范围： 0~1000 kWh
+     */
+    private String bmsSumEnergy;
+
+    /**
+     * BMS 最高允许充电总电压    0.1 V/位， 0 V 偏移量
+     */
+    private String bmsMaxChargingVoltage;
+
+    /**
+     * BMS 最高允许温度   1ºC/位， -50 ºC 偏移量；数据范 围： -50 ºC ~+200 ºC
+     */
+    private String bmsMaxTemperature;
+
+    /**
+     * BMS 整车动力 蓄电池荷电状态(soc)   0.1%/位， 0%偏移量；数据范围： 0~100%
+     */
+    private String soc;
+
+    /**
+     * BMS 整车动力蓄电池当前电池电压   整车动力蓄电池总电压
+     */
+    private String bmsRealTimeVoltage;
+
+    /**
+     * 电桩最高输出电压   0.1 V /位， 0 V 偏移量
+     */
+    private String pileMaxOutputVoltage;
+
+    /**
+     * 电桩最低输出电压   0.1 V /位， 0 V 偏移量
+     */
+    private String pileMinOutputVoltage;
+
+    /**
+     * 电桩最大输出电流   0.1 A/位， -400 A 偏移量
+     */
+    private String pileMaxOutputCurrent;
+
+    /**
+     * 电桩最小输出电流   0.1 A/位， -400 A 偏移量
+     */
+    private String pileMinOutputCurrent;
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java

@@ -66,6 +66,7 @@ public class OrderDetailInfoVO {
 		private String createTime; // 订单创建时间
 		private String startSOC; // 开始SOC
 		private String endSOC; // 结束SOC
+		private String orderAmount; // 订单消费金额
 		private String discountAmount; // 订单优惠金额
 		private String settleAmount;// 结算金额
 		private String settlementTime; // 结算时间