更新

src/main/java/com/keymobile/rest/common/utils/DateUtil.java

@@ -2,6 +2,7 @@ package com.keymobile.rest.common.utils;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -18,6 +19,11 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
     private static String[] parsePatterns = {PARSE_PATTERN_DD, PARSE_PATTERN_SS, "yyyy-MM-dd HH:mm",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm"};
 
+
+    public static Timestamp getTimestamp() {
+        return Timestamp.valueOf(getDateTime());
+    }
+
     /**
      * 得到当前日期字符串 格式（yyyy-MM-dd）
      */

src/main/java/com/keymobile/rest/controller/ExcelController.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Api(description = "模板 控制器")
+@Api(tags = "模板 控制器", description = "Excel Info")
 @RestController
 @RequestMapping(path = "/api")
 public class ExcelController {
@@ -125,13 +125,4 @@ public class ExcelController {
 //        }
     }
 
-    public User getAdmin() {
-        User user = userService.findAllByUsername("发起人").get(0);
-        return user;
-    }
-
-    public User getAuditUser() {
-        User user = userService.findAllByUsername("审核人").get(0);
-        return user;
-    }
 }

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -26,12 +26,15 @@ import org.springframework.web.bind.annotation.*;
 import java.sql.Timestamp;
 import java.util.*;
 
-@Api(description = "活动 控制器")
+@Api(tags = "活动 控制器", description = "Task Info")
 @RestController
-@RequestMapping(path = "/api/task")
+@RequestMapping(path = "/api")
 public class TaskController {
 
-    // 默认启动的固化流程
+    /**
+     * 默认启动的固化流程
+     */
+
     @Value("${app.active-process}")
     private String process;
 
@@ -45,9 +48,6 @@ public class TaskController {
     private UserService userService;
     @Autowired
     private ProcessService processService;
-    @Autowired
-    private UserTemplateMapperService userTemplateMapperService;
-
 
     @Autowired
     private ManagementService managementService;
@@ -65,7 +65,7 @@ public class TaskController {
             @ApiImplicitParam(name = "pageSize", value = "当前页条数", paramType = "query", required = true, dataType = "int", defaultValue = "10"),
             @ApiImplicitParam(name = "name", value = "活动名称", paramType = "query", dataType = "string")
     })
-    @PostMapping(value = "/list")
+    @PostMapping(value = "/task/list")
     public ApiResponse getTaskList(int pageNo, int pageSize, String name) {
         Page<Activity> taskList;
         String orderBy = "descending"; //
@@ -82,7 +82,7 @@ public class TaskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "活动id", paramType = "query", required = true, dataType = "long")
     })
-    @PostMapping(value = "/get")
+    @PostMapping(value = "/task/get")
     public ApiResponse get(long taskId) {
         Activity activity = activityService.get(taskId);
         CommonValidator.notNull(activity, "活动不存在");
@@ -115,8 +115,6 @@ public class TaskController {
                 Map map = new HashMap();
                 if (user.getUsername().equals("发起人") || user.getUsername().equals("审核人")) {
 
-
-
                 } else {
                     long templateId = Long.parseLong(assignee.split(":template:")[1]);
                     String processId = task.getProcessInstanceId();
@@ -163,15 +161,17 @@ public class TaskController {
         CommonValidator.notNull(form.getType(), "类型不能为空");
         CommonValidator.isTrue(form.getExcels() != null && form.getExcels().size() != 0, "补录模板不能为空");
 
-        // 创建人 为 manager
-        User admin = getAdmin();
+        /**
+         *  manager
+         */
+        User admin = userService.getManager();
         form.setUser(admin);
 
         // 新建活动
-        Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
+
         Activity activity = new Activity();
         activity = BeanUtils.convertTo(form, activity);
-        activity.setCreateAt(now);
+        activity.setCreateAt(DateUtil.getTimestamp());
         final Activity finalActivity = activityService.save(activity);
 
         // 新建excel实例
@@ -179,30 +179,28 @@ public class TaskController {
         excelFormList.forEach(excelForm -> {
             CommonValidator.isTrue(excelForm.getName() != null, "模板名称不能为空");
             CommonValidator.isTrue(excelForm.getConfig() != null, "模板配置config不能为空");
-            CommonValidator.isTrue(excelForm.getScopeId() != null && excelForm.getScopeId() != 0, "模板scopeId不能为空");
+//            CommonValidator.isTrue(excelForm.getScopeId() != null && excelForm.getScopeId() != 0, "模板scopeId不能为空");
+            CommonValidator.isTrue(excelForm.getUserIdList() != null && excelForm.getUserIdList().size() != 0, "模板用户idList不能为空");
             CommonValidator.isTrue(excelForm.getNeedAudit() != null && excelForm.getNeedAudit() != 0, "模板needAudit不能为空");
             CommonValidator.isTrue(excelForm.getNeedConfirm() != null && excelForm.getNeedConfirm() != 0, "模板needConfirm不能为空");
 
-            UserTemplateMapper scope = userTemplateMapperService.findById(excelForm.getScopeId());
 
-            CommonValidator.isTrue(scope != null, "补录范围不能为空");
             CommonValidator.isFalse((StringUtils.isEmpty(excelForm.getUpStreamAddr()) && StringUtils.isNotEmpty(excelForm.getBackStreamAddr())
                     || (StringUtils.isNotEmpty(excelForm.getUpStreamAddr()) && StringUtils.isEmpty(excelForm.getBackStreamAddr()))), "上游地址和回流地址需同时填写或者同时为空");
 
             excelForm.setActivity(finalActivity);
             Template template = new Template();
             template = BeanUtils.convertTo(excelForm, template);
-            template.setCreateAt(now);
+            template.setCreateAt(DateUtil.getTimestamp());
             final Template finalTemplate = templateService.save(template);
 
-            // 查找当前补录范围所有的用户
-//            List<User> userList = scope.getUserList();
-//            CommonValidator.notLessThan(userList.size(), 1, "补录人员不存在，所选补录范围需要先绑定用户");
+            // 查找当前补录所有的用户
+            List<Long> userIdList = excelForm.getUserIdList();
 
-//            userList.forEach(user -> {
-//                // 创建了一些空白任务
-//                missionService.save(user, finalTemplate);
-//            });
+            userIdList.forEach(userId -> {
+                // 创建了一些空白任务
+                missionService.save(user, finalTemplate);
+            });
         });
         return ApiResponse.ok(activity.getId());
     }
@@ -299,13 +297,13 @@ public class TaskController {
     public ApiResponse passTask(long taskId) {
         Activity activity = activityService.get(taskId);
         // 完结活动， 流程跑完
-//        User judge = userService.getAudit();
-//        List<Task> taskList = taskService.createTaskQuery().processInstanceId(assignment.getProcessId())
-//                .taskAssignee(judge.getUsername()).list();
-//        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
-//        Task task = taskList.get(0);
-//        taskService.complete(task.getId(), ImmutableMap.of("pass", "true"));
-//        assignment.setStatus(Assignment.STATUS_COMPLETED);
+        User judge = userService.getAudit();
+        List<Task> taskList = taskService.createTaskQuery().processInstanceId(assignment.getProcessId())
+                .taskAssignee(judge.getUsername()).list();
+        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
+        Task task = taskList.get(0);
+        taskService.complete(task.getId(), ImmutableMap.of("pass", "true"));
+        assignment.setStatus(Assignment.STATUS_COMPLETED);
         activityService.update(activity);
         return ApiResponse.ok();
     }
@@ -316,26 +314,21 @@ public class TaskController {
     public ApiResponse rejectTask(@RequestParam Long taskId) {
         Activity activity = activityService.get(taskId);
         // 完结活动， 流程跑完
-//        User judge = userService.getAudit();
-//        List<Task> taskList = taskService.createTaskQuery().processInstanceId(assignment.getProcessId())
-//                .taskAssignee(judge.getUsername()).list();
-//        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
-//        Task task = taskList.get(0);
-//        taskService.complete(task.getId(), ImmutableMap.of("pass", "false"));
+        User judge = userService.getAudit();
+        List<Task> taskList = taskService.createTaskQuery().processInstanceId(assignment.getProcessId())
+                .taskAssignee(judge.getUsername()).list();
+        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
+        Task task = taskList.get(0);
+        taskService.complete(task.getId(), ImmutableMap.of("pass", "false"));
         return ApiResponse.ok();
     }
 
 
-    //    @ApiOperation(value = "查看当前活动进度")
-//    @PostMapping(value = "/task/viewTaskProcess")
-//    public ApiResponse viewTaskProcess(@RequestParam Long taskId) {
-//        return ApiResponse.ok();
-//    }
-
-
-    public User getAdmin() {
-        User user = userService.findAllByUsername("发起人").get(0);
-        return user;
+    @ApiOperation(value = "查看当前活动进度")
+    @PostMapping(value = "/task/viewTaskProcess")
+    public ApiResponse viewTaskProcess(@RequestParam Long taskId) {
+        return ApiResponse.ok();
     }
 
+
 }

src/main/java/com/keymobile/rest/controller/UserController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-@Api(description = "用户/用户组/机构 控制器")
+@Api(description = "User Info", tags = "用户/用户组/机构 控制器")
 @RestController
 @RequestMapping(path = "/api")
 public class UserController {

src/main/java/com/keymobile/rest/dao/UserDao.java

@@ -9,4 +9,6 @@ public interface UserDao extends JpaRepository<User, Long> {
     List<User> findAllByIdIn(List<Long> ids);
 
     List<User> findAllByUsername(String username);
+
+    List<User> findAllByRole(int role);
 }

src/main/java/com/keymobile/rest/dto/ExcelForm.java

@@ -12,13 +12,13 @@ import java.util.List;
 @ApiModel
 public class ExcelForm {
 
-    @ApiModelProperty(required = true, name = "scopeId", value = "补录范围id")
+    @ApiModelProperty(required = true, name = "scopeId", value = "补录范围id", hidden = true)
     private Long scopeId;
 
     @ApiModelProperty(required = true, name = "userIds", value = "补录人员ids, 用逗号隔开", hidden = true)
     private String userIds;
 
-    @ApiModelProperty(required = true, name = "userIdList", value = "补录人员id集合", hidden = true)
+    @ApiModelProperty(required = true, name = "userIdList", value = "补录人员id集合")
     private List<Long> userIdList;
 
     @ApiModelProperty(name = "remark", value = "模板名称", required = true)

src/main/java/com/keymobile/rest/model/Mission.java

@@ -34,6 +34,12 @@ public class Mission implements Serializable {
     @Column(columnDefinition = ("varchar(20) COMMENT '当前activiti任务id'"))
     private String taskId;
 
+    /**
+     * 操作人员id
+     */
+    @Column(columnDefinition = ("bigint(20) COMMENT '当前用户id'"))
+    private long userId;
+
     @Column(nullable = false, columnDefinition = ("integer(2) default 1 COMMENT '状态'"))
     private int status;
 
@@ -44,12 +50,6 @@ public class Mission implements Serializable {
     private Template template;
 
     /**
-     * 操作人员
-     */
-    @OneToOne
-    private User user;
-
-    /**
      * 补录数据
      */
     @OneToOne(fetch = FetchType.EAGER)

src/main/java/com/keymobile/rest/service/UserService.java

@@ -13,17 +13,12 @@ public class UserService {
     @Autowired
     private UserDao userDao;
 
-    public List<User> findAllByUsername(String username) {
-        return userDao.findAllByUsername(username);
-    }
-
-
     public List<User> findAll() {
         return userDao.findAll();
     }
 
-    public User findById(long id) {
-        return userDao.getOne(id);
+    public User getManager() {
+        return userDao.findAllByRole(User.ROLE_MANAGER).get(0);
     }
 
 }