Skip to content

D
device-back
提交 bc19330b authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

[业务模块]新增接口，[日志]日志新增

上级 21b4fbd5
隐藏空白字符变更
内嵌 并排
正在显示 包含 185 行增加 和 17 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ bc19330b
......@@ -511,7 +511,7 @@ public class AllotBillController {
allotBill1.setSendUseraId(userId);
AllotBill allotBill = allotBillService.addEntity(allotBill1);
//发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, allotBillSaveVo.getSendUnit()+"配发型号："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ bc19330b
......@@ -311,18 +311,26 @@ public enum LogType {
REPAIR_SEND_19(129,REPAIR.id, REPAIR_SEND_WAIT_SIGN.id, END.id, "盖电子签章并入库"),
REPAIR_SEND_20(130,REPAIR.id, REPAIR_SEND_WAIT_SIGN.id, WAIT_UPLOAD_FILE.id, "盖电子签章并入库"),
REPAIR_SEND_21(131,REPAIR.id, REPAIR_SEND_SIGN_WAIT_CONFIRM.id, WAIT_RECEIVE.id, "拒绝电子签章申请"),
REPAIR_BACK_14(132, REPAIR.id, ORIGIN_STATUS.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, "申请电子签章"),
REPAIR_BACK_16(134,REPAIR.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, REPAIR_BACK_DRAFT.id, "拒绝电子签章申请"),
REPAIR_BACK_17(135,REPAIR.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, REPAIR_BACK_WAIT_SIGN.id, "同意电子签章申请"),
REPAIR_BACK_18(136,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_BACK_RECEIVE.id, "盖电子签章并出库"),
REPAIR_BACK_19(137,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, END.id, "盖电子签章并入库"),
REPAIR_BACK_20(138,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_UPLOAD_BACK_FILE.id, "盖电子签章并入库"),
// REPAIR_BACK_18(136,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_BACK_RECEIVE.id, "盖电子签章并出库"),
REPAIR_BACK_18(136,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_BACK_RECEIVE.id, "等待接收维修装备"),
REPAIR_BACK_19(137,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, END.id, "盖电子签章并出库"),
// REPAIR_BACK_20(138,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_UPLOAD_BACK_FILE.id, "盖电子签章并入库"),
REPAIR_BACK_20(138,REPAIR.id, REPAIR_BACK_WAIT_SIGN.id, WAIT_UPLOAD_BACK_FILE.id, "上传签收单"),
REPAIR_BACK_21(139,REPAIR.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, WAIT_BACK_RECEIVE.id, "拒绝电子签章申请"),
APPLY_7(140,APPLY.id, WAIT_APPLY_FILE.id, END.id, "申请不同意，业务办结"),
// ALLOT_BACK_16(141,ALLOT_BACK.id, BACK_DRAFT.id, ALLOT_BACKING.id, "从草稿发起退回"),
ALLOT_BACK_17(142,ALLOT_BACK.id, ORIGIN_STATUS.id, BACK_DRAFT.id, "从草稿发起退回"),
;
ALLOT_23(143,ALLOT.id, ALLOTING.id, SIGN_WAIT_CONFIRM.id, "申请入库签章"),
ALLOT_24(144,ALLOT.id, ORIGIN_STATUS.id, WAIT_UPLOAD_ALLOT_FILE.id, "待上传回执单"),
// REPAIR_BACK_22(145,REPAIR_BACK.id, ORIGIN_STATUS.id, REPAIR_BACK_DRAFT.id, "维修退回等待出库"),
REPAIR_BACK_23(146,REPAIR_BACK.id, REPAIR_BACK_DRAFT.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, "申请签章待审核"),
// REPAIR_SEND_22(147,REPAIR.id, ORIGIN_STATUS.id, REPAIR_SEND_DRAFT.id, "送修等待出库"),
REPAIR_SEND_23(148,REPAIR.id, ORIGIN_STATUS.id, WAIT_UPLOAD_SEND_FILE.id, "等待上传回执单"),;
public Integer id;
......
dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java
浏览文件 @ bc19330b
......@@ -75,7 +75,8 @@ public class FinalCheckServiceImpl implements FinalCheckService {
Map<String, DeviceStatistics> repairMap = dataService.getRepairStatistics(localDateToDate(startTime), localDateToDate(endTime))
.stream()
.collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
List<DeviceLibrary> verticalList = new ArrayList<>();
List<DeviceLibrary> horizontalList = new ArrayList<>();
for (Map.Entry<String, List<DeviceLibrary>> entry : map.entrySet()) {
String key = entry.getKey();
List<DeviceLibrary> v = entry.getValue();
......
dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java
浏览文件 @ bc19330b
......@@ -97,7 +97,7 @@ public class PackingLibrary {
/**
* 配用范围
*/
@ApiModelProperty(value = "配用范围")
@ApiModelProperty(value = "配用范围",notes = "1 省以下纵向 2 中央到省 3 省以下横向 4 其他")
private Integer matchingRange;
/**
* 可见范围
......
dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java
浏览文件 @ bc19330b
package com.tykj.dev.device.task.controller;
import com.alibaba.fastjson.JSONObject;
import com.tykj.dev.config.GlobalMap;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.library.service.DeviceChangeService;
......@@ -306,20 +307,46 @@ public class TaskController {
}
@ApiOperation(value = "任务日志", notes = "根据任务id查询任务日志")
@GetMapping("/taskLog/id")
public ResponseEntity getTasklog(Integer taskId){
@PostMapping("/taskLog/taskBusinessTypeVo")
public ResponseEntity getTaskLog(@RequestBody TaskBusinessTypeVo taskBusinessTypeVo){
Integer businessType = taskBusinessTypeVo.getBusinessType();
Integer taskId = taskBusinessTypeVo.getTaskId();
List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskId);
Map<String, Object> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
map.put(taskLogUserVo.getOldStatus().toString(),taskLogUserVo.getUser());
}else {
map.put("",taskLogUserVo.getUser());
}
switch(businessType){
case 3 :
return ResponseEntity.ok(allot(taskLogUserVos));
case 22 :
//语句
return ResponseEntity.ok(backAllot(taskLogUserVos));
case 10 :
//语句
return ResponseEntity.ok(repairBack(taskLogUserVos));
case 11 :
//语句
return ResponseEntity.ok(repair(taskLogUserVos));
default : //可选
return ResponseEntity.ok(defaults(taskLogUserVos));
}
return ResponseEntity.ok(map);
// for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
//
// if (taskLogUserVo.getOldStatus()!=null){
// if (!map.containsKey(taskLogUserVo.getOldStatus()+"")){
// map.put(taskLogUserVo.getOldStatus()+"", taskLogUserVo.getUser());
// }else {
// map.put(taskLogUserVo.getOldStatus()+"-1",taskLogUserVo.getUser());
// }
//
// }else {
// map.put("",taskLogUserVo.getUser());
// }
//
// }
}
@ApiOperation(value = "任务撤回", notes = "根据任务id撤回任务")
......@@ -346,6 +373,120 @@ public class TaskController {
}
private Map<String, String> allot(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
if (taskLogUserVo.getOldStatus() == 340){
if (map.containsKey("340")){
map.put("340j",taskLogUserVo.getUser());
}else {
//存在
if (map.containsKey("302")){
map.put("340j",taskLogUserVo.getUser());
}else {
map.put("340",taskLogUserVo.getUser());
}
}
}else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}
}
}
return map;
}
private Map<String, String> backAllot(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
if (taskLogUserVo.getOldStatus() == 930){
if (map.containsKey("930")){
map.put("930j",taskLogUserVo.getUser());
}else {
//存在
if (map.containsKey("900")){
map.put("930j",taskLogUserVo.getUser());
}else {
map.put("930",taskLogUserVo.getUser());
}
}
}else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}
}
}
return map;
}
private Map<String, String> repair(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
if (taskLogUserVo.getOldStatus() == 790){
if (map.containsKey("790")){
map.put("790j",taskLogUserVo.getUser());
}else {
//存在
if (map.containsKey("703")){
map.put("790j",taskLogUserVo.getUser());
}else {
map.put("790",taskLogUserVo.getUser());
}
}
}else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}
}
}
return map;
}
private Map<String, String> repairBack(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
if (taskLogUserVo.getOldStatus() == 820){
if (map.containsKey("820")){
map.put("820j",taskLogUserVo.getUser());
}else {
//存在
if (map.containsKey("801")){
map.put("820j",taskLogUserVo.getUser());
}else {
map.put("820",taskLogUserVo.getUser());
}
}
}else {
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}
}
}
return map;
}
private Map<String, String> defaults(List<TaskLogUserVo> taskLogUserVos){
Map<String, String> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
if (taskLogUserVo.getOldStatus()!=null){
map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
}
}
return map;
}
}
dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/TaskBusinessTypeVo.java 0 → 100644
浏览文件 @ bc19330b
package com.tykj.dev.device.task.subject.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* DATE:2021-6-17
* Author:zsp
*/
@Data
@ApiModel("日志查询")
public class TaskBusinessTypeVo {
@ApiModelProperty("任务id")
private Integer taskId;
@ApiModelProperty("业务类型")
private Integer businessType;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论