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/domain/vo/AdvisoryBodyVo.java

@@ -62,7 +62,7 @@ public class AdvisoryBodyVo {
      * 工程类别明细
      */
     @ExcelProperty(value = "工程类别明细", index = 6)
-    private String projectType;
+    private String projectType2;
 
     /**
      * 咨询机构ID
@@ -97,7 +97,7 @@ public class AdvisoryBodyVo {
      * 合同金额
      */
     @ExcelProperty(value = "合同金额", index = 10)
-    private BigDecimal contractOrigValue;
+    private BigDecimal contractValue;
 
     /**
      * 业主单位

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/dto/PushMonitorInfo.java

@@ -21,43 +21,15 @@ public class PushMonitorInfo implements Serializable {
     /**
      * 对外开放的id
      */
-    private String id;
+    private Integer id;
     /**
-     * 源表id
+     * 用户id
      */
-    private String sourceId;
+    private Long userId;
     /**
-     * 源表名
+     * 动态次数
      */
-    private String sourceTable;
-    /**
-     * 公司Id
-     */
-    private Integer companyId;
-    /**
-     * 企业名称
-     */
-    private String companyName;
-    /**
-     * 风险等级：正向，负向，中立，警示
-     */
-    private String riskLevel;
-    /**
-     * 监控维度父级
-     */
-    private String parentDimension;
-    /**
-     * 监控维度
-     */
-    private String dimension;
-    /**
-     * 动态内容
-     */
-    private String details;
-    /**
-     * 发布时间
-     */
-    private Date publishTime;
+    private Integer count;
     /**
      * 创建时间
      */
@@ -66,27 +38,5 @@ public class PushMonitorInfo implements Serializable {
      * 更新时间
      */
     private Date updateTime;
-    /**
-     * 变更时间-暂时用于法人变更
-     */
-    private Date changeDate;
-    /**
-     * 更新次数
-     */
-    private Integer versionNum;
-    /**
-     * 是否发送 0否 1是
-     */
-    private Integer isSend;
-    /**
-     * 数据来源(jsk,fy)
-     */
-    private String source;
-
-    /**
-     * 系统类型 JSK/BRIS
-     */
-    private String sysType;
-
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushSettingHolidayVo.java

+package com.dsk.monitor.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @ClassName PushMonitorRulesVo
+ * @Description 是否工作日
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class PushSettingHolidayVo {
+
+    /**
+     * 时间戳
+     */
+    private Long timestamp;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/job/PushScheduling.java

@@ -4,13 +4,16 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.monitor.domain.dto.PushMonitorInfo;
 import com.dsk.monitor.domain.dto.PushMonitorRules;
 import com.dsk.monitor.domain.vo.ConditionVo;
 import com.dsk.monitor.domain.vo.PushMonitorDynamicPageVo;
+import com.dsk.monitor.domain.vo.PushSettingHolidayVo;
 import com.dsk.monitor.mapper.PushMonitorInfoMapper;
 import com.dsk.monitor.mapper.PushMonitorRulesMapper;
 import com.dsk.monitor.service.MonitorService;
 import com.dsk.monitor.util.SendMessageUtil;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -18,6 +21,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName PushScheduling
@@ -43,10 +47,14 @@ public class PushScheduling {
     public void receiveModePhone() throws Exception {
         // 是否是周末
         boolean isWeekend = DateUtil.isWeekend(new Date());
-
-        String aa = DateUtil.now();
-
-
+        PushSettingHolidayVo holidayVo = new PushSettingHolidayVo();
+        holidayVo.setTimestamp(System.currentTimeMillis());
+        Map<String, Object> settingHolidayMap = monitorService.settingHoliday(holidayVo);
+        Integer settingHolidayCode = MapUtils.getInteger(settingHolidayMap, "code", 300);
+        Boolean settingHolidayData = MapUtils.getBoolean(settingHolidayMap, "data", null);
+        if (200 == settingHolidayCode) {
+            isWeekend = !settingHolidayData;
+        }
         TenantHelper.setTenantId("1");
         // 获取当前整点时间
         Integer concurrentHour = DateUtils.getHour();
@@ -74,9 +82,6 @@ public class PushScheduling {
             Integer timeStart = Integer.valueOf(timePeriodStart);
             Integer timeEnd = Integer.valueOf(timePeriodEnd);
             if (concurrentHour >= timeStart && concurrentHour <= timeEnd) {
-                QueryWrapper monitorInfoWrapper = new QueryWrapper();
-                // 风险类型
-//                monitorInfoWrapper.in("risk_type", detail.getRiskType());
                 PushMonitorDynamicPageVo pageVo = new PushMonitorDynamicPageVo();
                 pageVo.setUserId(detail.getUserId());
                 ConditionVo vo = new ConditionVo();
@@ -84,21 +89,32 @@ public class PushScheduling {
                 vo.setEndTime(DateUtils.getDate());
                 vo.setBeginTime(DateUtils.format(DateUtils.addDays(new Date(),-1)));
                 // 监控维度
-                vo.setDimension(getDimension(detail.getDimension()));
+                vo.setDimension(getParamList(detail.getDimension()));
                 vo.setUserId(detail.getUserId());
                 pageVo.setCondition(vo);;
-                Integer count = monitorService.companyDynamicPage2(pageVo);
+                Map<String, Object> resMap = monitorService.companyDynamicPageScheduled(pageVo);
+                Integer code = MapUtils.getInteger(resMap, "code", 300);
+                Map data = MapUtils.getMap(resMap, "data", null);
+                if (200 != code) {
+                    continue;
+                }
+                Integer count = MapUtils.getInteger(data, "totalCount", 0);
                 if (count > 0 ) {
                     SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
                 }
+                if (count > 0) {
+                    PushMonitorInfo pushMonitorInfo = new PushMonitorInfo();
+                    pushMonitorInfo.setUserId(detail.getUserId());
+                    pushMonitorInfo.setCount(count);
+                    monitorInfoMapper.insert(pushMonitorInfo);
+                }
             }
         }
     }
 
-
-    public List<String> getDimension(String dimension) {
-        List<String> dimensionList = Arrays.asList(dimension.split(","));
-        return dimensionList;
+    public List<String> getParamList(String dimension) {
+        List<String> getParamList = Arrays.asList(dimension.split(","));
+        return getParamList;
     }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/MonitorService.java

@@ -5,6 +5,8 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.monitor.domain.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @ClassName MonitorService
  * @Description 监控service
@@ -67,7 +69,7 @@ public interface MonitorService {
      *@Author: Dgm
      *@date: 2023/12/9 10:03
      */
-    Integer companyDynamicPage2(PushMonitorDynamicPageVo pageVo) throws Exception;
+    Map<String, Object> companyDynamicPageScheduled(PushMonitorDynamicPageVo pageVo) throws Exception;
 
     /***
      *@Description: 监控报告
@@ -134,4 +136,13 @@ public interface MonitorService {
      *@date: 2023/12/9 10:03
      */
     R systemDetail(PushMonitorSystemDetailVo importAddVo);
+
+    /***
+     *@Description: 是否工作日
+     *@Param: holidayVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java

@@ -104,16 +104,10 @@ public class MonitorServiceImpl implements MonitorService {
     }
 
     @Override
-    public Integer companyDynamicPage2(PushMonitorDynamicPageVo pageVo) throws Exception {
+    public Map<String, Object> companyDynamicPageScheduled(PushMonitorDynamicPageVo pageVo) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
         log.info("companyDynamicPage=============================>"+map);
-        Integer code = MapUtils.getInteger(map, "code", 300);
-        Map data = MapUtils.getMap(map, "data", null);
-        Integer count = 0;
-        if (code.equals(200)) {
-            count = MapUtils.getInteger(data, "totalCount", 0);
-        }
-        return count;
+        return map;
     }
 
     @Override
@@ -320,4 +314,11 @@ public class MonitorServiceImpl implements MonitorService {
         }
         return detailVo;
     }
+
+    @Override
+    public Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/push/settingHoliday", BeanUtil.beanToMap(holidayVo, false, false));
+        log.info("companyDynamicPage=============================>"+map);
+        return map;
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

 package com.dsk.search.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
 import com.dsk.search.service.BusinessOpportunityRadarService;
 import com.dsk.search.service.ExportService;
@@ -62,4 +64,26 @@ public class ExportController {
         return exportService.aptitudeFile(file);
     }
 
+    /**
+     * 集团成员列表导出
+     */
+    @PostMapping("/combine/memberList")
+    public AjaxResult memberListExportPre(@RequestBody JskCombineSearchDto dto) throws Exception {
+        return exportService.memberListExport(dto);
+    }
+
+    //集团中标业绩导出
+    @PostMapping("/combine/win/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public AjaxResult exportWinBid(@RequestBody JskCombineSearchDto dto) {
+        return exportService.exportWinBid(dto);
+    }
+
+    //集团招标业绩导出
+    @PostMapping("/combine/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public AjaxResult exportBid(@RequestBody JskCombineSearchDto dto) {
+        return exportService.exportBid(dto);
+    }
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

 package com.dsk.search.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.excel.ExcelUtils;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
 import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.system.domain.SysUserFileRecord;
@@ -63,6 +65,7 @@ public class ExportService {
         //生成中
         fileRecord.setStatus(2);
         fileRecord.setRemark("资质批量导出");
+        fileRecord.setCreateTime(new DateTime());
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         composeQueryDto.setExportUniqueCode(fileId.toString());
         //回调函数
@@ -72,4 +75,52 @@ public class ExportService {
         return AjaxResult.success();
     }
 
+    //集团成员导出
+    public AjaxResult memberListExport(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团成员列表导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/member", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
+    //集团中标业绩导出
+    public AjaxResult exportWinBid(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团中标业绩导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/combineBid", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
+    //集团招标业绩
+    public AjaxResult exportBid(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团招标业绩导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/combine/tender", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml

@@ -14,7 +14,7 @@
         abp.project_leader_phone,
         ab.advisory_body_name,
         dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
-        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
+        dp.project_type2,dp.contract_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
         from advisory_body_project abp
         left join advisory_body ab on ab.advisory_body_id = abp.advisory_body_id
         left join d_project dp on dp.project_key = abp.project_key

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -80,7 +80,7 @@
               </el-table-column>
               <el-table-column label="监控对象" prop="companyName" align="left" width="250"></el-table-column>
               <el-table-column label="风险级别" prop="riskLevel" align="left" width="120"></el-table-column>
-              <el-table-column label="监控类型" prop="parentName" align="left" width="150"></el-table-column>
+              <el-table-column label="监控类型" prop="dimensionName" align="left" width="150"></el-table-column>
               <el-table-column label="动态内容" prop="details" align="left">
                 <template slot-scope="scope">
                   <div v-for="(item,index) in scope.row.Array" :key="index">

dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue

@@ -87,7 +87,7 @@
               </el-table-column>
               <el-table-column label="监控对象" prop="companyName" align="left" width="250"></el-table-column>
               <el-table-column label="风险级别" prop="riskLevel" align="left" width="120"></el-table-column>
-              <el-table-column label="监控类型" prop="parentName" align="left" width="150"></el-table-column>
+              <el-table-column label="监控类型" prop="dimensionName" align="left" width="150"></el-table-column>
               <el-table-column label="动态内容" prop="details" align="left">
                 <template slot-scope="scope">
                   <div v-for="(item,index) in scope.row.Array" :key="index">

dsk-operate-ui/src/views/supplier/components/BatchImport.vue

@@ -18,6 +18,7 @@
                     :file-list="fileList"
                     :on-change="handleFileListChange"
                     :headers="headers"
+                    :on-remove="onRemove"
                     :on-success="onSuccess">
             <img class="up_img" src="@/assets/images/plus.png">
             <div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div>
@@ -97,14 +98,19 @@ import {importTemplate} from '@/api/supplier/assistant.js';
           this.isUpload = true
         }
       },
+     
+      onRemove(){
+        this.isUpload = false
+      },
       onSuccess(res, file, fileList) {
+        this.$refs["upload"].clearFiles()
+          this.isUpload = false;
+
         if (res.code == 200) {
           this.addsuccess = true;
           this.$emit("loadingFn",true);
-          this.$refs["upload"].clearFiles();
-          this.isUpload = false;
         }else {
-          this.importCancel()
+          this.$emit("loadingFn",false);
           this.$message.error({ message: res.msg, showClose: true })
         }
       },

dsk-operate-ui/src/views/system/supplierBad/index.vue

@@ -23,7 +23,7 @@
             >
               <template slot-scope="scope">
                 <span v-if="scope.row.status===0" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,1)">停用</span>
-                <span v-if="scope.row.status===1" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,1)">启用</span>
+                <span v-if="scope.row.status===1" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,0)">启用</span>
                 <span style="cursor: pointer;color: #FF3C3C;" @click="handleClick(scope.row,2)">删除</span>
               </template>
             </el-table-column>
@@ -168,7 +168,7 @@
     methods: {
       radioBtn(val){
         configUpdate({configKey:'customer-badness-date-type',configValue:val}).then(res => {
-          this.$modal.success(res.msg);
+          this.$message.success(res.msg);
         });
       },
       getList(){
@@ -181,7 +181,8 @@
           console.log(res)
           this.isSkeleton = false;
           this.tableData=res.rows;
-          this.tableDataTotal=res.total
+          this.tableDataTotal=res.total;
+
         })
       },
       handleClick(item,key){
@@ -209,7 +210,7 @@
           console.log(res)
           if(res.code === 200){
             this.visible=false;
-            this.$modal.success("新增成功");
+            this.$message.success("新增成功");
             this.getList()
           }else {
             this.$message.error(res.msg);
@@ -237,7 +238,7 @@
       handleSave(){
         let time=this.startTime.substring(0,2)+'-'+this.endTime.substring(0,2)
         configUpdate({configKey:'customer-badness-time-frame',configValue:time}).then(res => {
-          this.$modal.success(res.msg);
+          this.$message.success(res.msg);
         });
       },
       converTime(time) {