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

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

@@ -28,6 +28,13 @@ public class EnterpriseController {
     @Autowired
     private EnterpriseService enterpriseService;
 
+
+    @ApiOperation(value = "企业标签信息（建设库）")
+    @PostMapping("/label")
+    public R label(@RequestBody @Valid EnterpriseInfoLabelBody body) throws Exception {
+        return enterpriseService.label(body);
+    }
+
     @ApiOperation(value = "企业详情头部信息（建设库）")
     @PostMapping("/infoHeader")
     public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception {

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

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.Map;
 
 
@@ -46,13 +45,13 @@ public class IndexController {
 
     @ApiOperation(value = "大项目最新中标")
     @PostMapping(value = "bigWinningBidsPage")
-    public TableDataInfo bigWinningBidsPage(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+    public TableDataInfo bigWinningBidsPage(@RequestBody IndexBigWinningBidsPageBody vo) throws Exception {
         return enterpriseService.bigWinningBidsPage(vo);
     }
 
     @ApiOperation(value = "大项目最新招标")
     @PostMapping(value = "bigBidPage")
-    public TableDataInfo bigBidPage(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+    public TableDataInfo bigBidPage(@RequestBody IndexBigBidPageBody vo) throws Exception {
         return enterpriseService.bigBidPage(vo);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInfoLabelBody.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 EnterpriseInfoLabelBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class IndexBigBidPageBody extends BasePage
+{
+    /**
+     * 开始时间
+     */
+    private Date timeStart;
+    /**
+     * 截止时间
+     */
+    private Date timeEnd;
+    /**
+     * 金额起 默认2亿
+     */
+    private Double amountStart = 20000.00;
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
+    /**
+     * 省份Id
+     */
+    private Integer provinceId;
+
+    private List<String> projects;
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class IndexBigWinningBidsPageBody extends BasePage {
+    /**
+     * 开始时间
+     */
+    private Date timeStart;
+    /**
+     * 截止时间
+     */
+    private Date timeEnd;
+    /**
+     * 金额起 默认2亿
+     */
+    private Double amountStart = 20000.00;
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
+    /**
+     * 省份Id
+     */
+    private Integer provinceId;
+
+    private List<String> projects;
+
+}

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

@@ -49,6 +49,30 @@ public class EnterpriseService {
     @Autowired
     private RedisCache redisCache;
 
+    public R label(EnterpriseInfoLabelBody body) throws Exception {
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        if (body.isVaildCid()) {
+            return R.ok(mapList);
+        }
+        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/label", BeanUtil.beanToMap(body, false, false));
+        Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
+        if (200 != companyCode) {
+            return R.ok(mapList);
+        }
+        // list
+        List<Map<String, Object>> data = (List<Map<String, Object>>) companyMap.get("data");
+        if (ObjectUtil.isNotEmpty(data)) {
+            for (Map<String, Object> labelsMap : data) {
+                String labelName = MapUtils.getString(labelsMap,"labelName", "");
+                if (labelName.equals("央企企业") || labelName.equals("国企") || labelName.equals("央企") ||
+                        labelName.equals("央企子公司") || labelName.equals("国有企业") || labelName.equals("省属国企")) {
+                    mapList.add(labelsMap);
+                }
+            }
+        }
+        return R.ok(mapList);
+    }
+
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         if (body.isVaildCid()) return R.ok();
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));

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

@@ -37,12 +37,12 @@ public class IndexService {
         return BeanUtil.toBean(map, R.class);
     }
 
-    public TableDataInfo bigWinningBidsPage(EnterprisePartnersBody body) throws Exception {
+    public TableDataInfo bigWinningBidsPage(IndexBigWinningBidsPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigWinningBidsPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo bigBidPage(EnterprisePartnersBody body) throws Exception {
+    public TableDataInfo bigBidPage(IndexBigBidPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigBidPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }