增加配置区分不同环境

ruoyi-admin/src/main/resources/application.yml

@@ -111,3 +111,9 @@ attachment:
 lark:
   robot:
     group: https://open.feishu.cn/open-apis/bot/v2/hook/cf432ef4-e526-4595-8330-2d2a361f7a29
+pdf:
+  generate:
+    path: /data/biz_file/
+#    path: D:\test\
+sync:
+  flag: true

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -126,4 +126,5 @@ public class Constants
      * 资源映射路径 前缀
      */
     public static final String RESOURCE_PREFIX = "/profile";
+    public static final String FOLDER_SPLIT = "/";
 }

ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/aop/ErrorLogAop.java

@@ -37,6 +37,9 @@ public class ErrorLogAop {
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
 
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
+
     /**
      * 创建对象填充默认参数
      */
@@ -49,7 +52,9 @@ public class ErrorLogAop {
                 LarkRequest larkRequest = new LarkRequest("a", "b");
                 LarkException larkException = new LarkException("", errorMessage, larkRequest);
                 String errorMessageBody = larkException.getErrorMessageBody();
-                larkRobotHelper.sendMessageByBot(ROBOT_GROUP, errorMessageBody);
+                if (Boolean.TRUE.equals(syncFlag)) {
+                    larkRobotHelper.sendMessageByBot(ROBOT_GROUP, errorMessageBody);
+                }
             }
         }
     }
@@ -84,7 +89,9 @@ public class ErrorLogAop {
                 .map(EventLog::getErrorMessage)
                 .collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(errorList)) {
-            larkRobotHelper.sendMessageByBot(ROBOT_GROUP,String.join(",",errorList));
+            if (Boolean.TRUE.equals(syncFlag)) {
+                larkRobotHelper.sendMessageByBot(ROBOT_GROUP, String.join(",", errorList));
+            }
         }
     }
 

ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/consumer/LarkApplicationRunner.java

@@ -8,6 +8,7 @@ import com.ruoyi.flyingbook.mapper.EventMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -50,6 +51,8 @@ public class LarkApplicationRunner implements ApplicationRunner {
 
     @Autowired
     private EventMapper eventMapper;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
     @Autowired
     private LarkOperateFactory larkOperateFactory;
@@ -59,35 +62,32 @@ public class LarkApplicationRunner implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        //这里用线程池，后续如果出现量大的情况下可以调整
+        if (Boolean.TRUE.equals(syncFlag)) {
-        new Thread(new Runnable() {
+            //这里用线程池，后续如果出现量大的情况下可以调整
-            @Override
+            new Thread(new Runnable() {
-            public void run() {
+                @Override
-                while (true) {
+                public void run() {
-                    List<Event> eventList = eventMapper.queryEventList(EventOperateStatus.PENDING.getCode(), FlagStatus.OK.getCode());
+                    while (true) {
-                    if (CollectionUtils.isEmpty(eventList)) {
+                        List<Event> eventList = eventMapper.queryEventList(EventOperateStatus.PENDING.getCode(), FlagStatus.OK.getCode());
-                        try {
+                        if (CollectionUtils.isEmpty(eventList)) {
-                            // 没有订单，休息一下
+                            try {
-                            Thread.sleep(WAIT_TIME);
+                                // 没有订单，休息一下
-                        } catch (InterruptedException e) {
+                                Thread.sleep(WAIT_TIME);
-                            e.printStackTrace();
+                            } catch (InterruptedException e) {
-                        }
+                                e.printStackTrace();
-                    } else {
+                            }
-                        try {
+                        } else {
-                            for (Event event : eventList) {
+                            try {
-                                larkOperateFactory.execute(event);
+                                for (Event event : eventList) {
+                                    larkOperateFactory.execute(event);
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
-                        } catch (Exception e) {
-                            e.printStackTrace();
                         }
                     }
                 }
-            }
+            }).start();
-        }).start();
+        }
-//        threadPool.execute(() -> {
-//
-//
-//        });
     }
-
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/MailInfoController.java

@@ -5,6 +5,9 @@ import com.ruoyi.quartz.task.CJT.*;
 import com.ruoyi.quartz.task.MailSyncTask;
 import com.ruoyi.quartz.task.MonitorJobTask;
 import com.ruoyi.quartz.task.ScheduledRemindersTask;
+import com.ruoyi.quartz.task.odoo.AccountMoveLineJob;
+import com.ruoyi.quartz.task.odoo.ProductProductJob;
+import com.ruoyi.quartz.task.odoo.StockQuantJob;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +39,14 @@ public class MailInfoController extends BaseController {
     private SaleDispatchSyncJob saleDispatchSyncJob;
     @Autowired
     private SaleOrderSyncJob saleOrderSyncJob;
-//    @Autowired
+    @Autowired
-//    private ProductJob productJob;
+    private CJTCreateLarkTableJob cjtCreateLarkTableJob;
+    @Autowired
+    private ProductProductJob productProductJob;
+    @Autowired
+    private AccountMoveLineJob accountMoveLineJob;
+    @Autowired
+    private StockQuantJob stockQuantJob;
 
 //    @PostMapping("/syncEmail")
 //    public void syncEmail(Boolean readFlag) {
@@ -46,33 +55,54 @@ public class MailInfoController extends BaseController {
 
     @SneakyThrows
     @PostMapping("/scheduledReminders")
-    public void scheduledReminders(Integer number) {
+    public void scheduledReminders(Integer number,String cjt) {
-//        System.out.println(number);
+//        odoo(number);
-//        Integer userId = productJob.getUserId();
+//        if (number > 10){
-//        System.out.println(userId);
+//            cjtCreateLarkTableJob.execute();
-//        productJob.testProduct();
+//        }else {
-//        switch (number){
+            cjt(number,cjt);
-//            case 1:
-//                manufactureOrderSyncJob.executeSync(null);
-//                break;
-//            case 2:
-//                purchaseArrivalOpenSyncJob.executeSync(null);
-//                break;
-//            case 3:
-//                purchaseOrderSyncJob.executeSync(null);
-//                break;
-//            case 4:
-//                saleDeliverySyncJob.executeSync(null);
-//                break;
-//            case 5:
-//                saleDispatchSyncJob.executeSync(null);
-//                break;
-//            case 6:
-//                saleOrderSyncJob.executeSync(null);
-//                break;
 //        }
-//        monitorJobTask.monitor();
+    }
-//        scheduledRemindersTask.scheduledReminders();
+
+    private void odoo(Integer number){
+        switch (number){
+            case 0:
+                accountMoveLineJob.execute(number);
+                break;
+            case 1:
+            case 6:
+            case 8:
+                productProductJob.execute(number);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void cjt(Integer number,String cjt){
+        switch (number){
+            case 1:
+                manufactureOrderSyncJob.executeSync(cjt,"2023-08-01 00:00:00","2023-08-08 23:00:00");
+                break;
+            case 2:
+                purchaseArrivalOpenSyncJob.executeSync(cjt,"2023-08-01 00:00:00","2023-08-08 23:00:00");
+                break;
+            case 3:
+                purchaseOrderSyncJob.executeSync(cjt,"2023-06-07 00:00:00","2023-06-07 23:00:00");
+                break;
+            case 4:
+                saleDeliverySyncJob.executeSync(cjt,"2023-08-01 00:00:00","2023-08-08 23:00:00");
+                break;
+            case 5:
+                saleDispatchSyncJob.executeSync(cjt,"2023-08-02 16:46:00","2023-08-02 16:47:00");
+                break;
+            case 6:
+                saleOrderSyncJob.executeSync(cjt,"2023-08-01 00:00:00","2023-08-08 23:00:00");
+                break;
+            case 7:
+                retryErrorSyncJob.execute();
+                break;
+        }
     }
 
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/CJTCreateLarkTableJob.java

@@ -48,9 +48,14 @@ public class CJTCreateLarkTableJob{
     private LarkRobotHelper larkRobotHelper;
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
 
     public void execute(){
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         Map<AppType, TableRelationTypeEnum> waitCreatMap = getWaitCreateMap();
         Map<AppType, String> tableNameMap = getTableNameMap();
         String currentDate = DateUtils.ldt2str(LocalDateTime.now(), DateUtils.YYYYMM);

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/RetryErrorSyncJob.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.enums.CjtAccountEnum;
 import com.ruoyi.quartz.domain.CJTRetryRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -32,8 +33,13 @@ public class RetryErrorSyncJob {
     private SaleDispatchSyncJob saleDispatchSyncJob;
     @Autowired
     private SaleOrderSyncJob saleOrderSyncJob;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
     public void execute(String appTypeCode,String cjt) {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         AppType appType = AppType.getByCode(appTypeCode);
         if (appType != null) {
             executeDetail(appType,cjt);
@@ -41,6 +47,9 @@ public class RetryErrorSyncJob {
     }
 
     public void execute() {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         for (CjtAccountEnum value : CjtAccountEnum.values()) {
             try {
                 List<AppType> retryJobList = retryJobList();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java

@@ -52,6 +52,8 @@ public abstract class SyncAccountsJobAbstract {
     private LarkRobotHelper larkRobotHelper;
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
     /**
      * 分页条数
      */
@@ -88,6 +90,9 @@ public abstract class SyncAccountsJobAbstract {
     }
 
     public void execute(CJTRetryRequest request) {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         if (request == null){
             return;
         }
@@ -117,6 +122,9 @@ public abstract class SyncAccountsJobAbstract {
     }
 
     public void executeSync(String cjt,String queryFromTime,String queryToTime) {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         LocalDateTime now = LocalDateTime.now();
         CJTJobContext context = initContext(queryFromTime,queryToTime,now,cjt);
         try {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MailSyncTask.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -37,8 +38,13 @@ public class MailSyncTask {
     private IMailInfoService iMailInfoService;
     @Autowired
     private LarkTableRelationMapper larkTableRelationMapper;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
     public void syncMail(Boolean readFlag) {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         log.info("MailSyncTask start readFlag:{}",readFlag);
         MailInfo mailInfo = new MailInfo();
         mailInfo.setFlag(FlagStatus.OK.getCode());

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorJobTask.java

@@ -4,13 +4,9 @@ import com.ruoyi.common.enums.EventOperateType;
 import com.ruoyi.flyingbook.LarkHelper.LarkRobotHelper;
 import com.ruoyi.flyingbook.domain.LogCount;
 import com.ruoyi.flyingbook.mapper.EventLogMapper;
-import com.ruoyi.flyingbook.mapper.EventMapper;
-import com.ruoyi.flyingbook.service.IEventLogService;
-import com.ruoyi.flyingbook.service.IEventService;
 import com.ruoyi.quartz.domain.JobLogCount;
 import com.ruoyi.quartz.domain.SysJobLog;
 import com.ruoyi.quartz.mapper.SysJobLogMapper;
-import com.ruoyi.quartz.service.ISysJobService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,8 +33,13 @@ public class MonitorJobTask {
 
     @Value("${lark.robot.group}")
     private String robotGroup;
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
     public void monitor() {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         log.info("scheduledRemindersTask start");
         Date todayStartTime = this.getTodayStartTime();
         Date endTime = new Date();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ScheduledRemindersTask.java

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -60,7 +61,8 @@ public class ScheduledRemindersTask {
     private EventLogMapper eventLogMapper;
     @Autowired
     private LarkRobotHelper larkRobotHelper;
-
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
     /**
      * 查询分页大小
      */
@@ -72,6 +74,9 @@ public class ScheduledRemindersTask {
 
 
     public void scheduledReminders() {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         log.info("scheduledRemindersTask start");
         List<LarkCompanyTableInfo> larkList = this.getLarkList();
         if (CollectionUtils.isEmpty(larkList)) {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/CJTOdooLarkTableJob.java

@@ -45,10 +45,14 @@ public class CJTOdooLarkTableJob {
     private LarkRobotHelper larkRobotHelper;
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
-
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
     private static final List<Integer> enableExecuteMonth = Arrays.asList(1,4,7,10);
 
     public void execute() {
+        if (Boolean.FALSE.equals(syncFlag)) {
+            return;
+        }
         Map<AppType, TableRelationTypeEnum> waitCreatMap = getWaitCreateMap();
         Map<TableRelationTypeEnum, String> tableNameMap = getTableNameMap();
         LocalDateTime now = LocalDateTime.now();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java

@@ -54,7 +54,8 @@ public abstract class OdooAbstrackob {
     private LarkRobotHelper larkRobotHelper;
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
-
+    @Value("${sync.flag}")
+    private Boolean syncFlag;
 
     private static final String GET_DATA_DB = "Fortune_test0716";
     private static final String GET_DATA_NAME = "test";
@@ -69,6 +70,9 @@ public abstract class OdooAbstrackob {
 
     public void execute(Integer warehouseId) {
         try {
+            if (Boolean.FALSE.equals(syncFlag)) {
+                return;
+            }
             log.info("===================== {} strat ======================", this.getClassName());
             //初始化调用对象
             OdooContext context = initContext(warehouseId);