添加材料数量统计

sample-form-manager/src/main/java/com/mortals/xhx/base/system/task/dao/ibatis/TaskDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.task.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.task.dao.TaskDao;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
-
 import org.springframework.stereotype.Repository;
 /**
  * <p>Title: 任务信息</p>

sample-form-manager/src/main/java/com/mortals/xhx/base/system/task/model/TaskEntity.java

@@ -8,11 +8,11 @@
 
 package com.mortals.xhx.base.system.task.model;
 
-import java.util.Date;
-
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.framework.service.ITask;
 
+import java.util.Date;
+
 /**
  * <p>Title: 任务信息</p>
  * <p>Description: TaskEntity  </p>

sample-form-manager/src/main/java/com/mortals/xhx/base/system/task/service/impl/TaskServiceImpl.java

@@ -4,17 +4,6 @@
 
 package com.mortals.xhx.base.system.task.service.impl;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.code.ExcuteStatus;
 import com.mortals.framework.common.code.TaskExcuteStrategy;
@@ -30,6 +19,12 @@ import com.mortals.xhx.base.system.task.dao.TaskDao;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
 import com.mortals.xhx.base.system.task.model.TaskQuery;
 import com.mortals.xhx.base.system.task.service.TaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -62,7 +57,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
 
     private Thread thread = null;
     /** 日志打印时间，key：任务ID，value：最后一次打印日志时间 */
-    private Map<Long, Long> printLogTime = new HashMap<Long, Long>();
+    private Map<Long, Long> printLogTime = new HashMap<>();
     @Autowired(required=false)
     private TaskService taskService;
 
@@ -216,17 +211,17 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
                                 }
                                 if (interimExcuteStatus != TaskInterimExcuteStatus.UNUSE.getValue() // 启用立即执行
                                         || ((strategy == TaskExcuteStrategy.DAY.getValue() // 按天
-                                                || (strategy == TaskExcuteStrategy.WEEK.getValue()
-                                                        && week == excuteDate)
-                                // 按周
-                                                || (strategy == TaskExcuteStrategy.MONTH.getValue()
-                                                        && (day == excuteDate
-                                                                || (excuteDate > maxDay && day == maxDay))))// 按月
-                                                && (excuteTime == currTime
-                                                        && !lastExcuteTimeStr.equals(currDateTimeStr)) // 执行间隔最少为一天
+                                        || (strategy == TaskExcuteStrategy.WEEK.getValue()
+                                        && week == excuteDate)
+                                        // 按周
+                                        || (strategy == TaskExcuteStrategy.MONTH.getValue()
+                                        && (day == excuteDate
+                                        || (excuteDate > maxDay && day == maxDay))))// 按月
+                                        && (excuteTime == currTime
+                                        && !lastExcuteTimeStr.equals(currDateTimeStr)) // 执行间隔最少为一天
                                 ) || (strategy == TaskExcuteStrategy.INTERVAL.getValue() // 按间隔时间
                                         && (lastExcuteTime == null || lastExcuteTime.getTime()
-                                                + excuteDate * 1000 <= currDateTime.getTime()))) {
+                                        + excuteDate * 1000 <= currDateTime.getTime()))) {
                                     final boolean printLog = checkPrintLog(task);
                                     Object excuteBean = GlobalSysInfo.getBeanByName(task.getExcuteService());
                                     if (excuteBean == null || !(excuteBean instanceof ITaskExcuteService)) {
@@ -261,7 +256,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
                                                         log.error("执行任务失败-->" + excuteTask, e);
                                                     }
                                                     if (strategy == TaskExcuteStrategy.INTERVAL.getValue()) {
-                                                     // 按间隔时间,更新执行时间，避免一直重复执行
+                                                        // 按间隔时间,更新执行时间，避免一直重复执行
                                                         excuteTask.setLastExcuteTime(currDateTime);
                                                     }
                                                 } finally {
@@ -297,7 +292,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
             executorService.shutdown();
             log.info("任务执行线程退出!");
         });
-       // thread.start();
+        thread.start();
     }
 
     @Override

sample-form-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskController.java

-/**
- * 文件：TaskController.java
- * 版本：1.0.0
- * 日期：
- * Copyright ®
- * All right reserved.
- */
 package com.mortals.xhx.base.system.task.web;
 
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
+import com.mortals.xhx.base.system.task.model.TaskQuery;
 import com.mortals.xhx.base.system.task.service.TaskService;
 import com.mortals.xhx.common.code.DataSatusEnum;
 import com.mortals.xhx.common.code.TaskExcuteStatusEnum;
 import com.mortals.xhx.common.code.TaskExcuteStrategyEnum;
 import com.mortals.xhx.common.code.TaskInterimExcuteStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * <p>Title: 任务信息</p>
- * <p>Description: TaskController  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author
- * @version 1.0.0
+ * 任务信息
+ *
+ * @author: zxfei
+ * @date: 2022/5/7 15:39
  */
 @RestController
 @RequestMapping("task")
-public class TaskController extends BaseCRUDJsonMappingController<TaskService, TaskForm, TaskEntity, Long> {
+public class TaskController extends BaseCRUDJsonBodyMappingController<TaskService, TaskEntity, Long> {
 
     public TaskController() {
         super.setFormClass(TaskForm.class);
@@ -50,8 +37,7 @@ public class TaskController extends BaseCRUDJsonMappingController<TaskService, T
 
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-                        Map<String, Object> model, Context context) {
+    protected void init(Map<String, Object> model, Context context) {
         Map<String, Object> status = new HashMap<String, Object>();
         status.put("status", TaskExcuteStatusEnum.getEnumMap());
         status.put("excuteStrategy", TaskExcuteStrategyEnum.getEnumMap());
@@ -71,60 +57,30 @@ public class TaskController extends BaseCRUDJsonMappingController<TaskService, T
         }
         model.put("excuteService", serviceList);
         model.put(KEY_RESULT_DICT, status);
-        super.init(request, response, form, model, context);
-    }
-
-    /**
-     * @param request
-     * @param response
-     * @param form
-     * @param model
-     * @param context
-     * @throws AppException
-     * @Description: TODO
-     */
-
-    @Override
-    protected void saveBefore(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-                              Map<String, Object> model, Context context) throws AppException {
-        if (null == form.getEntity().getExcuteService()) {
-
-        }
-//		TaskEntity condition = new TaskEntity();
-//		condition.setExcuteService(form.getEntity().getExcuteService());
-//		List<TaskEntity> datas = this.service.find(condition, context);
-//		if (null != datas && datas.size() > 0) {
-//			for (TaskEntity entity : datas) {
-//				if (entity.getId().longValue() != form.getEntity().getId().longValue()) {
-//					throw new AppException("任务已存在，请勿重复配置");
-//				}
-//			}
-//		}
-        super.saveBefore(request, response, form, model, context);
     }
 
     /**
      * 改变状态
      */
     @RequestMapping(value = "change/status")
-    public String changeStatus(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
+    public String changeStatus(TaskQuery query) {
         JSONObject ret = new JSONObject();
         Context context = getContext();
         try {
-            TaskEntity entity = this.service.get(form.getEntity().getId(), context);// .doSubmitAudit(form.getEntity(),
+            TaskEntity entity = this.service.get(query.getId(), context);// .doSubmitAudit(form.getEntity(),
             // context);
             if (null == entity) {
                 throw new AppException("任务不存在!");
             }
-            if (null == form.getEntity().getStatus()) {
+            if (null == query.getStatus()) {
                 throw new AppException("任务状态不能为空!");
             }
-            if (form.getEntity().getStatus() != DataSatusEnum.ENABLE.getValue()
-                    && form.getEntity().getStatus() != DataSatusEnum.DISENABLE.getValue()) {
+            if (query.getStatus() != DataSatusEnum.ENABLE.getValue()
+                    && query.getStatus() != DataSatusEnum.DISENABLE.getValue()) {
                 throw new AppException("非法任务状态!");
             }
-            String busiDesc = DataSatusEnum.getByValue(form.getEntity().getStatus()).getDesc();
-            entity.setStatus(form.getEntity().getStatus());
+            String busiDesc = DataSatusEnum.getByValue(query.getStatus()).getDesc();
+            entity.setStatus(query.getStatus());
             this.service.update(entity, context);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, busiDesc + "成功");