dsx 1 سال پیش
والد
کامیت
23c9ce3e7c

+ 6 - 6
src/main/java/com/fdkankan/openApi/httpclient/callback/SuccessCondition.java

@@ -41,12 +41,12 @@ public class SuccessCondition implements SuccessWhen {
             reqStatus = false;
             return reqStatus;
         }
-//        JSONObject result = JSON.parseObject(content, JSONObject.class);
-//        Integer code = result.getInteger("code");
-//        if(Objects.isNull(code) || code != 0){
-//            reqStatus = false;
-//            return reqStatus;
-//        }
+        JSONObject result = JSON.parseObject(content, JSONObject.class);
+        Integer code = result.getInteger("code");
+        if(Objects.isNull(code) || code != 0){
+            reqStatus = false;
+            return reqStatus;
+        }
         return true;
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/openApi/httpclient/client/FdKKClient.java

@@ -13,7 +13,7 @@ import com.fdkankan.web.response.ResultData;
  * 获取,调用4dkk服务
  */
 @Address(source = FdkkAddressSource.class)
-//@Success(condition = SuccessCondition.class)
+@Success(condition = SuccessCondition.class)
 public interface FdKKClient {
 
     /**

+ 22 - 0
src/main/java/com/fdkankan/openApi/httpclient/client/JmgaClient.java

@@ -0,0 +1,22 @@
+package com.fdkankan.openApi.httpclient.client;
+
+import com.dtflys.forest.annotation.*;
+import com.fdkankan.openApi.httpclient.address.FdkkAddressSource;
+import com.fdkankan.openApi.httpclient.callback.SuccessCondition;
+import com.fdkankan.openApi.vo.www.FdkkLoginVo;
+import com.fdkankan.web.response.Result;
+import com.fdkankan.web.response.ResultData;
+
+/**
+ * 获取,调用4dkk服务
+ */
+@Address(source = FdkkAddressSource.class)
+public interface JmgaClient {
+
+    @Post(
+            url="{url}"
+    )
+    ResultData post(@Var("url") String url, @JSONBody Object param);
+
+
+}

+ 3 - 4
src/main/java/com/fdkankan/openApi/service/www/impl/JySceneAuthServiceImpl.java

@@ -1,16 +1,15 @@
 package com.fdkankan.openApi.service.www.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.openApi.constant.JmgaConstant;
 import com.fdkankan.openApi.entity.www.JySceneAuth;
 import com.fdkankan.openApi.entity.www.ScenePlus;
-import com.fdkankan.openApi.httpclient.client.FdKKClient;
+import com.fdkankan.openApi.httpclient.client.JmgaClient;
 import com.fdkankan.openApi.mapper.www.IJySceneAuthMapper;
 import com.fdkankan.openApi.service.www.IJySceneAuthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.www.UpdateJySceneAuthParamVo;
 import com.fdkankan.web.response.ResultData;
@@ -34,7 +33,7 @@ public class JySceneAuthServiceImpl extends ServiceImpl<IJySceneAuthMapper, JySc
     @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
-    private FdKKClient fdKKClient;
+    private JmgaClient fdKKClient;
 
     @Override
     public ResultData updateAuth(UpdateJySceneAuthParamVo param) {

+ 3 - 4
src/main/java/com/fdkankan/openApi/service/www/impl/JySceneUserAuthServiceImpl.java

@@ -5,8 +5,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.openApi.common.PageInfo;
@@ -14,10 +14,9 @@ import com.fdkankan.openApi.constant.JmgaConstant;
 import com.fdkankan.openApi.entity.www.JySceneUserAuth;
 import com.fdkankan.openApi.entity.www.JyUser;
 import com.fdkankan.openApi.entity.www.ScenePlus;
-import com.fdkankan.openApi.httpclient.client.FdKKClient;
+import com.fdkankan.openApi.httpclient.client.JmgaClient;
 import com.fdkankan.openApi.mapper.www.IJySceneUserAuthMapper;
 import com.fdkankan.openApi.service.www.IJySceneUserAuthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.openApi.service.www.IJyUserService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.system.JmgaGetAuthParamVo;
@@ -53,7 +52,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     private IScenePlusService scenePlusService;
 
     @Autowired
-    private FdKKClient fdKKClient;
+    private JmgaClient fdKKClient;
 
 
     @Override

+ 2 - 5
src/main/java/com/fdkankan/openApi/service/www/impl/JyUserServiceImpl.java

@@ -8,16 +8,13 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.openApi.constant.JmgaConstant;
 import com.fdkankan.openApi.entity.www.JyUser;
-import com.fdkankan.openApi.httpclient.callback.ErrorCallback;
-import com.fdkankan.openApi.httpclient.callback.SuccessCallback;
-import com.fdkankan.openApi.httpclient.client.FdKKClient;
+import com.fdkankan.openApi.httpclient.client.JmgaClient;
 import com.fdkankan.openApi.mapper.www.IJyUserMapper;
 import com.fdkankan.openApi.service.www.IJyUserService;
 import com.fdkankan.openApi.vo.www.DelJyUserParamVo;
 import com.fdkankan.openApi.vo.www.JyUserParamVo;
 import com.fdkankan.openApi.vo.www.SaveJyUserParamVo;
 import com.fdkankan.web.response.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,7 +35,7 @@ import java.util.Set;
 public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implements IJyUserService {
 
     @Resource
-    private FdKKClient fdKKClient;
+    private JmgaClient fdKKClient;
 
     @Override
     public JyUser getByUserName(String userName) {