-

Signed-off-by: Administrator <admin@example.com>

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

@@ -70,7 +70,7 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
     /**
      * 集团Id
      */
-    private Integer combineId;
+    private String combineId;
 
 
 }

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

@@ -36,7 +36,7 @@ public class CompanyRelationTableV1Service {
 
     public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
         Map<String, Object> map = null;
-        if (dto.getCompanyType().equals(3)) {
+        if (dto.getCompanyType().equals(3) || dto.getCompanyType().equals(4)) {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));
         } else {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
@@ -69,7 +69,7 @@ public class CompanyRelationTableV1Service {
     }
 
     public TableDataInfo combinePage(JskCompanyRelationTableV1Dto dto) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combineMemberPage", BeanUtil.beanToMap(dto, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 }

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;
+    }
 }