diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java index da27a7a32..5224e068e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java @@ -26,7 +26,8 @@ import java.util.Map; @RestController @RequestMapping("/changzhou") public class ChangZhouController extends ThirdPartyBaseController { - private final String platformName = "新运常畅充"; + // private final String platformName = "新运常畅充"; + private final String platformName = ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java index 7cabbe8f0..4ecb0d6df 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java @@ -2,6 +2,7 @@ package com.jsowell.api.thirdparty; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; @@ -19,6 +20,11 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/dianxing") public class DianXingPlatformController extends BaseController { + + private final String platformName = ThirdPlatformTypeEnum.DIAN_XING_PLATFORM.getTypeLabel(); + + private final String platformType = ThirdPlatformTypeEnum.DIAN_XING_PLATFORM.getTypeCode(); + @Autowired @Qualifier("dianXingPlatformServiceImpl") private ThirdPartyPlatformService dianXingService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java index 801ccb0dc..5e2a97e9e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GanSuController.java @@ -28,7 +28,8 @@ import java.util.Map; @RestController @RequestMapping("/gansu") public class GanSuController extends ThirdPartyBaseController{ - private final String platformName = "甘肃省平台"; + // private final String platformName = "甘肃省平台"; + private final String platformName = ThirdPlatformTypeEnum.GAN_SU_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.GAN_SU_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuangXiPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuangXiPlatformController.java index 90fdf6e18..d0c0a5d20 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuangXiPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuangXiPlatformController.java @@ -2,7 +2,6 @@ package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; -import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.response.RestApiResponse; @@ -31,7 +30,8 @@ import java.util.Map; @RestController @RequestMapping("/guangxi") public class GuangXiPlatformController extends ThirdPartyBaseController { - private final String platformName = "广西平台"; + // private final String platformName = "广西平台"; + private final String platformName = ThirdPlatformTypeEnum.GUANG_XI_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.GUANG_XI_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuiZhouPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuiZhouPlatformController.java index 5cd824320..86ad1aef3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuiZhouPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/GuiZhouPlatformController.java @@ -3,6 +3,7 @@ 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.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.QueryOperatorInfoDTO; @@ -26,7 +27,10 @@ import java.util.Map; @RestController @RequestMapping("/guizhou") public class GuiZhouPlatformController extends ThirdPartyBaseController { - private final String platformName = "贵州省平台"; + // private final String platformName = "贵州省平台"; + private final String platformName = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeLabel(); + + private final String platformType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); @Autowired @Qualifier("guiZhouPlatformServiceImpl") diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java index e4206b26c..f926505d2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java @@ -28,7 +28,8 @@ import java.util.Map; @RequestMapping("/hainan") public class HaiNanPlatformController extends ThirdPartyBaseController { - private final String platformName = "海南省平台"; + // private final String platformName = "海南省平台"; + private final String platformName = ThirdPlatformTypeEnum.HAI_NAN_1_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.HAI_NAN_1_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HeNanPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HeNanPlatformController.java index 47eb66f43..1c0d5a110 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HeNanPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HeNanPlatformController.java @@ -28,7 +28,8 @@ import java.util.Map; @RestController @RequestMapping("/henan") public class HeNanPlatformController extends ThirdPartyBaseController{ - private final String platformName = "河南省平台"; + // private final String platformName = "河南省平台"; + private final String platformName = ThirdPlatformTypeEnum.HE_NAN_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.HE_NAN_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuZhouController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuZhouController.java index 11659c812..1a5d7f857 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuZhouController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuZhouController.java @@ -28,7 +28,8 @@ import java.util.Map; @Anonymous public class HuZhouController extends ThirdPartyBaseController { - private final String platformName = "湖州市监管平台"; + // private final String platformName = "湖州市监管平台"; + private final String platformName = ThirdPlatformTypeEnum.HU_ZHOU_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.HU_ZHOU_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java index 3c0094ed8..76a932ff2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java @@ -25,7 +25,8 @@ import java.util.Map; @RequestMapping("/jilin") @Anonymous public class JiLinPlatformController extends ThirdPartyBaseController{ - private final String platformName = "吉林省平台"; + // private final String platformName = "吉林省平台"; + private final String platformName = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java index 68373efde..90869f91b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java @@ -30,7 +30,10 @@ import java.util.Map; @RequestMapping("/LianLian") public class LianLianController extends ThirdPartyBaseController { - private final String platformName = "联联平台"; + // private final String platformName = "联联平台"; + + private final String platformName = ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeLabel(); + private final String platformType = ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode(); @Autowired @Qualifier("lianLianPlatformServiceImpl") diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java index ec43a7695..034ae1851 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java @@ -30,7 +30,8 @@ import java.util.Map; @RequestMapping("/jiangsu") public class NRController extends ThirdPartyBaseController { - private final String platformName = "江苏省平台"; + // private final String platformName = "江苏省平台"; + private final String platformName = ThirdPlatformTypeEnum.JIANG_SU_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.JIANG_SU_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java index ecfafdeca..8f9b1add7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NXJTController.java @@ -30,7 +30,8 @@ import java.util.Map; @RequestMapping("/nxjt") public class NXJTController extends ThirdPartyBaseController { - private final String platformName = "宁夏交投平台"; + // private final String platformName = "宁夏交投平台"; + private final String platformName = ThirdPlatformTypeEnum.NING_XIA_JIAO_TOU.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.NING_XIA_JIAO_TOU.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NeiMengGuController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NeiMengGuController.java index 8ea231fa3..31f35a4d9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NeiMengGuController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NeiMengGuController.java @@ -3,6 +3,7 @@ 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.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.QueryOperatorInfoDTO; @@ -24,7 +25,10 @@ import java.util.Map; @RestController @RequestMapping("/evcs") public class NeiMengGuController extends ThirdPartyBaseController { - private final String platformName = "内蒙古平台"; + // private final String platformName = "内蒙古平台"; + + private final String platformName = ThirdPlatformTypeEnum.NEI_MENG_GU_PLATFORM.getTypeLabel(); + private final String platformType = ThirdPlatformTypeEnum.NEI_MENG_GU_PLATFORM.getTypeCode(); @Autowired @Qualifier("neiMengGuPlatformServiceImpl") diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java index b9d6f9778..ac83624f2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java @@ -27,7 +27,8 @@ import java.util.Map; @RequestMapping("/ningxia") public class NingXiaController extends ThirdPartyBaseController { - private final String platformName = "宁夏平台"; + // private final String platformName = "宁夏平台"; + private final String platformName = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java index a11ac0b33..c39b1dd9f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java @@ -1,32 +1,21 @@ 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.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.common.util.JWTUtils; -import com.jsowell.pile.domain.ThirdPartyPlatformConfig; -import com.jsowell.pile.dto.PushRealTimeInfoDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; -import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO; -import com.jsowell.pile.service.ThirdPartyPlatformConfigService; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.platform.dto.PushOrderDTO; -import com.jsowell.thirdparty.platform.dto.QueryOrderDTO; import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; -import com.jsowell.thirdparty.platform.util.Cryptos; -import com.jsowell.thirdparty.platform.util.Encodes; 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.List; import java.util.Map; @@ -41,7 +30,8 @@ import java.util.Map; @RequestMapping("/qinghai/evcs") public class QingHaiController extends ThirdPartyBaseController { - private final String platformName = "青海省平台"; + // private final String platformName = "青海省平台"; + private final String platformName = ThirdPlatformTypeEnum.QING_HAI_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.QING_HAI_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java index bb88ada97..afd423478 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java @@ -5,7 +5,8 @@ import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.pile.dto.*; +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.service.ThirdPartyPlatformService; @@ -14,7 +15,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.List; import java.util.Map; /** @@ -24,9 +24,8 @@ import java.util.Map; @Anonymous @RequestMapping("/sichuan") public class SiChuanController extends ThirdPartyBaseController { - private final String platformName = "四川省监管平台"; - - + // private final String platformName = "四川省监管平台"; + private final String platformName = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SuZhouPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SuZhouPlatformController.java index 2d6495e4d..6b83469d5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SuZhouPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SuZhouPlatformController.java @@ -3,6 +3,7 @@ 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.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; @@ -28,7 +29,10 @@ import java.util.Map; @RequestMapping("/suzhou") public class SuZhouPlatformController extends ThirdPartyBaseController{ - private final String platformName = "苏州市平台"; + // private final String platformName = "苏州市平台"; + + private final String platformName = ThirdPlatformTypeEnum.SU_ZHOU_PLATFORM.getTypeLabel(); + private final String platformType = ThirdPlatformTypeEnum.SU_ZHOU_PLATFORM.getTypeCode(); @Autowired @Qualifier("suZhouPlatformServiceImpl") diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java index 66a7dcbce..1017ec135 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java @@ -25,9 +25,8 @@ import java.util.Map; @RestController @RequestMapping("/weiwangkuaidian") public class WeiWangKuaiDianController extends ThirdPartyBaseController { - private final String platformName = "微网快电"; - - + // private final String platformName = "微网快电"; + private final String platformName = ThirdPlatformTypeEnum.WEI_WANG_XIN_DIAN.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.WEI_WANG_XIN_DIAN.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java index a443914f7..1a5c2ceeb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java @@ -29,7 +29,8 @@ import java.util.Map; @RequestMapping("/xindiantu") public class XDTController extends ThirdPartyBaseController { - private final String platformName = "新电途平台"; + // private final String platformName = "新电途平台"; + private final String platformName = ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XinYunPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XinYunPlatformController.java index 03444eba5..73ef2b1e3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XinYunPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XinYunPlatformController.java @@ -29,7 +29,8 @@ import java.util.Map; @RestController @RequestMapping("/xinyun") public class XinYunPlatformController extends ThirdPartyBaseController{ - private final String platformName = "新运平台"; + // private final String platformName = "新运平台"; + private final String platformName = ThirdPlatformTypeEnum.XIN_YUN_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.XIN_YUN_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java index 8eb654fe4..f6ad6b3a8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YCBCController.java @@ -32,7 +32,8 @@ import java.util.Map; @RequestMapping("/ycbc") public class YCBCController extends ThirdPartyBaseController { - private final String platformName = "甬城泊车平台"; + // private final String platformName = "甬城泊车平台"; + private final String platformName = ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YunWeiPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YunWeiPlatformController.java index f321da2b1..c41cda0af 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YunWeiPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/YunWeiPlatformController.java @@ -23,9 +23,8 @@ import java.util.Map; @RequestMapping("/yunwei") public class YunWeiPlatformController extends ThirdPartyBaseController{ - - private final String platformName = "运维平台"; - + // private final String platformName = "运维平台"; + private final String platformName = ThirdPlatformTypeEnum.YUN_WEI_PLATFORM.getTypeLabel(); private final String platformType = ThirdPlatformTypeEnum.YUN_WEI_PLATFORM.getTypeCode(); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java index e3b4e4d29..0715b140c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZDLController.java @@ -30,7 +30,11 @@ import java.util.Map; @RequestMapping("/zdl") public class ZDLController extends ThirdPartyBaseController { - private final String platformName = "宁波平台"; + // private final String platformName = "宁波平台"; + + private final String platformName = ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeLabel(); + + private final String platformType = ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeCode(); @Autowired @Qualifier("zhongDianLianPlatformServiceImpl") diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java index 0031f84dc..b2f7a053b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java @@ -3,6 +3,7 @@ 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.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.pile.dto.QueryOperatorInfoDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; @@ -27,7 +28,11 @@ import java.util.Map; @RequestMapping("/zj") public class ZheJiangController extends ThirdPartyBaseController { - private final String platformName = "浙江省平台"; + // private final String platformName = "浙江省平台"; + + private final String platformName = ThirdPlatformTypeEnum.ZHE_JIANG_PLATFORM.getTypeLabel(); + + private final String platformType = ThirdPlatformTypeEnum.ZHE_JIANG_PLATFORM.getTypeCode(); @Autowired @Qualifier("zheJiangPlatformServiceImpl")