各项目经营分析删除接口

mjava包创建视频会议斌添加返回body映射
工程报表添加三个定时任务
关闭风险绩效流程考核定时任务

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -2,13 +2,10 @@ package com.malk.lanyun.controller;
 
 import com.malk.lanyun.service.FService;
 import com.malk.lanyun.service.NCService;
-import com.malk.lanyun.service.SyncAssetsService;
 import com.malk.lanyun.service.TimerService;
 import com.malk.server.common.McR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;

mjava-lanyun/src/main/java/com/malk/lanyun/schedule/ScheduleTask.java

@@ -75,7 +75,7 @@ public class ScheduleTask {
     /**
      * 每月1日上午8点自动发起风控绩效流程
      */
-    @Scheduled(cron = "0 0 8 1 * ?")
+//    @Scheduled(cron = "0 0 8 1 * ?")
     public void monthRiskMerits() {
         timerService.monthRiskMerits();
         log.info("定时方法执行时间 :" + new Date());

mjava-lanyun/src/main/java/com/malk/lanyun/schedule/WorkTask.java

@@ -28,11 +28,38 @@ public class WorkTask {
 
 
     /**
-     * 每月1日凌晨4点开始跑批考核定额档案表
+     * 每月21日凌晨1点开始跑批考核定额档案表
      */
     @Scheduled(cron = "0 0 1 21 * ?")
     void quotaArchive() {
         log.info("开始跑批考核定额档案表");
         workService.quotaArchive();
     }
+
+    /**
+     * 每日凌晨3点开始跑批每日报工台账
+     */
+    @Scheduled(cron = "0 0 3 * * ?")
+    void getMonthWorkOrder() {
+        log.info("开始跑批每日报工台账");
+        workService.getMonthWorkOrder();
+    }
+
+    /**
+     * 每日凌晨3点30开始跑批月产值汇总表
+     */
+    @Scheduled(cron = "0 30 3 * * ?")
+    void getMonthWorkSummary() {
+        log.info("开始跑批月产值汇总表");
+        workService.getMonthWorkSummary();
+    }
+
+    /**
+     * 每日凌晨3点50开始跑批报工产值汇总
+     */
+    @Scheduled(cron = "0 50 3 * * ?")
+    void getMonthOutSummary() {
+        log.info("开始跑批报工产值汇总");
+        workService.getMonthOutSummary();
+    }
 }

mjava/src/main/java/com/malk/controller/DDCallbackController.java

@@ -57,7 +57,7 @@ public class DDCallbackController {
         }
         // [回调任务执行逻辑: 异步] 钉钉超时3s未返回会被记录为失败, 可通过失败接口获取记录
         if (Arrays.asList(DDConf.BPMS_INSTANCE_CHANGE, DDConf.BPMS_TASK_CHANGE).contains(eventType)) {
-            log.info("[DD]审批回调, {}", eventJson);
+//            log.info("[DD]审批回调, {}", eventJson);
             ddClient_event.callBackEvent_Workflow(eventJson);
             return success;
         }

mjava/src/main/java/com/malk/server/common/VenR.java

@@ -32,6 +32,7 @@ public class VenR extends BaseDto {
     public static final String RC_XBB = "com.malk.server.xbongbong.XBBR";
     public static final String RC_VK = "com.malk.server.vika.VKR";
     public static final String RC_YJ = "com.malk.server.yunjian.DDR";
+    public static final String RC_MT = "com.malk.server.dingtalk.MDR";
     public static final String RC_CRM = "com.malk.server.crm.DDR";
 
     /**

mjava/src/main/java/com/malk/server/dingtalk/MDR.java

@@ -0,0 +1,72 @@
+package com.malk.server.dingtalk;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class MDR<T> extends VenR {
+
+    /**
+     * 会议ID
+     */
+    private String conferenceId;
+
+    /**
+     * 会议密码
+     */
+    private String conferencePassword;
+
+    /**
+     * 主持人密码
+     */
+    private String hostPassword;
+
+    /**
+     * 入会链接
+     */
+    private String externalLinkUrl;
+
+    /**
+     * PSTN呼入号码
+     */
+    private String phoneNumbers;
+
+    /**
+     * 会议code
+     */
+    private String roomCode;
+
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+//        if (!hasMore && ObjectUtil.isNull(userIdList)){
+//            McException.assertException(!errcode.equals(SUC_CODE) && !errcode.equals(USER_CREATE), errcode, errmsg, "dingtalk");
+//        }
+    }
+
+    /**
+     * 通用post请求
+     */
+    public static MDR doPost(String url, Map header, Map param, Map body) {
+        return (MDR) MDR.doPost(url, header, param, body, VenR.RC_MT);
+    }
+
+    /**
+     * 通用get请求
+     */
+    public static MDR doGet(String url, Map header, Map param) {
+        return (MDR) MDR.doGet(url, header, param, VenR.RC_MT);
+    }
+}

mjava/src/main/java/com/malk/service/dingtalk/DDClient_Meeting.java

@@ -1,11 +1,13 @@
 package com.malk.service.dingtalk;
 
+import com.malk.server.dingtalk.MDR;
+
 import java.util.List;
 import java.util.Map;
 
 public interface DDClient_Meeting {
 
-    void createMeeting(String access_token, String userId, String confTitle, List<String> inviteUserIds, boolean inviteCaller);
+    MDR createMeeting(String access_token, String userId, String confTitle, List<String> inviteUserIds, boolean inviteCaller);
 
 }
 

mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Meeting.java

@@ -3,6 +3,7 @@ package com.malk.service.dingtalk.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.malk.server.dingtalk.DDConf;
 import com.malk.server.dingtalk.DDR;
+import com.malk.server.dingtalk.MDR;
 import com.malk.service.dingtalk.DDClient_Meeting;
 import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +16,7 @@ import java.util.Map;
 @Slf4j
 public class DDImplClient_Meeting implements DDClient_Meeting {
     @Override
-    public void createMeeting(String access_token, String userId, String confTitle, List<String> inviteUserIds, boolean inviteCaller) {
+    public MDR createMeeting(String access_token, String userId, String confTitle, List<String> inviteUserIds, boolean inviteCaller) {
         Map body = UtilMap.map("userId, confTitle", userId, confTitle);
         if (ObjectUtil.isNotNull(inviteUserIds)) {
             body.put("inviteUserIds",inviteUserIds);
@@ -23,6 +24,7 @@ public class DDImplClient_Meeting implements DDClient_Meeting {
         if (ObjectUtil.isNotNull(inviteCaller)) {
             body.put("inviteCaller",inviteCaller);
         }
-        DDR ddr = DDR.doPost("https://api.dingtalk.com/v1.0/conference/videoConferences", DDConf.initTokenHeader(access_token), null, body);
+        MDR mdr = MDR.doPost("https://api.dingtalk.com/v1.0/conference/videoConferences", DDConf.initTokenHeader(access_token), null, body);
+        return mdr;
     }
 }