Merge branch 'dev' into dev-g

2026-04-20 11:05:18 +08:00 · 2025-06-24 16:14:20 +08:00
parent be575314bf 53e39ce17b
commit fe8c013bf3
20 changed files with 1766 additions and 69 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java
@@ -0,0 +1,202 @@
+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.*;
+import com.jsowell.pile.thirdparty.CommonParamsDTO;
+import com.jsowell.thirdparty.lianlian.common.CommonResult;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
+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.util.Map;
+
+/**
+ * 四川对接接口
+ */
+@RestController
+@Anonymous
+@RequestMapping("/sichuan")
+public class SiChuanController extends ThirdPartyBaseController {
+    private final String platformName = "";
+
+
+    private final String platformType = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode();
+
+
+    @Autowired
+    @Qualifier("siChuanPlatformServiceImpl")
+    private ThirdPartyPlatformService platformLogic;
+
+
+    /**
+     * getToken
+     */
+    @PostMapping("/v1/query_token")
+    public CommonResult<?> queryToken(@RequestBody CommonParamsDTO dto) {
+        logger.info("{}-请求令牌 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            // Map<String, String> map = zdlService.generateToken(dto);
+            Map<String, String> map = platformLogic.queryToken(dto);
+            logger.info("{}-请求令牌 result:{}" , platformName , map);
+            return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.info("{}-请求令牌 error:" , platformName , e);
+            return CommonResult.failed("获取token发生异常");
+        }
+    }
+
+    /**
+     * 查询运营商信息
+     * supervise_query_operator_info
+     */
+    @PostMapping("/v1/supervise_query_operator_info")
+    public CommonResult<?> supervise_query_operator_info(HttpServletRequest request , @RequestBody CommonParamsDTO dto) {
+        logger.info("{}-查询运营商信息 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            // 校验令牌
+            if (!verifyToken(request.getHeader("Authorization"))) {
+                // 校验失败
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
+            }
+
+            // 校验签名
+            if (!verifySignature(dto)) {
+                // 签名错误
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
+            }
+
+            // 解析入参
+            QueryOperatorInfoDTO queryOperatorInfoDTO = parseParamsDTO(dto , QueryOperatorInfoDTO.class);
+
+            // 执行逻辑
+            Map<String, String> map = platformLogic.queryOperatorInfo(queryOperatorInfoDTO);
+            logger.info("{}-查询运营商信息 result:{}" , platformName , map);
+            return CommonResult.success(0 , "查询运营商信息成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.info("{}-查询运营商信息 error:" , platformName , e);
+        }
+        return CommonResult.failed("查询运营商信息发生异常");
+    }
+
+
+    /**
+     * 查询充电站信息
+     * supervise_query_stations_info
+     */
+    @PostMapping("/v1/supervise_query_stations_info")
+    public CommonResult<?> supervise_query_stations_info(HttpServletRequest request , @RequestBody CommonParamsDTO dto) {
+        logger.info("{}-查询充电站信息 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            logger.info("{}-携带的token:{}",platformName, request.getHeader("Authorization"));
+            // 校验令牌
+            if (!verifyToken(request.getHeader("Authorization"))) {
+                // 校验失败
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
+            }
+
+            // 校验签名
+            if (!verifySignature(dto)) {
+                // 签名错误
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
+            }
+
+            // 解析入参
+            QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto , QueryStationInfoDTO.class);
+
+            // 执行逻辑
+            Map<String, String> map = platformLogic.queryStationsInfo(queryStationInfoDTO);
+            logger.info("{}-查询充电站信息 result:{}" , platformName , JSON.toJSONString(map));
+            return CommonResult.success(0 , "查询充电站信息成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.info("{}-查询充电站信息 error:" , platformName , e);
+        }
+        return CommonResult.failed("查询充电站信息发生异常");
+    }
+
+
+
+    /**
+     * 设备接口状态查询 query_station_status
+     *
+     * @param request
+     * @param dto
+     * @return
+     */
+    @PostMapping("/v1/supervise_query_station_status")
+    public CommonResult<?> query_stations_status(HttpServletRequest request , @RequestBody CommonParamsDTO dto) {
+        logger.info("{}-设备接口状态查询 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            // 校验令牌
+            if (!verifyToken(request.getHeader("Authorization"))) {
+                // 校验失败
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
+            }
+
+            // 校验签名
+            if (!verifySignature(dto)) {
+                // 签名错误
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
+            }
+
+            // 解析入参
+            QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto , QueryStationInfoDTO.class);
+
+            // 执行逻辑
+            Map<String, String> map = platformLogic.queryStationStatus(queryStationInfoDTO);
+            logger.info("{}-设备接口状态查询 result:{}" , platformName , map);
+            return CommonResult.success(0 , "设备接口状态查询成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.info("{}-设备接口状态查询 error:" , platformName , e);
+        }
+        return CommonResult.failed("设备接口状态查询发生异常");
+    }
+
+
+    /**
+     * 查询补贴发放信息
+     * supervise_query_subsidy_grant_info
+     * @param request
+     * @param dto
+     * @return
+     */
+/*    @PostMapping("/v1/supervise_query_subsidy_grant_info")
+    public CommonResult<?> supervise_query_subsidy_grant_info(HttpServletRequest request , @RequestBody CommonParamsDTO dto) {
+        logger.info("{}-查询补贴发放信息 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            // 校验令牌
+            if (!verifyToken(request.getHeader("Authorization"))) {
+                // 校验失败
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
+            }
+
+            // 校验签名
+            if (!verifySignature(dto)) {
+                // 签名错误
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
+            }
+
+            // 解析入参
+            QueryStationInfoDTO querySubsidyGrantInfoDTO = parseParamsDTO(dto , QueryStationInfoDTO.class);
+
+            // 执行逻辑
+            Map<String, String> map = platformLogic.querySubsidyGrantInfo(querySubsidyGrantInfoDTO);
+            logger.info("{}-查询补贴发放信息 result:{}" , platformName , map);
+            return CommonResult.success(0 , "查询补贴发放信息成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.info("{}-查询补贴发放信息 error:" , platformName , e);
+        }
+        return CommonResult.failed("查询补贴发放信息发生异常");
+    }*/
+
+
+
+
+
+
+
+}
--- a/jsowell-admin/src/main/resources/application-pre.yml
+++ b/jsowell-admin/src/main/resources/application-pre.yml
@@ -8,17 +8,17 @@ spring:
  # redis 配置
  redis:
    # 地址
-#    host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
-    host: 106.14.94.149
+    host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
+#    host: 106.14.94.149
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 账号
-#    username: jsowell
-#    # 密码
-#    password: js@160829
-    password: js160829
+    username: jsowell
+    # 密码
+    password: js@160829
+#    password: js160829
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -38,12 +38,12 @@ spring:
    druid:
      # 主库数据源
      master:
-#        url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: jsowell
-#        password: js@160829
-        url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jsowell_pre
-        password: Js@160829
+        url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: jsowell
+        password: js@160829
+#        url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: jsowell_pre
+#        password: Js@160829
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭