平台新增选择归属平台

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/platmanager/controller/HwPlatformController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.platmanager.controller;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -9,10 +10,17 @@ import java.io.UnsupportedEncodingException;
 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.platmanager.entity.HwPlatform;
 import org.jeecg.modules.platmanager.service.IHwPlatformService;
 
@@ -255,4 +263,35 @@ public class HwPlatformController {
       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("查询失败");
+		 }
+	 }
+
+
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/platmanager/entity/HwPlatform.java

@@ -114,4 +114,12 @@ public class HwPlatform implements Serializable {
     private String dutyParagraph; //税号
 
     private String businessLicense; //营业执照
+
+    private Integer businessBelongId; //业务归属
+
+    private String businessBelong; //业务归属名称（仅做回显用不参与业务）
+
+    private Integer isShare; //数据是否在手机端展示（0：否 1：是）
+
+
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/platmanager/mapper/xml/HwPlatformMapper.xml

@@ -21,7 +21,10 @@
 		a.sys_org_code AS "sysOrgCode",
 		a.status AS "status",
 		a.duty_paragraph as "dutyParagraph",
-		a.business_license as "businessLicense"
+		a.business_license as "businessLicense",
+		a.business_belong_id as "businessBelongId",
+		a.business_belong as "businessBelong",
+		a.is_share as "isShare"
 	</sql>
 
     <sql id="hwPlatformJoins">
@@ -77,7 +80,10 @@
 			sys_org_code,
 			status,
 			duty_paragraph,
-			business_license
+			business_license,
+			business_belong_id,
+			business_belong,
+			is_share
 		) VALUES (
 			#{HwPlatform.platformName},
 			#{HwPlatform.enterpriseName},
@@ -95,7 +101,10 @@
 			#{HwPlatform.sysOrgCode},
 			#{HwPlatform.status},
 			#{HwPlatform.dutyParagraph},
-			#{HwPlatform.businessLicense}
+			#{HwPlatform.businessLicense},
+			#{HwPlatform.businessBelongId},
+			#{HwPlatform.businessBelong},
+			#{HwPlatform.isShare}
 		)
 	</insert>
 
@@ -116,7 +125,10 @@
 			sys_org_code = #{HwPlatform.sysOrgCode},
 			status = #{HwPlatform.status},
 			duty_paragraph = #{HwPlatform.dutyParagraph},
-			business_license = #{HwPlatform.businessLicense}
+			business_license = #{HwPlatform.businessLicense},
+			business_belong_id = #{HwPlatform.businessBelongId},
+			business_belong = #{HwPlatform.businessBelong},
+			is_share = #{HwPlatform.isShare}
 		WHERE id = #{HwPlatform.id}
 	</update>
 

happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -49,6 +49,9 @@ public interface OauthApi {
     //企业服务商-服务商配置列表
     public static final String APPLICATION_SUBCONTRACTOR_LIST = "/oauth/hlwCompanySubcontractor/applicationSubcontractorList";
 
+    //平台所用慧盈应用配置列表
+    public static final String applicationSubcontractorList = "/oauth/hlwCompanySubcontractor/applicationSubList";
+
     //企业服务商-合同列表
     public static final String COMPANY_SUBCONTRACTOR_CONTRACT_LIST = "/oauth/hlwCompanySubcontractor/contractList";