更新

src/main/java/com/keymobile/activiti/ActivitiApplication.java → src/main/java/com/keymobile/ActivitiApplication.java

-package com.keymobile.activiti;
+package com.keymobile;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 

src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java

@@ -2,7 +2,10 @@ package com.keymobile.rest.ctrl;
 
 import com.google.common.collect.ImmutableMap;
 import com.keymobile.rest.model.Task;
+import com.keymobile.rest.model.User;
 import com.keymobile.rest.service.TaskService;
+import com.keymobile.rest.service.UserService;
+import com.keymobile.rest.vo.TaskVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -11,12 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-@RequestMapping("/")
 @RestController
+@RequestMapping(path = "/api")
 public class IndexCtrl {
 
     private int pageSize = 10;
@@ -26,6 +28,9 @@ public class IndexCtrl {
     @Autowired
     private TaskService taskService;
 
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value = "获取首页收数列表")
     @PostMapping(value = "/task/list")
     public Map getTaskList(@RequestParam(required = false) String name, @RequestParam(required = false) Integer pageNo) {
@@ -44,14 +49,14 @@ public class IndexCtrl {
 
     @ApiOperation(value = "查看收数")
     @PostMapping(value = "/task/get")
-    public Map get(int id) {
+    public Map get(@RequestParam int id) {
         Task task = taskService.get(id);
         return ImmutableMap.of("code", 200, "data", task);
     }
 
     @ApiOperation(value = "新建收数")
     @PostMapping(value = "/task/create")
-    public Map createTask() {
+    public Map createTask(TaskVO task) {
 
         return ImmutableMap.of("code", 200);
     }
@@ -76,4 +81,13 @@ public class IndexCtrl {
         return ImmutableMap.of("code", 200);
     }
 
+
+    @ApiOperation(value = "获取补录人员列表")
+    @PostMapping(value = "/user/list")
+    public Map getUserList() {
+        List<User> userList = userService.findAllByRole(User.ROLE_NORMAL);
+        return ImmutableMap.of("code", 200, "data", userList);
+    }
+
+
 }

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

@@ -5,8 +5,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-
 public interface TaskDao extends JpaRepository<Task, Long> {
 
     Page<Task> findAll(Pageable pageable);

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

 package com.keymobile.rest.dao;
 
-import com.keymobile.rest.service.User;
+import com.keymobile.rest.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -20,13 +21,14 @@ public class Excel implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
 
     @Column(columnDefinition = "DATETIME COMMENT '创建时间'")
+    @CreationTimestamp
     private Timestamp createAt;
 
-    @ManyToOne
-    @JsonIgnore
+    // 级别游离关联, 当加载的时候急加载这个对象
+    @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.EAGER)
     private Task task;
 }

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

 package com.keymobile.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -19,13 +21,15 @@ public class RecordData implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
 
     @Column(columnDefinition = "DATETIME COMMENT '创建时间'")
+    @CreationTimestamp
     private Timestamp createAt;
 
     @ManyToOne
+    @JsonIgnore
     private RecordInfo recordInfo;
 
 }

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

 package com.keymobile.rest.model;
 
-import com.keymobile.rest.service.User;
-import jdk.nashorn.internal.ir.annotations.Ignore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -22,13 +22,15 @@ public class RecordInfo implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
 
     @Column(columnDefinition = "DATETIME COMMENT '创建时间'")
+    @CreationTimestamp
     private Timestamp createAt;
 
     @OneToMany
+    @JsonIgnore
     List<RecordData> recordDataList;
 
     @OneToOne

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

 package com.keymobile.rest.model;
 
-import com.keymobile.rest.service.User;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.CreationTimestamp;
 
 import java.sql.Timestamp;
 
@@ -23,27 +24,29 @@ public class Task implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
-    @Column(columnDefinition = "varchar(100) COMMENT '活动标题")
+    @Column
     private String name;
 
-    @Column(columnDefinition = "int(2) COMMENT '发起类型 1 手动 2 自动 '")
-    private Integer type = 1;
+    @Column
+    private int type = 1;
 
-    @Column(columnDefinition = "int(2) COMMENT '当前任务状态 1 待发起 2 已发起 '")
-    private Integer status = 1;
+    @Column
+    private int status = 1;
 
-    @Column(columnDefinition = "int(2) default 1 COMMENT '是否需要审核 1 不需要 2 需要'")
-    private Integer adjust = 2;
+    @Column
+    private int judge = 2;
 
-    @Column(columnDefinition = "DATETIME COMMENT '自动发起时间'")
+    @Column
     private Timestamp startAt;
 
-    @Column(columnDefinition = "DATETIME COMMENT '创建时间'")
+    @Column(nullable = false)
+    @CreationTimestamp
     private Timestamp createAt;
 
     @OneToMany
+    @JsonIgnore
     private List<Excel> excelList;
 
     @ManyToOne

src/main/java/com/keymobile/rest/service/User.java → src/main/java/com/keymobile/rest/model/User.java

-package com.keymobile.rest.service;
+package com.keymobile.rest.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -14,15 +14,22 @@ import java.io.Serializable;
 public class User implements Serializable {
 
 
+    public static int ROLE_NORMAL = 1;
+    public static int ROLE_JUDGE = 2;
+    public static int ROLE_MANAGER = 3;
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
-    @Column(nullable = false, columnDefinition = "varchar(50) COMMENT '名称'")
+    @Column(nullable = false)
     private String username;
 
-    @Column(nullable = false, columnDefinition = "role(2) COMMENT '角色 1  补录人员 2  审核人员 3  发起人员'")
-    private Integer role;
+    /**
+     * 1 补录人员 2 审核人员 3 发起人
+     */
+    @Column
+    private int role;
 
 
 }

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

@@ -9,8 +9,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class TaskService {
 

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

 package com.keymobile.rest.service;
 
 import com.keymobile.rest.dao.UserDao;
+import com.keymobile.rest.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/keymobile/rest/vo/TaskVO.java

+package com.keymobile.rest.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.keymobile.rest.model.Excel;
+import com.keymobile.rest.model.User;
+import lombok.Data;
+import org.hibernate.annotations.CreationTimestamp;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+@Data
+public class TaskVO {
+
+    @Id
+    private long id;
+
+    private String name;
+
+    private int type;
+
+    private int status;
+
+    private int judge;
+
+    private Timestamp startAt;
+
+    private long userId;
+}

src/main/resources/application-test.yml

@@ -9,10 +9,12 @@ spring:
   application:
     name: activiti
   jpa:
+    show-sql: true
+    database-platform: org.hibernate.dialect.MySQL5Dialect
     hibernate:
       ddl-auto: update
   datasource:
-    url: jdbc:mysql://47.105.193.165:3306/test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://47.105.193.165:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     password: 123456
     hikari: