Skip to content

D
datacollector
Commit e5d34b2c by chenweisong
Options

更新

parent b757bc91
Showing with 130 additions and 82 deletions
src/main/java/com/keymobile/rest/common/bean/SimplePage.java 0 → 100644
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/TaskController.java
package com.keymobile.rest.controller;
import com.google.common.collect.ImmutableMap;
import com.keymobile.rest.common.bean.ApiResponse;
import com.keymobile.rest.common.bean.SimplePage;
import com.keymobile.rest.common.utils.BeanUtils;
import com.keymobile.rest.common.utils.DateUtil;
import com.keymobile.rest.common.validator.CommonValidator;
import com.keymobile.rest.controller.constant.TaskConstant;
import com.keymobile.rest.model.*;
import com.keymobile.rest.model.Process;
import com.keymobile.rest.service.*;
import com.keymobile.rest.dto.ExcelForm;
import com.keymobile.rest.dto.TaskForm;
import com.keymobile.rest.vo.Mission;
import com.keymobile.rest.vo.SimpleTask;
import io.swagger.annotations.*;
import org.activiti.engine.*;
......@@ -26,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.*;
import static com.keymobile.rest.controller.constant.TaskConstant.*;
@Api(tags = "活动 控制器", description = "Task Info")
@RestController
......@@ -68,7 +69,7 @@ public class TaskController {
@ApiImplicitParam(name = "name", value = "活动名称", paramType = "query", dataType = "string")
})
@PostMapping(value = "/task/list")
public ApiResponse getTaskList(int pageNo, int pageSize, String name) {
public SimplePage getTaskList(int pageNo, int pageSize, String name) {
Page<Activity> taskList;
String orderBy = "descending"; //
String propBy = "id"; // groupBy
......@@ -77,7 +78,7 @@ public class TaskController {
} else {
taskList = activityService.findAll(pageNo, pageSize, orderBy, propBy);
}
return ApiResponse.ok(ImmutableMap.of("list", SimpleTask.convert(taskList.getContent()), "total", taskList.getTotalElements()));
return SimplePage.of(taskList);
}
@ApiOperation(value = "单个活动详情")
......@@ -85,10 +86,10 @@ public class TaskController {
@ApiImplicitParam(name = "taskId", value = "活动id", paramType = "query", required = true, dataType = "long")
})
@PostMapping(value = "/task/get")
public ApiResponse get(long taskId) {
public SimpleTask get(long taskId) {
Activity activity = activityService.get(taskId);
CommonValidator.notNull(activity, "活动不存在");
return ApiResponse.ok(SimpleTask.convert(activity));
return SimpleTask.convert(activity);
}
@ApiOperation(value = "我的任务", notes = "任务列表")
......@@ -96,16 +97,16 @@ public class TaskController {
@ApiImplicitParam(name = "userId", value = "用户id", paramType = "query", required = true, dataType = "long", defaultValue = "3")
})
@PostMapping(value = "/task/getMyTasks")
public ApiResponse getMyMissions(long userId) {
public List<Mission> getMyMissions(long userId) {
Map user = feignAuthService.getUserById(userId);
CommonValidator.notNull(user, "用户不存在");
String username = user.get("name").toString();
List<Map> missions = new ArrayList<>();
List<Mission> missions = new ArrayList<>();
// 获取个人任务
List<Task> tasks = taskService.createTaskQuery().taskAssigneeLike("%" + username + "%").active().list();
tasks.forEach(task -> {
missions.add(convert(task, ImmutableMap.of("username", username, "type", TASK_TYPE_PERSONAL)));
missions.add(convert(task, ImmutableMap.of("username", username, "type", TaskConstant.TASK_TYPE_PERSONAL)));
});
// 获取组任务
......@@ -122,20 +123,20 @@ public class TaskController {
// 组id
String groupId = "id:" + templateId;
if (groupId.equals(identityLink.getGroupId())) {
missions.add(convert(groupTask, ImmutableMap.of("username", username, "type", TASK_TYPE_GROUP, "templateId", templateId)));
missions.add(convert(groupTask, ImmutableMap.of("username", username, "type", TaskConstant.TASK_TYPE_GROUP, "templateId", templateId)));
}
});
}
});
}
});
return ApiResponse.ok(missions);
return missions;
}
@ApiOperation(value = "新建活动")
@PostMapping(value = "/task/create")
public ApiResponse createTask(@RequestBody TaskForm form) {
public Object createTask(@RequestBody TaskForm form) {
CommonValidator.notEmpty(form.getName(), "名称不能为空");
CommonValidator.notNull(form.getType(), "类型不能为空");
CommonValidator.isTrue(form.getExcels() != null && form.getExcels().size() != 0, "补录模板不能为空");
......@@ -182,13 +183,13 @@ public class TaskController {
userTemplateMapperService.save(mapper);
});
});
return ApiResponse.ok(finalActivity.getId());
return finalActivity.getId();
}
@ApiOperation(value = "修改活动")
@PostMapping(value = "/task/update")
public ApiResponse updateTask(@RequestBody TaskForm form) {
return ApiResponse.ok();
public Object updateTask(@RequestBody TaskForm form) {
return "修改成功";
}
@ApiOperation(value = "发起活动")
......@@ -196,7 +197,7 @@ public class TaskController {
@ApiImplicitParam(name = "taskId", value = "活动id", paramType = "query", required = true, dataType = "long")
})
@PostMapping(value = "/task/start")
public ApiResponse runTask(long taskId) {
public Object runTask(long taskId) {
Activity activity = activityService.get(taskId);
CommonValidator.notNull(activity, "活动不存在");
CommonValidator.isTrue(activity.getStatus() == Activity.STATUS_WAIT, "活动正在运行，不能重复启动");
......@@ -238,7 +239,7 @@ public class TaskController {
activity.setStatus(Activity.STATUS_BEGIN);
activityService.save(activity);
return ApiResponse.ok();
return "启动成功";
}
......@@ -247,7 +248,7 @@ public class TaskController {
@ApiImplicitParam(name = "taskId", value = "活动id", paramType = "query", required = true, dataType = "long")
})
@PostMapping(value = "/task/pass")
public ApiResponse passTask(long taskId) {
public Object passTask(long taskId) {
Activity activity = activityService.get(taskId);
// 完结活动， 流程跑完
// User judge = userService.getAudit();
......@@ -258,13 +259,13 @@ public class TaskController {
// taskService.complete(task.getId(), ImmutableMap.of("pass", "true"));
// assignment.setStatus(Assignment.STATUS_COMPLETED);
// activityService.update(activity);
return ApiResponse.ok();
return "审核通过成功";
}
@ApiOperation(value = "审核驳回活动")
@PostMapping(value = "/task/reject")
public ApiResponse rejectTask(@RequestParam Long taskId) {
public Object rejectTask(@RequestParam Long taskId) {
Activity activity = activityService.get(taskId);
// 完结活动， 流程跑完
// User judge = userService.getAudit();
......@@ -273,13 +274,13 @@ public class TaskController {
// TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
// Task task = taskList.get(0);
// taskService.complete(task.getId(), ImmutableMap.of("pass", "false"));
return ApiResponse.ok();
return "审核驳回成功";
}
@ApiOperation(value = "查看当前活动进程列表", hidden = true)
@PostMapping(value = "/task/progress")
public ApiResponse viewTasksProgress() {
return ApiResponse.ok();
public Object viewTasksProgress() {
return "";
}
......@@ -288,23 +289,24 @@ public class TaskController {
@ApiImplicitParam(name = "taskId", value = "活动id", paramType = "query", required = true, dataType = "long")
})
@PostMapping(value = "/task/progress/{taskId}")
public ApiResponse viewTaskProgress(@PathVariable long taskId) {
return ApiResponse.ok();
public Object viewTaskProgress(@PathVariable long taskId) {
return "";
}
public Map<String, Object> convert(Task task, Map<String, Object> params) {
Map<String, Object> mission = new HashMap<>();
mission.put("id", task.getId());
mission.put("user", params.get("username").toString());
int type = Integer.valueOf(params.get("type").toString());
mission.put("taskType", type);
mission.put("createAt", DateUtil.formatDateTime(task.getCreateTime()));
if (task.getTaskDefinitionKey().toLowerCase().equals(MISSION_LOW_CASE_KEY_DATA_ENTER)) {
mission.put("missionType", MISSION_TYPE_DATA_ENTER);
mission.put("mission", MISSION_TEXT_DATA_ENTER);
public Mission convert(Task task, Map<String, Object> params) {
Mission.MissionBuilder builder = Mission.builder();
int type = Integer.parseInt(params.get("type").toString());
builder.id(task.getId())
.user(params.get("username").toString())
.taskType(type)
.createAt(DateUtil.formatDateTime(task.getCreateTime()));
int missionType = 0;
String mission = "";
if (task.getTaskDefinitionKey().toLowerCase().equals(TaskConstant.MISSION_LOW_CASE_KEY_DATA_ENTER)) {
missionType = TaskConstant.MISSION_TYPE_DATA_ENTER;
mission = TaskConstant.MISSION_TEXT_DATA_ENTER;
long templateId = 0;
if (type == TASK_TYPE_PERSONAL) {
if (type == TaskConstant.TASK_TYPE_PERSONAL) {
String assignee = task.getAssignee();
String[] array = assignee.split(":");
try {
......@@ -312,21 +314,23 @@ public class TaskController {
} catch (Exception e) {
}
} else if (type == TASK_TYPE_GROUP) {
} else if (type == TaskConstant.TASK_TYPE_GROUP) {
templateId = Long.parseLong(params.get("templateId").toString());
}
mission.put("excelId", templateId);
} else if (task.getTaskDefinitionKey().toLowerCase().equals(MISSION_LOW_CASE_KEY__DATA_AUDIT)) {
mission.put("missionType", MISSION_TYPE_DATA_AUDIT);
mission.put("mission", MISSION_TEXT_DATA_AUDIT);
} else if (task.getTaskDefinitionKey().toLowerCase().equals(MISSION_LOW_CASE_KEY__MANAGER_AUDIT)) {
mission.put("missionType", MISSION_TYPE_MANAGER_AUDIT);
mission.put("mission", MISSION_TEXT_MANAGER_AUDIT);
} else if (task.getTaskDefinitionKey().toLowerCase().equals(MISSION_LOW_CASE_KEY__DATA_BACK_FLOW) ||
builder.excelId(templateId);
} else if (task.getTaskDefinitionKey().toLowerCase().equals(TaskConstant.MISSION_LOW_CASE_KEY__DATA_AUDIT)) {
missionType = TaskConstant.MISSION_TYPE_DATA_AUDIT;
mission = TaskConstant.MISSION_TEXT_DATA_AUDIT;
} else if (task.getTaskDefinitionKey().toLowerCase().equals(TaskConstant.MISSION_LOW_CASE_KEY__MANAGER_AUDIT)) {
missionType = TaskConstant.MISSION_TYPE_MANAGER_AUDIT;
mission = TaskConstant.MISSION_TEXT_MANAGER_AUDIT;
} else if (task.getTaskDefinitionKey().toLowerCase().equals(TaskConstant.MISSION_LOW_CASE_KEY__DATA_BACK_FLOW) ||
task.getTaskDefinitionKey().toLowerCase().equals("_26")) {
mission.put("missionType", MISSION_TYPE_DATA_BACK_FLOW);
mission.put("mission", MISSION_TEXT_DATA_BACK_FLOW);
missionType = TaskConstant.MISSION_TYPE_DATA_BACK_FLOW;
mission = TaskConstant.MISSION_TEXT_DATA_BACK_FLOW;
}
return mission;
builder.mission(mission)
.missionType(missionType);
return builder.build();
}
}
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 0 → 100644
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment