0027005599 2 роки тому
батько
коміт
d82fdf7a21

+ 3 - 21
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/AfterWaringJob.java

@@ -1,47 +1,31 @@
 package org.jeecg.modules.medical.job;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.medical.Constant;
-import org.jeecg.modules.medical.entity.AfterIncidentDetailLog;
 import org.jeecg.modules.medical.entity.AfterIncidentLog;
-import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.ruleengine.AfterDealTask;
-import org.jeecg.modules.medical.ruleengine.RuleEngine;
-import org.jeecg.modules.medical.service.IAfterIncidentDetailLogService;
 import org.jeecg.modules.medical.service.IAfterIncidentLogService;
-import org.jeecg.modules.medical.threadpool.AfterRunRuleEngineCallable;
+import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 /**
  * 事后触发监管
  */
-@Component
 @Slf4j
-public class AfterWaringJob {
+public class AfterWaringJob implements Job {
 
     @Autowired
     AfterDealTask afterDealTask;
     @Autowired
     IAfterIncidentLogService afterIncidentLogService;
 
-    //    @Override
+    @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         QueryWrapper<AfterIncidentLog> queryWrapper = new QueryWrapper();
         queryWrapper.eq("state", Constant.WATING);
@@ -59,6 +43,4 @@ public class AfterWaringJob {
     }
 
 
-
-
 }

+ 19 - 26
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/AfterwardsAuditDataTest.java

@@ -10,28 +10,22 @@ import org.jeecg.modules.medical.entity.AfterIncidentDetailLog;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
-import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
 import org.jeecg.modules.medical.entity.SttlMasterBill;
 import org.jeecg.modules.medical.entity.SttlMasterDetailBill;
-import org.jeecg.modules.medical.job.AfterWaringJob;
 import org.jeecg.modules.medical.job.AfterWaringLogTestJob;
-import org.jeecg.modules.medical.job.XCFYDatav_check_listJob;
-import org.jeecg.modules.medical.job.XCFYDatav_diagnose_itemsJob;
 import org.jeecg.modules.medical.ruleengine.RuleEngine;
 import org.jeecg.modules.medical.ruleengine.SPELUtil;
 import org.jeecg.modules.medical.service.IAfterIncidentDetailLogService;
 import org.jeecg.modules.medical.service.IAfterwardsAuditDetailService;
 import org.jeecg.modules.medical.service.IAfterwardsAuditService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUserDepart;
-import org.jeecg.modules.system.mapper.SysUserDepartMapper;
-import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.medical.service.IAfterwardsIncidentAuditDiagnoseService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleInfoService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleProjectDiagnoseService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleProjectService;
 import org.jeecg.modules.medical.service.ISttlMasterBillService;
 import org.jeecg.modules.medical.service.ISttlMasterDetailBillService;
+import org.jeecg.modules.system.entity.SysUserDepart;
+import org.jeecg.modules.system.mapper.SysUserDepartMapper;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -120,22 +114,23 @@ public class AfterwardsAuditDataTest {
     IMedicalInsRuleInfoService medicalInsRuleInfoService;
     @Autowired
     RedisTemplate redisTemplate;
-    @Autowired
-    AfterWaringJob afterWaringJob;
+    //    @Autowired
+//    AfterWaringJob afterWaringJob;
     @Autowired
     IAfterIncidentDetailLogService afterIncidentDetailLogService;
     @Autowired
     ISysDictService sysDictService;
-//    @Autowired
+
+    //    @Autowired
 //    IMedicalInsRuleProjectService medicalInsRuleProjectService;
     @Test
-    public void testProjectCode(){
+    public void testProjectCode() {
 //        List<MedicalInsRuleProject> medicalInsRuleProjectList = medicalInsRuleProjectService.getRuleProjectByMedicalProjectCode("C17040122300004123asfsdf");
 //        System.out.println(medicalInsRuleProjectList);
     }
 
     @Test
-    public void testDD(){
+    public void testDD() {
         List<DictModel> cateGoriesList = sysDictService.getDictItems(Constant.DICT_CATEGORIES_ITEMS_KEY);
         Map<String, String> cateGoriesMap = new HashMap<>();
         for (DictModel dictModel : cateGoriesList) {
@@ -145,18 +140,18 @@ public class AfterwardsAuditDataTest {
     }
 
     @Test
-    public void testXX(){
+    public void testXX() {
         List<AfterIncidentDetailLog> afterIncidentDetailLogList = afterIncidentDetailLogService.lambdaQuery().eq(AfterIncidentDetailLog::getAfterIncidentLogId, 217).list();
         System.out.println(afterIncidentDetailLogList);
     }
 
     @Test
-    public void testAfterWaringJob(){
-        try {
-            afterWaringJob.execute(null);
-        } catch (JobExecutionException e) {
-            e.printStackTrace();
-        }
+    public void testAfterWaringJob() {
+//        try {
+////            afterWaringJob.execute(null);
+//        } catch (JobExecutionException e) {
+//            e.printStackTrace();
+//        }
     }
 //    @Autowired
 //    org.jeecg.modules.medical.job.XCFYDatav_check_listJob XCFYDatav_check_listJob;
@@ -519,15 +514,13 @@ public class AfterwardsAuditDataTest {
 
     @Test
     public void depart() {
-String a="1711012523714580481\n" +
-        "1711012523949461506\n" +
-        "1711012524184342529";
-
-
+        String a = "1711012523714580481\n" +
+                "1711012523949461506\n" +
+                "1711012524184342529";
 
 
         String[] lines = a.split("\n");
-        for (String id:lines) {
+        for (String id : lines) {
             SysUserDepart userDepart = new SysUserDepart(id, "1711037900931567617");
             sysUserDepartMapper.insert(userDepart);
         }