diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/AMapController.java similarity index 98% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/AMapController.java index 22de14ea8..95bea49cd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/amap/AMapController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/AMapController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.amap; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/camera/CameraController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/CameraController.java similarity index 97% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/camera/CameraController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/CameraController.java index 316a6ec79..f3ff8976b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/camera/CameraController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/CameraController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.camera; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/dianxing/DianXingPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java similarity index 96% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/dianxing/DianXingPlatformController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java index a53b3a28a..8ecef2458 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/dianxing/DianXingPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.dianxing; +package com.jsowell.api.thirdparty; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java index 27f4c73e5..dc1bc5747 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.hainan; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java index 5c698b752..75920ca97 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.huawei; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java index 9517ca8a1..f72a8e968 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.huawei; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java similarity index 97% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java index 4a055f402..160c538d8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java @@ -1,30 +1,22 @@ -package com.jsowell.web.controller.thirdparty.lianlian; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.domain.ThirdPartyPlatformConfig; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.ThirdPartyPlatformConfigService; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.platform.ThirdPartyPlatformService; -import com.jsowell.thirdparty.platform.util.Cryptos; -import com.jsowell.thirdparty.platform.util.Encodes; -import com.jsowell.web.controller.thirdparty.ThirdPartyBaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.nio.charset.StandardCharsets; import java.util.Map; /** diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NMGController.java similarity index 96% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NMGController.java index 1813a4422..dbf2414d3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NMGController.java @@ -1,17 +1,14 @@ -package com.jsowell.web.controller.thirdparty.neimenggu; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryOperatorInfoDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.platform.ThirdPartyPlatformService; -import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; -import com.jsowell.web.controller.thirdparty.ThirdPartyBaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.PostMapping; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java index 1a9150aca..f45b0d2bc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/nanrui/NRController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.nanrui; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java index 15d030ca2..2325edb6d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ningxiajiaotou/NXJTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.ningxiajiaotou; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/qinghai/QingHaiController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/qinghai/QingHaiController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java index 3192c89ae..bbc623ca9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/qinghai/QingHaiController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.qinghai; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java similarity index 96% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java index a495df45d..23ba5f3cf 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ruanjie/RJController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.ruanjie; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java index b08249506..5bd33910c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java index f8039cc15..a0197df3f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/xindiantu/XDTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.xindiantu; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java index bfbfe040f..60166c2f5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/yongchengboche/YCBCController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.yongchengboche; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java similarity index 99% rename from jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java rename to jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java index f49621e24..17c0facc2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java @@ -1,4 +1,4 @@ -package com.jsowell.web.controller.thirdparty.zhongdianlian; +package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index a9e91036d..870e6face 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -13,8 +13,8 @@ import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.RemoteGroundLockDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; +import com.jsowell.web.controller.pile.PileConnectorInfoController; import com.jsowell.thirdparty.common.CommonService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * 充电桩相关接口 @@ -192,7 +191,7 @@ public class PileController extends BaseController { /** * 修改第三方平台枪口状态 - * @see com.jsowell.web.controller.pile.PileConnectorInfoController#updateThirdPartyConnectorStatus(com.jsowell.pile.dto.QueryConnectorListDTO) + * @see PileConnectorInfoController#updateThirdPartyConnectorStatus(com.jsowell.pile.dto.QueryConnectorListDTO) * 两个方法完全相同,如有修改需同步修改 */ private void updateThirdPartyConnectorStatus(QueryConnectorListDTO dto) {