update lianlian

jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java

@@ -8,9 +8,10 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.dto.*;
-import com.jsowell.thirdparty.domain.StationStatsInfo;
-import com.jsowell.thirdparty.service.LianLianService;
-import com.jsowell.thirdparty.vo.*;
+import com.jsowell.thirdparty.lianlian.common.CommonResult;
+import com.jsowell.thirdparty.lianlian.domain.StationStatsInfo;
+import com.jsowell.thirdparty.lianlian.service.LianLianService;
+import com.jsowell.thirdparty.lianlian.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -313,8 +314,10 @@ public class LianLianController extends BaseController {
 
     /**
      * 获取token接口
+     * http://localhost:8080/LianLian/v1/query_token
      */
-    public String queryToken() {
+    @PostMapping("/v1/query_token")
+    public CommonResult<?> queryToken() {
         return null;
     }
 }

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java

@@ -20,7 +20,7 @@ import com.jsowell.pile.service.IPileStationInfoService;
 import com.jsowell.pile.service.IThirdPartySettingInfoService;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.service.PileService;
-import com.jsowell.thirdparty.service.LianLianService;
+import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -43,7 +43,7 @@ import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
 import com.jsowell.service.PileRemoteService;
 import com.jsowell.service.PileService;
-import com.jsowell.thirdparty.service.LianLianService;
+import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import com.jsowell.wxpay.common.WeChatPayParameter;
 import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO;
 import com.jsowell.wxpay.dto.WeChatRefundDTO;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java

@@ -1,7 +1,7 @@
-package com.jsowell.common.lianlian.common;
+package com.jsowell.thirdparty.lianlian.common;
 
 
-import com.jsowell.common.lianlian.common.enums.ResultCode;
+import com.jsowell.thirdparty.lianlian.common.enums.ResultCode;
 
 /**
  * 接口返回类

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/enums/ResultCode.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian.common.enums;
+package com.jsowell.thirdparty.lianlian.common.enums;
 
 /**
  * 返回结果枚举

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeDetail.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ChargeOrder.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorChargeStatusInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatusInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OperatorInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/OrderInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 
 import com.alibaba.fastjson2.annotation.JSONField;
@@ -6,7 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.List;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatusInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.domain;
+package com.jsowell.thirdparty.lianlian.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java

@@ -1,8 +1,8 @@
-package com.jsowell.thirdparty.service;
+package com.jsowell.thirdparty.lianlian.service;
 
 import com.jsowell.pile.dto.*;
-import com.jsowell.thirdparty.domain.StationStatsInfo;
-import com.jsowell.thirdparty.vo.*;
+import com.jsowell.thirdparty.lianlian.domain.StationStatsInfo;
+import com.jsowell.thirdparty.lianlian.vo.*;
 
 import java.util.List;
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.service.impl;
+package com.jsowell.thirdparty.lianlian.service.impl;
 
 import cn.hutool.core.util.PageUtil;
 import cn.hutool.http.HttpUtil;
@@ -17,10 +17,6 @@ import com.jsowell.common.enums.ykc.OrderStatusEnum;
 import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
 import com.jsowell.common.enums.ykc.PileStatusEnum;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.lianlian.Cryptos;
-import com.jsowell.common.lianlian.Encodes;
-import com.jsowell.common.lianlian.GBSignUtils;
-import com.jsowell.common.lianlian.HttpRequestUtil;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
@@ -37,9 +33,13 @@ import com.jsowell.pile.vo.uniapp.BillingPriceVO;
 import com.jsowell.pile.vo.web.PileConnectorInfoVO;
 import com.jsowell.pile.vo.web.PileModelInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
-import com.jsowell.thirdparty.domain.*;
-import com.jsowell.thirdparty.service.LianLianService;
-import com.jsowell.thirdparty.vo.*;
+import com.jsowell.thirdparty.lianlian.domain.*;
+import com.jsowell.thirdparty.lianlian.service.LianLianService;
+import com.jsowell.thirdparty.lianlian.util.Cryptos;
+import com.jsowell.thirdparty.lianlian.util.Encodes;
+import com.jsowell.thirdparty.lianlian.util.GBSignUtils;
+import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil;
+import com.jsowell.thirdparty.lianlian.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Cryptos.java

@@ -1,6 +1,6 @@
 /**
  */
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Digests.java

@@ -1,6 +1,6 @@
 /**
  */
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import org.apache.commons.lang3.Validate;
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Encodes.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2005-2012 springside.org.cn
  */
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Base64;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/Exceptions.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/GBSignUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson2.JSON;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/LianLianUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.util.BytesUtil;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.lianlian;
+package com.jsowell.thirdparty.lianlian.util;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/EquipmentAuthVO.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianPageResponse.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/LianLianResultVO.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryChargingStatusVO.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStartChargeVO.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/QueryStopChargeVO.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.vo;
+package com.jsowell.thirdparty.lianlian.vo;
 
 import lombok.Data;