Merge branch 'dev20230707' of 192.168.60.201:root/dsk-operate-sys into dev20230707

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

@@ -43,7 +43,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public Map<String, Object> clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
+    public TableDataInfo clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
@@ -67,7 +67,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public Map<String, Object> supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
+    public TableDataInfo supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
@@ -102,4 +102,24 @@ public class EnterpriseBussinessController {
     }
 
 
+    @ApiOperation(value = "中标公示详情")
+    @RequestMapping(value = "/bidWinMergeDetail", method = RequestMethod.POST)
+    public R bidWinMergeDetail(@RequestBody EnterpriseBusinessBidWinMergeDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.bidWinMergeDetail(paramMap);
+    }
+
+
+    @ApiOperation(value = "四库业绩详情")
+    @RequestMapping(value = "/skyProjectDetail", method = RequestMethod.POST)
+    public R skyProjectDetail(@RequestBody EnterpriseBusinessSkyProjectDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.skyProjectDetail(paramMap);
+    }
+
+    @ApiOperation(value = "荣誉奖项详情")
+    @RequestMapping(value = "/awardDetail", method = RequestMethod.POST)
+    public R awardDetail(@RequestBody EnterpriseBusinessAwardDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.awardDetail(paramMap);
+    }
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessAwardDetailBody.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 EnterpriseBusinessAwardDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessAwardDetailVo {
+    /**
+     * 来源名称
+     */
+    private String sourceName;
+
+    /**
+     * 来源url
+     */
+    private String sourceUrl;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessBidWinMergeDetailBody.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 EnterpriseBusinessBidWinMergeDetailBody {
+    /**
+     * 来源id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessSkyProjectDetailBody.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 EnterpriseBusinessSkyProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Long sourceId;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessVo {
+    /**
+     * 来源Id
+     */
+    private String source_id;
+
+    /**
+     * 类型
+     */
+    private String source_type;
+
+}

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

@@ -3,10 +3,12 @@ package com.dsk.system.dskService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,18 +63,35 @@ public class EnterpriseBussinessService {
     }
 
 
-    public Map<String, Object> clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
+    public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         if (body.isVaildCid()) return null;
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage2", BeanUtil.beanToMap(body, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -121,25 +140,46 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public Map<String, Object> supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
-        if (body.isVaildCid()) return null;
+    public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage2", BeanUtil.beanToMap(body, false, false));
         log.info(JSONUtil.toJsonStr(map));
+
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -175,4 +215,34 @@ public class EnterpriseBussinessService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public R bidWinMergeDetail(EnterpriseBusinessBidWinMergeDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidWinMergeDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R skyProjectDetail(EnterpriseBusinessSkyProjectDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/skyProjectDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R awardDetail(EnterpriseBusinessAwardDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/awardDetail", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        if (ObjectUtil.isNotEmpty(data)) {
+            String source = MapUtils.getString(data, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBusinessAwardDetailVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBusinessAwardDetailVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBusinessAwardDetailVo vo = enterpriseBussinessVoList.get(0);
+                    return R.ok(vo);
+                }
+            }
+        }
+        return BeanUtil.toBean(map, R.class);
+    }
 }