Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DCustomerController.java

@@ -7,11 +7,12 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.excel.ExcelUtils;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskChangeVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskStatisticsVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskTypeVo;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.domain.vo.DCustomerListVo;
 import com.dsk.cscec.service.IDCustomerService;
-import com.dsk.jsk.domain.JskCombineSearchDto;
-import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,6 +60,42 @@ public class DCustomerController extends BaseController {
         util.exportExcel(response, list, "sheet1","大数据经营管理支撑服务平台供应商导出", true);
     }
 
-  
+    /***
+     *@Description: 供应商风险动态-统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "dynamicRisk/statistics")
+    public R dynamicRiskStatistics(@RequestBody DCustomerDynamicRiskStatisticsVo riskStatisticsVo) {
+        return baseService.dynamicRiskStatistics(riskStatisticsVo);
+    }
+
+    /***
+     *@Description: 查询供应商风险类型分布
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "risk/type")
+    public R riskType(@RequestBody DCustomerDynamicRiskTypeVo riskTypeVo) {
+        return baseService.riskType(riskTypeVo);
+    }
+
+    /***
+     *@Description: 风险类型趋势
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "risk/change")
+    public R riskChange(@RequestBody DCustomerDynamicRiskChangeVo riskChangeVo) {
+        return baseService.riskChange(riskChangeVo);
+    }
+
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerDynamicRiskChangeVo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @ClassName DCustomerDynamicRiskChangeVo
+ * @Description 查询供应商风险类型趋势
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class DCustomerDynamicRiskChangeVo {
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+
+    private String systemCode = "zjyj";
+
+    /**
+     * 风险类型
+     */
+    private String riskType;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerDynamicRiskStatisticsVo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @ClassName DCustomerDynamicRiskStatisticsVo
+ * @Description 供应商风险动态-统计
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class DCustomerDynamicRiskStatisticsVo {
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+
+    private String systemCode = "zjyj";
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerDynamicRiskTypeVo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @ClassName DCustomerDynamicRiskTypeVo
+ * @Description 查询供应商风险类型分布
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class DCustomerDynamicRiskTypeVo {
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+
+    private String systemCode = "zjyj";
+
+    /**
+     * 条件查询开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 条件查询结束时间
+     */
+    private String endTime;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.java

@@ -2,8 +2,12 @@ package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskChangeVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskStatisticsVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskTypeVo;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.domain.vo.DCustomerListVo;
 
@@ -23,5 +27,32 @@ public interface IDCustomerService extends IService<DCustomer> {
 
     DCustomer info(String customerKey);
 
+    /***
+     *@Description: 供应商风险动态-统计
+     *@Param: addVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R dynamicRiskStatistics(DCustomerDynamicRiskStatisticsVo riskStatisticsVo);
+
+    /***
+     *@Description: 查询供应商风险类型分布
+     *@Param: addVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R riskType(DCustomerDynamicRiskTypeVo riskTypeVo);
+
+    /***
+     *@Description: 风险类型趋势
+     *@Param: addVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    R riskChange(DCustomerDynamicRiskChangeVo riskChangeVo);
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

@@ -2,19 +2,26 @@ package com.dsk.cscec.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskChangeVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskStatisticsVo;
+import com.dsk.cscec.domain.bo.DCustomerDynamicRiskTypeVo;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.domain.vo.DCustomerListVo;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.mapper.DSubcontractMapper;
 import com.dsk.cscec.service.IDCustomerService;
 import com.dsk.search.service.BusinessOpportunityRadarService;
+import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +47,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
     @Autowired
     private BusinessOpportunityRadarService opportunityRadarService;
 
+
+    @Resource
+    private DskOpenApiUtil dskOpenApiUtil;
+
     @Override
     public TableDataInfo<DCustomerListVo> allSearchList(DCustomerSearchBo bo, PageQuery query) {
         dealWithCustomerClass(bo);
@@ -178,5 +189,35 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
             }
         }
     }
+
+    @Override
+    public R dynamicRiskStatistics(DCustomerDynamicRiskStatisticsVo riskStatisticsVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            riskStatisticsVo.setUserId(userId);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/dynamicRiskStatistics", BeanUtil.beanToMap(riskStatisticsVo, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    @Override
+    public R riskType(DCustomerDynamicRiskTypeVo riskTypeVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            riskTypeVo.setUserId(userId);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/riskType", BeanUtil.beanToMap(riskTypeVo, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    @Override
+    public R riskChange(DCustomerDynamicRiskChangeVo riskChangeVo) {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            riskChangeVo.setUserId(userId);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/riskChange", BeanUtil.beanToMap(riskChangeVo, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/EnterpriseController.java

@@ -44,6 +44,11 @@ public class EnterpriseController {
         return enterpriseService.statistic(vo);
     }
 
+    @PostMapping(value = "certPage")
+    public TableDataInfo certPage(@RequestBody @Valid EnterpriseInfoCertPageBody vo) throws Exception {
+        return enterpriseService.certPage(vo);
+    }
+
     @PostMapping(value = "bidDataGroup")
     public R bidDataGroup(@RequestBody @Valid EnterpriseBidDataGroupBody vo) throws Exception {
         return enterpriseService.bidDataGroup(vo);

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseInfoCertPageBody.java

+package com.dsk.jsk.domain;
+
+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 EnterpriseInfoCertPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+    /**
+     * 资质名称
+     */
+    private String category;
+
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -446,4 +446,13 @@ public class EnterpriseService {
         return BeanUtil.toBean(map, R.class);
     }
 
+
+    public TableDataInfo certPage(EnterpriseInfoCertPageBody body) throws Exception {
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCert/certPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
 }