解决报错

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.EnterpriseBody;
+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.system.dskService.EnterpriseService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,9 +29,28 @@ public class EnterpriseController {
     @Autowired
     private EnterpriseService enterpriseService;
 
+    @ApiOperation(value = "企业详情头部信息")
     @PostMapping("/infoHeader")
-    public R infoHeader(@RequestBody @Valid EnterpriseBody body) throws Exception
+    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception
     {
-      return enterpriseService.infoHeader(body);
+        return enterpriseService.infoHeader(body);
+    }
+
+    @ApiOperation(value = "企业统计信息")
+    @PostMapping(value = "statistic")
+    public R statistic(@RequestBody @Valid EnterpriseStatisticBody vo) throws Exception {
+        return enterpriseService.statistic(vo);
+    }
+
+    @ApiOperation(value = "招标偏好信息")
+    @PostMapping(value = "bidDataGroup")
+    public R bidDataGroup(@RequestBody @Valid EnterpriseBidDataGroupBody vo) throws Exception {
+        return enterpriseService.bidDataGroup(vo);
+    }
+
+    @ApiOperation(value = "供应商列表")
+    @PostMapping(value = "supplierPage")
+    public R supplierPage(@RequestBody @Valid EnterpriseSupplierPageBody vo) throws Exception {
+        return enterpriseService.supplierPage(vo);
     }
 }

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

+package com.dsk.common.core.domain.model;
+
+import javax.validation.constraints.NotNull;
+
+public class EnterpriseBidDataGroupBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    /**
+     * 时间跨度id 1：年，2：月，3：周
+     */
+    @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/EnterpriseInfoHeaderBody.java

+package com.dsk.common.core.domain.model;
+
+import javax.validation.constraints.NotNull;
+
+public class EnterpriseInfoHeaderBody
+{
+    /**
+     * 企业id
+     */
+    @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/EnterpriseBody.java → dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseStatisticBody.java

@@ -2,7 +2,7 @@ package com.dsk.common.core.domain.model;
 
 import javax.validation.constraints.NotNull;
 
-public class EnterpriseBody
+public class EnterpriseStatisticBody
 {
     /**
      * 企业id
@@ -20,7 +20,7 @@ public class EnterpriseBody
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer("com.dsk.common.core.domain.model.EnterpriseBody{");
+        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 {
+
+    //企业Id
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+    
+    //是否企业首页用，首页用到缓存
+    private Boolean isIndex = true;
+    
+    //查询关键词（供应商名）
+    private String key;
+    
+    //排序字段
+    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{");
+        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(", pageSize=").append(getPageSize());
+        sb.append('}');
+        return sb.toString();
+    }
+}

dsk-common/src/main/java/com/dsk/common/dtos/AptitudeQueryDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 

dsk-common/src/main/java/com/dsk/common/dtos/BeijingQueryDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/BusinessInfoDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 

dsk-common/src/main/java/com/dsk/common/dtos/ComposePersonnelQueryDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/EstablishmentDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/HeaderDto.java

 package com.dsk.common.dtos;
 
-import com.md.common.entity.Page;
 import lombok.Data;
 
 /**

dsk-common/src/main/java/com/dsk/common/dtos/JskBidCandidateDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/JskBidNewsDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/JskBidQueryDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-common/src/main/java/com/dsk/common/dtos/JskDataScreenDto.java

 package com.dsk.common.dtos;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.md.common.entity.Page;
 import lombok.Data;
 
 @Data

dsk-common/src/main/java/com/dsk/common/dtos/LandMarketDto.java

 package com.dsk.common.dtos;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;

dsk-framework/src/main/java/com/dsk/framework/config/MyBatisConfig.java

@@ -116,9 +116,9 @@ public class MyBatisConfig
     @Bean
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
     {
-        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-        String configLocation = env.getProperty("mybatis.configLocation");
+        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
+        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
+//        String configLocation = env.getProperty("mybatis-plus.configLocation");
         typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
         VFS.addImplClass(SpringBootVFS.class);
 
@@ -126,7 +126,7 @@ public class MyBatisConfig
         sessionFactory.setDataSource(dataSource);
         sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
         sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
-        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
+//        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
         return sessionFactory.getObject();
     }
 }

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

@@ -2,7 +2,10 @@ 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.EnterpriseBody;
+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.utils.DskOpenApiUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +29,23 @@ public class EnterpriseService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
-    public R infoHeader(EnterpriseBody body) throws Exception {
+    public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public R statistic(EnterpriseStatisticBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidDataGroup(EnterpriseBidDataGroupBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bidDataGroup", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }