update 电单车协议

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -61,7 +61,6 @@ import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
-import com.jsowell.pile.service.PileSnGenerateService;
 import com.jsowell.pile.vo.base.MemberWalletVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
@@ -108,7 +107,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@ActiveProfiles("dev")
+@ActiveProfiles("pre")
 @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @RunWith(SpringRunner.class)
 public class SpringBootTestController {
@@ -265,6 +264,15 @@ public class SpringBootTestController {
     @Autowired
     private ZDLService zdlService;
 
+    @Test
+    public void selectPileDetailByPileSnTest() {
+        String pileSn = "13273881";
+        // 查询桩信息
+        PileDetailVO pileDetailVO = pileBasicInfoService.selectPileDetailByPileSn(pileSn);
+        System.out.println(pileDetailVO);
+    }
+
+
     @Test
     public void thirdPartyTest() {
         QueryStationInfoDTO dto = new QueryStationInfoDTO();

jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java

@@ -179,9 +179,11 @@ public class PileRemoteService {
 		String chargePortType = pileDetailVO.getChargePortType();
 		if (StringUtils.equals(chargePortType, Constants.THREE)) {
 			// 发送电动自行车桩停止充电指令
+			log.info("发送电单车桩停止充电指令, chargePortType:{}", chargePortType);
 			eBikeSendCommandService.sendStopChargingCommand(command);
 		} else {
 			// 发送电动汽车桩停止充电指令
+			log.info("发送汽车桩停止充电指令, chargePortType:{}", chargePortType);
 			ykcPushCommandService.pushStopChargingCommand(command);
 		}
 		log.info("remoteStopCharging success, pileConnectorCode:{}, transactionCode:{}", pileSn + connectorCode, transactionCode);

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

@@ -58,11 +58,6 @@ public class PileDetailVO {
 	 */
 	private String merchantId;
 
-	/**
-	 * 设备类型(1-快充，2-慢充，3-电单车)
-	 */
-	private String pileType;
-
 	/**
 	 * 枪数量
 	 */

jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml

@@ -435,7 +435,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t1.sim_id AS simId,
             t5.iccid AS iccid ,
             t5.sim_supplier as simSupplier,
-            IF(t4.charger_pile_type = '2','3',(IF(t4.speed_type = '1','1','2'))) AS pileType,
+            IF(t4.charger_pile_type = '2','3',(IF(t4.speed_type = '1','1','2'))) AS chargePortType,
             t5.operator
         FROM
         pile_basic_info t1