更新

src/main/java/com/keymobile/rest/common/bean/SimplePage.java

+package com.keymobile.rest.common.bean;
+
+import lombok.Builder;
+import lombok.Data;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Data
+@Builder
+public class SimplePage<T> {
+
+    private long totalElements;
+    private long totalPages;
+    private long pageSize;
+    private long pageNumber;
+    private List<T> content;
+
+    public static <T> SimplePage of(Page<T> page) {
+        return SimplePage
+                .builder()
+                .content((List<Object>) page.getContent())
+                .pageNumber(page.getPageable().getPageNumber())
+                .pageSize(page.getPageable().getPageSize())
+                .totalElements(page.getTotalElements())
+                .totalPages(page.getTotalPages())
+                .build();
+    }
+}

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

 package com.keymobile.rest.controller;
 
-import com.keymobile.rest.common.bean.ApiResponse;
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
 import com.keymobile.rest.model.DataInfo;
@@ -39,7 +38,7 @@ public class ExcelController {
             @ApiImplicitParam(name = "dataStr", required = true, value = "当前数据字符", dataType = "string", paramType = "query")
     })
     @PostMapping(value = "/excel/saveData")
-    public ApiResponse saveTemplateData(String taskId, long excelId, String dataStr) {
+    public Object saveTemplateData(String taskId, long excelId, String dataStr) {
 
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         CommonValidator.notNull(task, "任务不存在");
@@ -79,7 +78,7 @@ public class ExcelController {
         taskService.complete(task.getId(), vars);
 
 
-        return ApiResponse.ok();
+        return "成功";
     }
 
     @ApiOperation(value = "传excelId过来，获取用户填写的数据")
@@ -87,8 +86,8 @@ public class ExcelController {
             @ApiImplicitParam(name = "excelId", required = true, value = "当前模板id", dataType = "long", paramType = "query")
     )
     @PostMapping(value = "/excel/getData")
-    public ApiResponse getRecordData(long excelId) {
-        return ApiResponse.ok();
+    public Object getRecordData(long excelId) {
+        return "成功";
     }
 
 }

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

 package com.keymobile.rest.controller;
 
 import com.google.common.collect.ImmutableMap;
-import com.keymobile.rest.common.bean.ApiResponse;
 import com.keymobile.rest.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -21,8 +20,8 @@ public class UserController {
 
     @ApiOperation(value = "获取组织树", hidden = true)
     @GetMapping(value = "/orgs")
-    public ApiResponse getOrgs() {
-        return ApiResponse.ok(feignAuthService.getOrgs());
+    public Object getOrgs() {
+        return feignAuthService.getOrgs();
     }
 
 
@@ -31,9 +30,9 @@ public class UserController {
             @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
     })
     @GetMapping(value = "/org/users")
-    public ApiResponse getOrgUsers(long orgId) {
+    public List<Map> getOrgUsers(long orgId) {
         List<Map> users = feignAuthService.getUsersByOrgId(orgId);
-        return ApiResponse.ok(users);
+        return users;
     }
 
     @ApiOperation(value = "根据组织id获取用户组", hidden = true)
@@ -41,9 +40,9 @@ public class UserController {
             @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", required = true, dataType = "long")
     })
     @GetMapping(value = "/groups")
-    public ApiResponse getUserGroups(long orgId) {
+    public List<Map> getUserGroups(long orgId) {
         List<Map> userGroups = feignAuthService.getUserGroups(0, orgId);
-        return ApiResponse.ok(userGroups);
+        return userGroups;
     }
 
     @ApiOperation(value = "根据用户组id获取用户", hidden = true)
@@ -51,14 +50,14 @@ public class UserController {
             @ApiImplicitParam(name = "userGroupId", value = "用户组id", paramType = "query", required = true, dataType = "long")
     })
     @GetMapping(value = "/group/users")
-    public ApiResponse getGroupUsers(long userGroupId) {
+    public List<Map> getGroupUsers(long userGroupId) {
         List<Map> users = feignAuthService.getGroupUsers(0, userGroupId);
-        return ApiResponse.ok(users);
+        return users;
     }
 
     @ApiOperation(value = "获取补录范围用户树")
     @GetMapping(value = "/users")
-    public ApiResponse getUsers() {
+    public Map getUsers() {
         Map tree = (Map) feignAuthService.getOrgs();
         List<Map> subNodes = (List<Map>) tree.get("subNodes");
         List<Map> orgs = (List<Map>) subNodes.get(0).get("subNodes");
@@ -77,7 +76,7 @@ public class UserController {
             });
             org.put("subNodes", groups);
         });
-        return ApiResponse.ok(tree);
+        return tree;
     }
 
 }

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

+package com.keymobile.rest.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+
+@Data
+@Builder
+public class Mission {
+
+    private String id;
+    private String user;
+    private int taskType;
+    private String createAt;
+    private int missionType;
+    private String mission;
+    private long excelId;
+
+}

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

@@ -40,7 +40,6 @@ public class SimpleTask {
         task = BeanUtils.convertTo(activity, task);
         task.setExcelList(simpleTemplateList);
         return task;
-
     }
 
     public static List<SimpleTask> convert(List<Activity> activityList) {
@@ -50,7 +49,6 @@ public class SimpleTask {
             simpleTaskList.add(simpleTask);
         });
         return simpleTaskList;
-
     }
 
 }

src/main/resources/application-test.yml

@@ -9,8 +9,8 @@ eureka:
     enabled: true
   instance:
     prefer-ip-address: false
-#    hostname: 192.168.0.48
-    hostname: 192.168.0.68
+    hostname: 192.168.0.48
+#    hostname: 192.168.0.68
 hystrix:
   command:
     default:
@@ -28,12 +28,12 @@ spring:
     hibernate:
       ddl-auto: update
   datasource:
-#    url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-#    username: test
-#    password: test
-    url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: root
-    password: 123456
+    url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: test
+    password: test
+    #    url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    #    username: root
+    #    password: 123456
     hikari:
       maximum-pool-size: 3
   servlet:
@@ -41,8 +41,8 @@ spring:
       max-file-size: 20Mb
       max-request-size: 100Mb
   redis:
-#    host: 192.168.0.192
-    host: 127.0.0.1
+    host: 192.168.0.192
+    #    host: 127.0.0.1
     port: 6379
   session:
     store-type: redis
@@ -57,10 +57,10 @@ app:
   active-process: MoreSubProcessStandard.bpmn
 
 swagger2:
-#  host: 192.168.0.240:8762/api/datacollector
-  host: localhost:8110
+  host: 192.168.0.240:8762/api/datacollector
+#  host: localhost:8110
 security:
   authUser: root
   authPwd: pwd
-#  permit: false
-  permit: true
\ No newline at end of file
+  permit: false
+#  permit: true
\ No newline at end of file