zhao.renji 4 viikkoa sitten
vanhempi
commit
80f36dec7c

+ 27 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/dataVue/task/WarnHistoryJob.202210.deprecated.js → jeecg-boot-module-system/src/main/java/org/jeecg/modules/dataVue/task/WarnHistoryJob.java

@@ -2,6 +2,12 @@ package org.jeecg.modules.dataVue.task;
 
 import com.alibaba.druid.proxy.jdbc.NClobProxyImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jtznyj.engineer.entity.BWellOwnEngineer;
+import jtznyj.engineer.service.dataDiagnosticService.data.DrillState;
+import jtznyj.engineer.service.winform.CheckEngineerWarning;
+import jtznyj.engineer.service.winform.data.MonitorAlarmRecord;
+import jtznyj.engineer.service.winform.data.MonitorAlarmRecords;
+import jtznyj.engineer.service.winform.data.RecordHashTable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
@@ -11,14 +17,8 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.ReflectHelper;
 import org.jeecg.modules.dataVue.entity.Task;
 import org.jeecg.modules.dataVue.entity.WarnHistory;
-import org.jeecg.modules.dataVue.service.*;
-import org.jeecg.modules.engineer.entity.BWellOwnEngineer;
-import org.jeecg.modules.engineer.service.winform.CheckEngineerWarning;
+import org.jeecg.modules.dataVue.service.*
 import jtznyj.engineer.vo.LtdRecord;
-import org.jeecg.modules.engineer.service.dataDiagnosticService.data.DrillState;
-import org.jeecg.modules.engineer.service.winform.data.MonitorAlarmRecord;
-import org.jeecg.modules.engineer.service.winform.data.MonitorAlarmRecords;
-import org.jeecg.modules.engineer.service.winform.data.RecordHashTable;
 import org.jeecg.modules.warning.model.DrillInfoModel;
 import org.jeecg.modules.warning.service.IFzqkService;
 import org.quartz.Job;
@@ -26,6 +26,7 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -39,21 +40,32 @@ import java.util.*;
  */
 @Slf4j
 public class WarnHistoryJob implements Job {
-    @Autowired
+
+    @Resource
     IFzqkService iFzqkService;
-    @Autowired
+
+    @Resource
     IMasterService iLogicService;
-    @Autowired
+
+    @Resource
     ILtdSourceService iLtdSourceService;
-    @Autowired
+
+
+    @Resource
     IZjyService iZjyService;
-    @Autowired
+
+    @Resource
     ILjrbService iLjrbService;
-    @Autowired
+
+    @Resource
     IZjfzService iZjfzService;
-    @Autowired
+
+
+    @Resource
     ITaskService iTaskService;
-    @Autowired
+
+
+    @Resource
     IWarnHistoryService iWarnHistoryService;
 
     /**