MSI\liwei 7 роки тому
батько
коміт
e44bf7cebc

+ 106 - 0
Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/ConfirmTask.java

@@ -0,0 +1,106 @@
+package com.xintong.visualinspection.visuallnspection_fjq;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.bean.TaskStatus;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.service.TaskService_F;
+import com.xintong.visualinspection.util.CacheUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.thymeleaf.util.DateUtils;
+
+import java.util.*;
+
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringBootTest(classes = TaskAutoGenApplication.class)
+@Component
+//@Configurable
+//@WebAppConfiguration
+public class ConfirmTask {
+	@Reference(version = "1.0.0",
+			application = "${dubbo.application.id}",
+			registry = "${dubbo.registry.address}")
+	private TaskService_F taskService;
+
+	@Reference(version = "1.0.0",
+			application = "${dubbo.application.id}",
+			registry = "${dubbo.registry.address}")
+	private CommonService commonService;
+
+
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(ConfirmTask.class);
+
+	@Scheduled(cron = "0 0 0/1 * * ?")
+	@Test
+	public void confirmTasks() {
+		logger.info("任务确认检测开始---------");
+		checkConfirmTask();
+		checkConfirmAppealTask();
+		logger.info("任务确认检测结束---------");
+	}
+
+	@Test
+	public void checkConfirmTask() {
+		logger.info("开始检查未被确认任务----------");
+		FwqCheckTask task = new FwqCheckTask();
+		task.setCheck_status(Constants.STATUS_CHECK_DISPATCH);
+		Object unConfirmedTaskList = taskService.getAllTask(0, 0, task);
+		int taskConfirmDays = 4;
+		List<FwqCheckTask> list = (ArrayList<FwqCheckTask>) unConfirmedTaskList;
+		Map<String, Constant> codeMap = commonService.getCodeMap();
+		Date now = new Date();
+		int count = 0;
+		for (FwqCheckTask t : list) {
+			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
+			if (taskStatusList != null && taskStatusList.size() > 0) {
+				TaskStatus taskStatus = taskStatusList.get(0);
+				long days = (now.getTime() - taskStatus.getUpdate_time().getTime()) / (1000 * 60 * 60 * 24);
+				if (days >= taskConfirmDays) {
+					t.setCheck_status(Constants.STATUS_CHECK_END);
+					taskService.updateStatus(t);
+					count++;
+				}
+			}
+			logger.info("结束检查未被确认任务----------,默认确认任务条数:" + count);
+		}
+	}
+
+	public void checkConfirmAppealTask() {
+		logger.info("开始检查未被确认申诉任务----------");
+		FwqCheckTask task = new FwqCheckTask();
+		task.setCheck_status(Constants.STATUS_APPEAL_CHECK_DISPATCH);
+		List<FwqCheckTask> unConfirmedTaskList = (ArrayList<FwqCheckTask>)taskService.getAllTask(0,0,task);
+		int taskConfirmDays = 3;
+		Constant constant = CacheUtil.codeMap.get("appeal_task_confirmed_days_1");
+		if(constant!=null)
+			taskConfirmDays = Integer.parseInt(constant.getCode_name());
+
+		Date now = new Date();
+		int count=0;
+		for(FwqCheckTask t:unConfirmedTaskList) {
+			List<TaskStatus> taskStatusList = taskService.getTaskStatusList((long) t.getId());
+			if(taskStatusList!=null && taskStatusList.size()>0) {
+				TaskStatus taskStatus = taskStatusList.get(0);
+				long days = (now.getTime()-taskStatus.getUpdate_time().getTime())/(1000*60*60*24);
+				if(days>=taskConfirmDays){
+					t.setCheck_status(Constants.STATUS_APPEAL_CHECK_CONFIRMED);
+					taskService.updateStatus(t);
+					count++;
+				}
+			}
+		}
+		logger.info("结束检查未被确认申诉任务----------,默认确认任务条数:"+count);
+	}
+
+	public static void main(String[] args) {
+		Calendar cal = Calendar.getInstance();
+		cal.add(Calendar.DAY_OF_MONTH, -1);
+		cal.set(Calendar.MINUTE, 120);
+		System.out.println(DateUtils.format(cal, Locale.CHINA));
+	}
+}

+ 2 - 0
Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/VisuallnspectionFjqApplication.java

@@ -8,9 +8,11 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude={DataSourceAutoConfiguration.class,HibernateJpaAutoConfiguration.class})
 @ServletComponentScan
+@EnableScheduling
 public class VisuallnspectionFjqApplication {
 
     public static void main(String[] args) {

+ 1 - 1
Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/mapper/master/TaskMapper.xml

@@ -45,7 +45,7 @@
                 <if test="check_status != null"> AND t.check_status = #{check_status}</if>
             </otherwise>
         </choose>
-
+        <if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
         <if test="checkman != null">AND t.checkman = #{checkman}</if>
         <if test="area_id != null">AND t.area_id = #{area_id}</if>
         <if test="check_status_arr != null and check_status_arr.length > 0">AND

+ 9 - 1
Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/TaskServiceImpl.java

@@ -82,6 +82,9 @@ public class TaskServiceImpl implements TaskService_F {
             if(fwqCheckTask.getAppeal_result()!=null){
                 fwqCheckTask.setAppeal_result_name(codeMap.get("appeal_result" + "_" + fwqCheckTask.getAppeal_result() + "").getCode_name());
             }
+            if(fwqCheckTask.getCheck_status()!=null){
+                fwqCheckTask.setStatus_name(codeMap.get("task_status" + "_" + fwqCheckTask.getCheck_status() + "").getCode_name());
+            }
         }
 
         if (!(page.equals(0) && size.equals(0))) {
@@ -103,7 +106,12 @@ public class TaskServiceImpl implements TaskService_F {
             TaskStatus taskStatus = new TaskStatus();
             taskStatus.setCheck_status(fwqCheckTask.getCheck_status());
             taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + fwqCheckTask.getCheck_status())).getCode_name());
-            User u = commonService.getUserMap().get((long) fwqCheckTask.getUpdate_user());
+            User u = null;
+            if(fwqCheckTask.getUpdate_user() != null){
+                 u = commonService.getUserMap().get((long) fwqCheckTask.getUpdate_user());
+            }else{
+                u = commonService.getUserMap().get((long) fwqCheckTask.getCheckman());
+            }
             if (u != null) {
                 taskStatus.setUpdate_username(u.getTruename());
             }