企业概览和工商信息

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

 package com.dsk.web.controller.dsk;
 
 import com.dsk.common.core.domain.R;
-import com.dsk.common.core.domain.model.EnterpriseBidDataGroupBody;
-import com.dsk.common.core.domain.model.EnterpriseInfoHeaderBody;
-import com.dsk.common.core.domain.model.EnterpriseStatisticBody;
-import com.dsk.common.core.domain.model.EnterpriseSupplierPageBody;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.system.dskService.EnterpriseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,7 +26,7 @@ public class EnterpriseController {
     @Autowired
     private EnterpriseService enterpriseService;
 
-    @ApiOperation(value = "企业详情头部信息")
+    @ApiOperation(value = "企业详情头部信息（建设库）")
     @PostMapping("/infoHeader")
     public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception
     {
@@ -37,20 +34,75 @@ public class EnterpriseController {
     }
 
     @ApiOperation(value = "企业统计信息")
-    @PostMapping(value = "statistic")
+    @PostMapping(value = "statistic（建设库）")
     public R statistic(@RequestBody @Valid EnterpriseStatisticBody vo) throws Exception {
         return enterpriseService.statistic(vo);
     }
 
-    @ApiOperation(value = "招标偏好信息")
+    @ApiOperation(value = "招标偏好信息（openApi）")
     @PostMapping(value = "bidDataGroup")
     public R bidDataGroup(@RequestBody @Valid EnterpriseBidDataGroupBody vo) throws Exception {
         return enterpriseService.bidDataGroup(vo);
     }
 
-    @ApiOperation(value = "供应商列表")
+    @ApiOperation(value = "供应商列表（建设库）")
     @PostMapping(value = "supplierPage")
     public R supplierPage(@RequestBody @Valid EnterpriseSupplierPageBody vo) throws Exception {
         return enterpriseService.supplierPage(vo);
     }
+
+    @ApiOperation(value = "甲方业绩数据（openApi）")
+    @PostMapping(value = "projectTenderDataGroup")
+    public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception {
+        return enterpriseService.projectTenderDataGroup(vo);
+    }
+
+    @ApiOperation(value = "股东列表（openApi）")
+    @PostMapping(value = "partners")
+    public R partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+        return enterpriseService.partners(vo);
+    }
+
+    @ApiOperation(value = "对外投资列表（openApi）")
+    @PostMapping(value = "investment")
+    public R investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
+        return enterpriseService.investment(vo);
+    }
+
+    @ApiOperation(value = "分支机构列表（openApi）")
+    @PostMapping(value = "affiliates")
+    public R affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
+        return enterpriseService.affiliates(vo);
+    }
+
+    @ApiOperation(value = "招标公告列表（建设库）")
+    @PostMapping(value = "bidNoticePage")
+    public R bidNoticePage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
+        return enterpriseService.bidNoticePage(vo);
+    }
+
+    @ApiOperation(value = "企业动态列表（建设库）")
+    @PostMapping(value = "dynamicPage")
+    public R dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
+        return enterpriseService.dynamicPage(vo);
+    }
+
+    @ApiOperation(value = "工商基本信息（openApi）")
+    @PostMapping(value = "icInfo")
+    public R icInfo(@RequestBody @Valid EnterpriseIcInfoBody vo) throws Exception {
+        return enterpriseService.icInfo(vo);
+    }
+
+    @ApiOperation(value = "工商变更信息列表（openApi）")
+    @PostMapping(value = "changeInfo")
+    public R changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
+        return enterpriseService.changeInfo(vo);
+    }
+
+    @ApiOperation(value = "高管信息列表（openApi）")
+    @PostMapping(value = "keymembers")
+    public R keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+        return enterpriseService.keymembers(vo);
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java

+package com.dsk.common.core.domain.model;
+
+/**
+ * 基础分页类
+ * @author hypnos
+ * @Description
+ * @Date Created in 2022-10-27 07:08:54
+ * @Modified By hypnos
+ */
+public class BasePage {
+	
+	/**
+	 * 当前页码
+	 */
+	private Integer pageIndex = 1;
+	
+	/**
+	 * 每页数量
+	 */
+	private Integer pageSize = 10;
+	
+	/**
+	 * 最大页码
+	 */
+	private Integer pageMaxIndex;
+	
+	/**
+	 * 最大条数
+	 */
+	private Integer pageMaxSize;
+
+	
+	public Integer getPageIndex() {
+		return pageMaxIndex != null && pageIndex > pageMaxIndex?  pageMaxIndex : pageIndex;
+	}
+
+	public void setPageIndex(Integer pageIndex) {
+		this.pageIndex = pageIndex;
+	}
+
+	public Integer getPageSize() {
+		return pageMaxSize != null && pageSize > pageMaxSize?  pageMaxSize : pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Integer getPageMaxIndex() {
+		return pageMaxIndex;
+	}
+
+	public void setPageMaxIndex(Integer pageMaxIndex) {
+		this.pageMaxIndex = pageMaxIndex;
+	}
+
+	public Integer getPageMaxSize() {
+		return pageMaxSize;
+	}
+
+	public void setPageMaxSize(Integer pageMaxSize) {
+		this.pageMaxSize = pageMaxSize;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("BasePageVo [pageIndex=");
+		builder.append(pageIndex);
+		builder.append(", pageSize=");
+		builder.append(pageSize);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseAffiliatesBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 分支结构列表
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseAffiliatesBody extends BasePage {
+
+    //企业Id
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidDataGroupBody.java

 package com.dsk.common.core.domain.model;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import javax.validation.constraints.NotNull;
 
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
 public class EnterpriseBidDataGroupBody
 {
     /**
@@ -15,28 +24,4 @@ public class EnterpriseBidDataGroupBody
     @NotNull(message = "spanId不能为空")
     private Integer spanId;
 
-    public Integer getCid() {
-        return cid;
-    }
-
-    public void setCid(Integer cid) {
-        this.cid = cid;
-    }
-
-    public Integer getSpanId() {
-        return spanId;
-    }
-
-    public void setSpanId(Integer spanId) {
-        this.spanId = spanId;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseBidDataGroupBody{");
-        sb.append("cid=").append(cid);
-        sb.append(", spanId=").append(spanId);
-        sb.append('}');
-        return sb.toString();
-    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticePageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBidNoticePageBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseChangeInfoBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseChangeInfoBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseDynamicPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseDynamicPageBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseIcInfoBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseIcInfoBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInfoHeaderBody.java

 package com.dsk.common.core.domain.model;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import javax.validation.constraints.NotNull;
 
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
 public class EnterpriseInfoHeaderBody
 {
     /**
@@ -10,19 +19,4 @@ public class EnterpriseInfoHeaderBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseInfoHeaderBody{");
-        sb.append("companyId='").append(companyId).append('\'');
-        sb.append('}');
-        return sb.toString();
-    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 对外投资列表
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseInvestmentBody extends BasePage {
+
+    //企业Id
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseKeymembersBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseKeymembersBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterprisePartnersBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 股东列表
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterprisePartnersBody extends BasePage {
+
+    //企业Id
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectTenderDataGroupBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 甲方业绩数据
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectTenderDataGroupBody {
+
+    //企业Id
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    
+    //group类型 0：金额，1：项目类型
+    private Integer type;
+    
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseStatisticBody.java

 package com.dsk.common.core.domain.model;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import javax.validation.constraints.NotNull;
 
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
 public class EnterpriseStatisticBody
 {
     /**
@@ -10,19 +19,4 @@ public class EnterpriseStatisticBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseStatisticBody{");
-        sb.append("companyId='").append(companyId).append('\'');
-        sb.append('}');
-        return sb.toString();
-    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseSupplierPageBody.java

 package com.dsk.common.core.domain.model;
 
-import com.github.pagehelper.PageInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 
 /**
  * 企业详情供应商信息列表
- * @author hypnos
  */
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class EnterpriseSupplierPageBody extends PageInfo {
+public class EnterpriseSupplierPageBody extends BasePage {
 
     //企业Id
     @NotNull(message = "企业id不能为空")
@@ -30,47 +27,15 @@ public class EnterpriseSupplierPageBody extends PageInfo {
     //排序字段
     private String orderColumn;
 
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public Boolean getIndex() {
-        return isIndex;
-    }
-
-    public void setIndex(Boolean index) {
-        isIndex = index;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getOrderColumn() {
-        return orderColumn;
-    }
-
-    public void setOrderColumn(String orderColumn) {
-        this.orderColumn = orderColumn;
-    }
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.enterpriseSupplierPageBody{");
+        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseSupplierPageBody{");
         sb.append("companyId=").append(companyId);
         sb.append(", isIndex=").append(isIndex);
         sb.append(", key='").append(key).append('\'');
         sb.append(", orderColumn='").append(orderColumn).append('\'');
-        sb.append(", index=").append(getIndex());
-        sb.append(", pageNum=").append(getPageNum());
+        sb.append(", pageIndex=").append(getPageIndex());
         sb.append(", pageSize=").append(getPageSize());
         sb.append('}');
         return sb.toString();

dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java

@@ -23,7 +23,11 @@ public class DskOpenApiUtil {
 	public Map<String,Object> requestBody(String path, Map<String, Object> bodyMap){
 		return request(path, bodyMap, "json");
 	}
-	
+
+	public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
+		return requestWithHeader(path, bodyMap, "json", headerMap);
+	}
+
 	/**
 	 * <b>application/x-www-form-urlencoded请求</b>
 	 * @param path 请求路径
@@ -59,4 +63,29 @@ public class DskOpenApiUtil {
 		}
 	}
 
+	/**
+	 * <b>开放平台统一请求</b>
+	 * @param path 请求路径
+	 * @param bodyMap 参数体
+	 * @param reqBodyType 请求格式
+	 * @return
+	 */
+	public Map<String,Object> requestWithHeader(String path, Map<String, Object> bodyMap, String reqBodyType, Map<String, String> headerMap){
+		try {
+			AccClient.init(new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
+					.setEndpoint(dskOpenApiConfig.endPoint));
+			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap, headerMap);
+			if(!res.containsKey("headers") || !res.containsKey("body")) {
+				throw new RuntimeException(String.format("请求无返回:path=%s",path));
+			}
+			Object resBody = res.get("body");
+			if(resBody == null) {
+				return null;
+			}
+			return CommonUtils.assertAsMap(resBody);
+		} catch (Exception e) {
+			throw new RuntimeException(String.format("请求异常:path=%s,err=%s",path,e.getMessage()));
+		}
+	}
+
 }
\ No newline at end of file

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -2,16 +2,14 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.R;
-import com.dsk.common.core.domain.model.EnterpriseBidDataGroupBody;
-import com.dsk.common.core.domain.model.EnterpriseInfoHeaderBody;
-import com.dsk.common.core.domain.model.EnterpriseStatisticBody;
-import com.dsk.common.core.domain.model.EnterpriseSupplierPageBody;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.utils.DskOpenApiUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -45,7 +43,57 @@ public class EnterpriseService {
     }
 
     public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("Api-Version", "1.0");
+        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false), headerMap);
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    //todo 新数据，待入库
+    public R partners(EnterprisePartnersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R investment(EnterpriseInvestmentBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R affiliates(EnterpriseAffiliatesBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("Api-Version", "1.0");
+        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageBidNoticeInfo", BeanUtil.beanToMap(body, false, false), headerMap);
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R icInfo(EnterpriseIcInfoBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R changeInfo(EnterpriseChangeInfoBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R keymembers(EnterpriseKeymembersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 }