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-admin/src/main/resources/application-dev.yml

@@ -49,7 +49,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: dev
           password: DskSzh!456
         # 从库数据源

dsk-admin/src/main/resources/application-test.yml

@@ -49,7 +49,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: dev
           password: DskSzh!456
         # 从库数据源

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

 package com.dsk.cscec.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -28,9 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 咨询机构(SysAdvisoryBody)表服务实现类
@@ -59,15 +58,18 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
         //先按照分页要求从咨询机构表中查出分页数据
         QueryWrapper<AdvisoryBody> wrapper = Wrappers.query();
         wrapper.like(StringUtils.isNotBlank(advisoryBodySearchBo.getAdvisoryBodyName()), "advisory_body_name", advisoryBodySearchBo.getAdvisoryBodyName())
-                .between(ObjectUtil.isNotNull(advisoryBodySearchBo.getMinLastCooperateDate()) && ObjectUtil.isNotNull(advisoryBodySearchBo.getMaxLastCooperateDate()),
-                        "create_time",
-                        advisoryBodySearchBo.getMinLastCooperateDate(),
-                        advisoryBodySearchBo.getMaxLastCooperateDate())
                 .like(StringUtils.isNotBlank(advisoryBodySearchBo.getBusinessScope()), "business_scope", advisoryBodySearchBo.getBusinessScope());
         Page<AdvisoryBodySearchVo> page = baseMapper.selectPageAdvisoryBodyList(pageQuery.build(), wrapper);
 
+        Date minLastCooperateDate = advisoryBodySearchBo.getMinLastCooperateDate();
+        Date maxLastCooperateDate = advisoryBodySearchBo.getMaxLastCooperateDate();
+
         //根据咨询机构cid查询对应的企业信息
-        for (AdvisoryBodySearchVo advisoryBodySearchVo : page.getRecords()) {
+        List<AdvisoryBodySearchVo> advisoryBodySearchVoList = page.getRecords();
+
+        Iterator<AdvisoryBodySearchVo> iterator = advisoryBodySearchVoList.iterator();
+        while (iterator.hasNext()) {
+            AdvisoryBodySearchVo advisoryBodySearchVo = iterator.next();
             EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
             //有Cid的才去建设库查数据
             if (ObjectUtil.isNotNull(advisoryBodySearchVo.getAdvisoryBodyCid())) {
@@ -77,14 +79,30 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
             }
             Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
             Map companyData = MapUtils.getMap(companyMap, "data", null);
-            //最近一次合作时间
+
+            //查询最近一次合作时间
             List<AdvisoryBodyProject> advisoryBodyProjectList = advisoryBodyProjectMapper.selectList(new LambdaQueryWrapper<AdvisoryBodyProject>()
                     .select(AdvisoryBodyProject::getCreateTime)
                     .eq(AdvisoryBodyProject::getAdvisoryBodyCid, advisoryBodySearchVo.getAdvisoryBodyCid())
                     .orderByDesc(AdvisoryBodyProject::getCreateTime));
+            Date lastCooperateDate = null;
             if (ObjectUtil.isNotNull(advisoryBodyProjectList) && !advisoryBodyProjectList.isEmpty()) {
-                advisoryBodySearchVo.setLastCooperateTime(advisoryBodyProjectList.get(0).getCreateTime());
+                //暂时取记录生成作为最近一次合作时间
+                //TODO:AdvisoryBodyProject表中保留了cooperate_time字段,应当取该字段作为最近一次合作时间,但产品并未给存入这个字段的需求
+                lastCooperateDate = advisoryBodyProjectList.get(0).getCreateTime();
+                advisoryBodySearchVo.setLastCooperateTime(lastCooperateDate);
+            }
+
+            //筛选最近一次合作时间
+            if (ObjectUtil.isNotNull(lastCooperateDate)
+                    && ObjectUtil.isNotNull(minLastCooperateDate)
+                    && ObjectUtil.isNotNull(maxLastCooperateDate)) {
+                if (DateUtil.isExpired(minLastCooperateDate, maxLastCooperateDate, lastCooperateDate)) {
+                    iterator.remove();
+                    continue;
+                }
             }
+
             //经营范围
             advisoryBodySearchVo.setBusinessStatus(MapUtils.getString(companyData, "businessStatus", ""));
             //法人
@@ -104,6 +122,7 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
             advisoryBodySearchVo.setCooperateProjectCount(advisoryBodyProjectMapper.selectCount(new LambdaQueryWrapper<AdvisoryBodyProject>()
                     .eq(AdvisoryBodyProject::getAdvisoryBodyCid, advisoryBodySearchVo.getAdvisoryBodyCid())));
         }
+
         return TableDataInfo.build(page);
     }
 
@@ -132,7 +151,7 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                 List<Map<String, Object>> data = (List<Map<String, Object>>) jskData.get("list");
                 for (Map<String, Object> companyData : data) {
                     //企业名称完全匹配上,则直接返回给前端
-                    String companyName = StringUtils.removeRed(MapUtils.getString(companyData, "name","NotExist"));
+                    String companyName = StringUtils.removeRed(MapUtils.getString(companyData, "name", "NotExist"));
                     if (advisoryBodyName.equals(companyName)) {
                         AdvisoryBodyExistVo advisoryBodyExistVo = new AdvisoryBodyExistVo();
                         advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(MapUtils.getLong(companyData, "jskEid")));
@@ -158,7 +177,8 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) {
-        long advisoryBodyId = IdUtil.getSnowflakeNextId();;
+        long advisoryBodyId = IdUtil.getSnowflakeNextId();
+        ;
         //如果是新增咨询机构,则需要新增记录到咨询机构表
         if (addAdvisoryBodyBo.getIsNewAdvisoryBody()) {
             AdvisoryBody newAdvisoryBody = BeanUtil.toBean(addAdvisoryBodyBo, AdvisoryBody.class);

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.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -16,6 +17,7 @@ import com.dsk.system.domain.SysUserFileRecord;
 import com.dsk.system.domain.vo.AptitudeVo;
 import com.dsk.system.service.ISysUserFileRecordService;
 import com.dsk.system.utils.DskOpenApiUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -34,6 +36,7 @@ import java.util.*;
  * @Date 2023/12/06 16:40
  **/
 @Service
+@Slf4j
 public class ExportService {
 
     @Autowired
@@ -47,7 +50,7 @@ public class ExportService {
         int exportCount = 1;
         if (RedisUtils.hasKey("aptitudeFileExportCount")){
             exportCount = RedisUtils.getCacheObject("aptitudeFileExportCount");
-            if (exportCount>=3){
+            if (exportCount>=3000){
                 return AjaxResult.error("每天最多导出3次");
             }
         }
@@ -55,11 +58,14 @@ public class ExportService {
         ComposeQueryDto composeQueryDto = new ComposeQueryDto();
         //识别Excel内容
         List<AptitudeVo> companyNameList = new ExcelUtils<>(AptitudeVo.class).importExcel(file.getInputStream(), 2);
-        if (companyNameList.isEmpty()) {
+        if (CollectionUtil.isEmpty(companyNameList)) {
             throw new ServiceException("表格中不存在待查询数据!");
         }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < companyNameList.size(); i++) {
+            if (null==companyNameList.get(i)){
+                return AjaxResult.error("上传格式有误");
+            }
             if (i<500){
                 list.add(companyNameList.get(i).getCompanyName());
             }
@@ -81,7 +87,7 @@ public class ExportService {
         composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
         composeQueryDto.setExportExeclName(fileName);
         dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
-        RedisUtils.setCacheObject("aptitudeFileExportCount",exportCount);
+        RedisUtils.setCacheObject("aptitudeFileExportCount",exportCount+1);
         RedisUtils.expire("aptitudeFileExportCount", Duration.ofHours(24));
         return AjaxResult.success();
     }

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

@@ -86,7 +86,7 @@
           <el-button type="primary" @click="handleConfirm">确定取消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" :close-on-click-modal="false">
+      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" :close-on-click-modal="false" @close="handleCancel1">
         <div class="add-content">
           <div class="enterprise">
             <div class="label">企业名称</div>
@@ -115,7 +115,7 @@
           <el-button type="primary" @click="handleAdd">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" :close-on-click-modal="false">
+      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" :close-on-click-modal="false" @close="handleUploadCancel1">
         <div class="upload-content">
           <el-upload
             class="upload-demo"
@@ -219,7 +219,6 @@
     },
     methods: {
       async querySubmit() {
-        console.log(this.queryParams)
         companyPage(this.queryParams).then(res => {
           console.log(res)
           this.isSkeleton = false;
@@ -247,13 +246,18 @@
         let data={
           cid:this.cid
         }
-        companyAdd(data).then(res => {
-          this.qyVisible=false;
-          this.companyName=''
-          this.dataList=[]
-          this.$message.success("新增成功");
-          this.querySubmit()
-        })
+        if(this.cid.length > 0){
+          companyAdd(data).then(res => {
+            this.qyVisible=false;
+            this.companyName=''
+            this.dataList=[]
+            this.$message.success("新增成功");
+            this.querySubmit()
+          })
+        }else {
+          this.$message.warning("请选择要添加的企业");
+        }
+
 
       },
       radioBtn(val){
@@ -385,7 +389,12 @@
         a.remove();
       },
       submitUpload() {
-        this.$refs.upload.submit();
+        if(this.fileList.length > 0){
+          this.$refs.upload.submit();
+        }else {
+          this.$message.warning("请选择要上传的内容");
+        }
+
       },
     }
   }

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

@@ -447,26 +447,16 @@
             this.querySubmit()
             break;
           case 2:
-            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 3))
-            this.queryParams.condition.endTime = this.formatDate(endTime)
-            this.querySubmit()
-            break;
-          case 3:
             this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 7))
             this.queryParams.condition.endTime = this.formatDate(endTime)
             this.querySubmit()
             break;
-          case 4:
-            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 15))
-            this.queryParams.condition.endTime = this.formatDate(endTime)
-            this.querySubmit()
-            break;
-          case 5:
+          case 3:
             this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 30))
             this.queryParams.condition.endTime = this.formatDate(endTime)
             this.querySubmit()
             break;
-          case 6:
+          case 4:
             this.date=[]
             break;
           default: