LiFei 4 роки тому
батько
коміт
788ca1c82f

+ 40 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgplatform/controller/HlgPlatformController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.hlgplatform.controller;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -10,10 +11,16 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.common.utils.CryptTool;
+import org.jeecg.common.utils.HttpsContants;
+import org.jeecg.common.utils.OauthApi;
+import org.jeecg.common.utils.OauthTokenUtils;
 import org.jeecg.modules.hlgplatform.entity.HlgPlatform;
 import org.jeecg.modules.hlgplatform.service.IHlgPlatformService;
 
@@ -255,4 +262,37 @@ public class HlgPlatformController {
         return Result.ok("文件导入失败!");
     }
 
+
+
+
+
+    /**
+     *  服务商配置选择列表
+     * @param
+     * @return
+     */
+    @PutMapping(value = "/applicationSubList")
+    public Result<Object> applicationSubcontractorList() {
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.applicationSubcontractorList;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", 1);
+        parameters.put("pageSize", -1);
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("jsonObject===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean("success")) {
+                log.info("配置选择列表===={}", jsonObject);
+                List<Object> list = (List<Object>) jsonObject.get("result");
+                return Result.ok(list);
+            } else {
+                //抛出异常
+                throw new JeecgBootException("查询失败");
+            }
+        } else {
+            throw new JeecgBootException("查询失败");
+        }
+    }
+
 }

+ 4 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgplatform/entity/HlgPlatform.java

@@ -79,4 +79,8 @@ public class HlgPlatform implements Serializable {
 	@Excel(name = "是否锁定(0:否 1:是)", width = 15)
 	@Dict(dicCode = "is_lock")
 	private java.lang.Integer isLock;
+
+	private Integer businessBelongId; //业务归属
+
+	private String businessBelong; //业务归属名称(仅做回显用不参与业务)
 }

+ 4 - 2
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgplatform/mapper/xml/HlgPlatformMapper.xml

@@ -19,7 +19,9 @@
 		a.create_by AS "createBy.id",
 		a.update_time AS "updateTime",
 		a.update_by AS "updateBy.id",
-		a.is_lock AS "isLock"
+		a.is_lock AS "isLock",
+		a.business_belong_id as "businessBelongId",
+		a.business_belong as "businessBelong"
 	</sql>
 
     <sql id="hlgPlatformJoins">
@@ -69,7 +71,7 @@
 			create_by,
 			update_time,
 			update_by,
-			is_lock
+			is_lock,
 		) VALUES (
 			#{platformName},
 			#{enterpriseName},