Skip to content

D
device-back
提交 1c435f86 authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

添加维修测试

上级 2e7d8862
隐藏空白字符变更
内嵌 并排
正在显示 包含 178 行增加 和 12 行删除
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 1c435f86
......@@ -231,7 +231,7 @@ public class RepairController {
});
}
//更新维修单和送修单状态
//如果当前为省像国家发起的
//如果当前为省向国家发起的
if (level==1){
repairBill.setRepairStatus(4);
repairSendBill.setRepairStatus(5);
......@@ -468,7 +468,9 @@ public class RepairController {
.map(RepairDetail::getDeviceId)
.collect(Collectors.toList());
//根据id添加装备
idList.forEach(integer -> deviceLibraryEntities.add(deviceLibraryService.getOne(integer)));
if (idList.size()>0) {
idList.forEach(integer -> deviceLibraryEntities.add(deviceLibraryService.getOne(integer)));
}
repairOutPutDeviceVo.setDeviceLibraries(deviceLibraryEntities);
return ResultUtil.success(repairOutPutDeviceVo);
}
......
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/DeviceDetailVo.java
浏览文件 @ 1c435f86
......@@ -2,12 +2,14 @@ package com.tykj.dev.device.repair.subject.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @author dengdiyi
*/
@Data
@AllArgsConstructor
@ApiModel("维修装备详情类")
public class DeviceDetailVo {
......
dev-taskselect/src/main/java/com/tykj/dev/device/taskselect/controller/TaskSelectController.java
浏览文件 @ 1c435f86
......@@ -156,6 +156,18 @@ public class TaskSelectController {
list.add(allotBillEntity);
String str2 = allotBillEntity.getAllotCheckDetail();
List<DeviceLibrary> deviceLibraryEntities = new ArrayList<>();
if (str2!=null) {
String[] strings1 = str2.split("x");
for (String s : strings1) {
if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
Integer checkResult = Integer.parseInt(s.substring(s.length() - 1));
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setCheckResult(checkResult);
deviceLibraryEntities.add(deviceLibraryEntity);
}
}
}
list.add(deviceLibraryEntities);
return ResponseEntity.ok(new ResultObj(list,"查询成功"));
case 4:
......
dev-union/src/main/java/com/tykj/dev/union/BeanConfig.java 0 → 100644
浏览文件 @ 1c435f86
package com.tykj.dev.union;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
public class BeanConfig {
}
dev-union/src/test/java/com/tykj/dev/repair/RepairControllerTest.java
浏览文件 @ 1c435f86
package com.tykj.dev.repair;
import com.tykj.dev.device.repair.subject.vo.RepairBillSaveVo;
import com.github.wenhao.jpa.Specifications;
import com.tykj.dev.device.repair.repository.RepairDetailDao;
import com.tykj.dev.device.repair.subject.domin.RepairDetail;
import com.tykj.dev.device.repair.subject.vo.*;
import com.tykj.dev.device.task.repository.TaskDao;
import com.tykj.dev.device.task.subject.domin.Task;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.util.AuthenticationUtils;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.SpringUtils;
import com.tykj.dev.union.BaseTest;
import com.tykj.dev.union.BeanConfig;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.RequestBuilder;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import static com.tykj.dev.misc.utils.JacksonUtil.toJSon;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@SuppressWarnings("ALL")
@WithMockUser(username = "shena", password = "qwer1234", authorities = "省A专管员")
@WithMockUser(username = "shia", password = "qwer1234", authorities = "市A专管员")
@ActiveProfiles("dev")
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes= BeanConfig.class)
public class RepairControllerTest extends BaseTest {
@Autowired
protected MockMvc mockMvc;
@Autowired
private TaskDao taskDao;
@Autowired
private RepairDetailDao repairDetailDao;
@Autowired
private UserUtils userUtils;
int repairSendTaskId;
int repairBackTaskId;
/**
* 发起维修运输过程单元测试
*/
@Test
void createRepairTest() throws Exception{
public void createRepairTest() throws Exception{
RepairBillSaveVo repairBillSaveVo = new RepairBillSaveVo();
repairBillSaveVo.setStartUseraId(5);
repairBillSaveVo.setStartUserbId(6);
repairBillSaveVo.setStartUseraId(3);
repairBillSaveVo.setStartUserbId(4);
repairBillSaveVo.setApplyNumber("qweqwe");
repairBillSaveVo.setAgent("sadad");
repairBillSaveVo.setReceiveUnit("市机要局");
List<Integer> ids = new ArrayList<>();
ids.add(21);
ids.add(26);
// repairBillSaveVo.setDeviceList(ids);
repairBillSaveVo.setReceiveUnit("省机要局");
List<DeviceDetailVo> ids = new ArrayList<>();
ids.add(new DeviceDetailVo(21,"aaa"));
ids.add(new DeviceDetailVo(26,"asdasd"));
repairBillSaveVo.setDeviceList(ids);
repairBillSaveVo.setFileName("aaaa");
repairBillSaveVo.setFileUrl("sdfhks");
repairBillSaveVo.setRepairDeviceCheckDetail("x211x261x");
repairBillSaveVo.setRepairDeviceCheckResult("0x0");
repairBillSaveVo.setReplayNumber("adjskhsd");
repairBillSaveVo.setSendedCount(2);
repairBillSaveVo.setSendingCount(2);
repairBillSaveVo.setSendUnit("市机要局");
// 测试
RequestBuilder request;
request = post("/repair/form")
.header("Origin", "*")
.contentType(MediaType.APPLICATION_JSON)
.content(toJSon(repairBillSaveVo));
mockMvc.perform(request)
.andExpect(status().isOk())
.andDo(mvcResult1 -> System.out.println("[测试结果] 发起维修任务测试通过"));
Task initTask = taskDao.findAll(Specifications.<Task>and()
.eq("billStatus", StatusEnum.REPAIR_SEND_CONFIRM.id)
.build()).stream()
.sorted(Comparator.comparing(Task::getCreateTime).reversed())
.collect(Collectors.toList())
.get(0);
this.repairSendTaskId = initTask.getId();
//审核通过
RepairConfirmVo repairConfirmVo = new RepairConfirmVo();
repairConfirmVo.setStatus(0);
repairConfirmVo.setTaskId(initTask.getId());
request = post("/repair/sendConfirm")
.header("Origin", "*")
.contentType(MediaType.APPLICATION_JSON)
.content(toJSon(repairConfirmVo));
mockMvc.perform(request)
.andExpect(status().isOk())
.andDo(mvcResult1 -> System.out.println("[测试结果] 对任务id="+initTask.getId()+"的任务发起维修审核成功，维修单id为"+initTask.getBillId()));
//如果是省向国家发起的
if (userUtils.getCurrentUnitLevel()==1){
System.out.println("等待国家维修装备退回");
}
else {
//接收维修装备
RepairReceiveVo repairReceiveVo = new RepairReceiveVo();
repairReceiveVo.setBillFileName("adfaf");
repairReceiveVo.setBillFileUrl("asdas");
repairReceiveVo.setReceiveCheckDetail("x211x261x");
repairReceiveVo.setReceiveCount(2);
repairReceiveVo.setReceiveCheckResult("0x0");
repairReceiveVo.setReceiveUserbId(2);
repairReceiveVo.setTaskId(initTask.getId());
request = post("/repair/receive")
.header("Origin", "*")
.contentType(MediaType.APPLICATION_JSON)
.content(toJSon(repairReceiveVo));
mockMvc.perform(request)
.andExpect(status().isOk())
.andDo(mvcResult1 -> System.out.println("[测试结果] 维修装备接收成功"));
//接收维修装备审核通过
repairConfirmVo.setStatus(0);
repairConfirmVo.setTaskId(initTask.getId());
request = post("/repair/receiveConfirm")
.header("Origin", "*")
.contentType(MediaType.APPLICATION_JSON)
.content(toJSon(repairConfirmVo));
mockMvc.perform(request)
.andExpect(status().isOk())
.andDo(mvcResult1 -> System.out.println("[测试结果] 接收维修装备审核成功"));
}
}
/**
* 维修退回过程单元测试
*/
@Test
public void sendBackRepairDevice() throws Exception {
Integer level = userUtils.getCurrentUnitLevel();
RequestBuilder request;
if (level==2||level==3){
request = get("/repair/backDeviceSelect"+repairSendTaskId)
.header("Origin", "*")
.contentType(MediaType.APPLICATION_JSON);
MvcResult result = mockMvc.perform(request)
.andExpect(status().isOk())
.andDo(mvcResult1 -> System.out.println("[测试结果] 维修退回装备出库查询成功"))
.andReturn();
System.out.println(result.getAsyncResult());
}
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论