|
|
@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.emergency.controller;
|
|
|
|
|
|
|
|
|
import cn.com.ty.lift.business.common.CountPage;
|
|
|
+import cn.com.ty.lift.business.common.Judge;
|
|
|
import cn.com.ty.lift.business.common.Values;
|
|
|
import cn.com.ty.lift.business.emergency.dto.LiftFaultCategory;
|
|
|
import cn.com.ty.lift.business.emergency.dto.LiftFaultType;
|
|
|
@@ -65,14 +66,10 @@ public class EmergencyRepairController {
|
|
|
*/
|
|
|
@PostMapping("findOne")
|
|
|
public RestResponse findOne(@RequestBody RepairRequest request){
|
|
|
- long id = request.getId();
|
|
|
- if(id == 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Long id = request.getId();
|
|
|
+ Judge.id(id);
|
|
|
RepairResponse result = emergencyRepairService.selectByIdWithInfo(request);
|
|
|
- if(null == result){
|
|
|
- return RestResponse.fail();
|
|
|
- }
|
|
|
+ Judge.notNull(result);
|
|
|
//查询相关的急修费用
|
|
|
List<ErCostItem> erCostItems = erCostItemService.listByErRecordId(id);
|
|
|
result.setErCostItems(erCostItems);
|
|
|
@@ -114,18 +111,13 @@ public class EmergencyRepairController {
|
|
|
*/
|
|
|
@PostMapping("add")
|
|
|
public RestResponse add(@RequestBody EmergencyRepair entity){
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
- EmergencyRepair old = emergencyRepairService.findByMtCompanyAndLift(entity.getMtCompanyId(),entity.getLiftId());
|
|
|
- if(null != old && (old.getStatus() == Values.ER_STATUS_TO_REPAIRED || old.getStatus() == Values.ER_STATUS_REPAIRING)){
|
|
|
- return RestResponse.fail("该电梯存在未完成的急修，无法创建");
|
|
|
- }
|
|
|
+ int repairing = emergencyRepairService.countRepairing(entity.getMtCompanyId(),entity.getLiftId());
|
|
|
+ Judge.notTrue(repairing > 0,"该电梯存在未完成的急修，无法创建");
|
|
|
//派单时间 急修单创建时间
|
|
|
entity.setAssignTime(LocalDateTime.now());
|
|
|
entity.setStatus(Values.ER_STATUS_TO_REPAIRED);
|
|
|
boolean result = emergencyRepairService.save(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -137,9 +129,7 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("list")
|
|
|
public RestResponse list(@RequestBody RepairRequest request){
|
|
|
IPage<RepairResponse> pages = emergencyRepairService.pageByRepairing(request);
|
|
|
- if(null == pages){
|
|
|
- return RestResponse.fail();
|
|
|
- }
|
|
|
+ Judge.notNull(pages);
|
|
|
long count = pages.getTotal();
|
|
|
CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
|
|
|
return RestResponse.success(countPage);
|
|
|
@@ -154,9 +144,7 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("page")
|
|
|
public RestResponse page(@RequestBody RepairRequest request){
|
|
|
IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
|
|
|
- if(null == pages){
|
|
|
- return RestResponse.fail();
|
|
|
- }
|
|
|
+ Judge.notNull(pages);
|
|
|
long count = emergencyRepairService.countByCondition(request);
|
|
|
CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
|
|
|
return RestResponse.success(countPage);
|
|
|
@@ -170,11 +158,10 @@ public class EmergencyRepairController {
|
|
|
*/
|
|
|
@PostMapping("pageWorker")
|
|
|
public RestResponse pageWorker(@RequestBody RepairRequest request){
|
|
|
- if(request.getWorkerId() == null || request.getWorkerId() <= 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Long workerId = request.getWorkerId();
|
|
|
+ Judge.id(workerId);
|
|
|
IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
|
|
|
- return null != pages ? RestResponse.success(pages) : RestResponse.fail();
|
|
|
+ return Judge.result(pages);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -187,21 +174,18 @@ public class EmergencyRepairController {
|
|
|
public RestResponse transfer(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
Long workerId = request.getWorkerId();
|
|
|
- if(null == id || null == workerId){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(id);
|
|
|
+ Judge.id(workerId);
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
//如果已经接单，在急修中了不能被转派
|
|
|
- if (entity.getStatus() == Values.ER_STATUS_REPAIRING) {
|
|
|
+ if (Values.erStatusRepairing(entity.getStatus())) {
|
|
|
return RestResponse.fail("急修已经接单，不能转派");
|
|
|
}
|
|
|
//本急修单的负责维保工
|
|
|
entity.setWorkerId1(workerId);
|
|
|
boolean result = emergencyRepairService.saveOrUpdate(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -213,22 +197,17 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("close")
|
|
|
public RestResponse close(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
- if(null == id || id <= 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ //fixme:assert判断条件
|
|
|
+ Judge.id(id);
|
|
|
String reason = request.getCloseReason();
|
|
|
- if(StrUtil.isEmpty(reason)){
|
|
|
- return RestResponse.fail("缺少关闭原因");
|
|
|
- }
|
|
|
+ Judge.notNull(reason,"缺少关闭原因");
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
entity.setCloseReason(reason);
|
|
|
//新状态（-1 暂停中，0 待修理；1 修理中；2 已完成 3 已关闭）
|
|
|
entity.setStatus(Values.ER_STATUS_CLOSE);
|
|
|
boolean result = emergencyRepairService.saveOrUpdate(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -238,8 +217,10 @@ public class EmergencyRepairController {
|
|
|
*/
|
|
|
@PostMapping("pageByUser")
|
|
|
public RestResponse pageByUser(@RequestBody RepairRequest request){
|
|
|
+ Long userId = request.getUserId();
|
|
|
+ Judge.id(userId);
|
|
|
IPage<RepairResponse> pages = emergencyRepairService.pageByUser(request);
|
|
|
- return null != pages ? RestResponse.success(pages) : RestResponse.fail();
|
|
|
+ return Judge.result(pages);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -251,19 +232,17 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("taking")
|
|
|
public RestResponse taking(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
+ Judge.id(id);
|
|
|
LocalDateTime takingTime = request.getTakingTime();
|
|
|
- if(null == id || id < 0 || null == takingTime){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(takingTime,"缺少接单时间");
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
+ Judge.isTrue(Values.erStatusToRepaired(entity.getStatus()),"待急修的才能接单");
|
|
|
entity.setTakingTime(takingTime);
|
|
|
//状态改成修理中 todo:修改电梯的业务状态为急修中,如果存在维保中，要修改
|
|
|
entity.setStatus(Values.ER_STATUS_REPAIRING);
|
|
|
boolean result = emergencyRepairService.taking(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -274,24 +253,17 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("arrive")
|
|
|
public RestResponse arrive(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
- if(null == id || id < 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(id);
|
|
|
LocalDateTime arriveTime = request.getArriveTime();
|
|
|
- if(null == arriveTime){
|
|
|
- return RestResponse.fail("缺少达到时间");
|
|
|
- }
|
|
|
+ Judge.notNull(arriveTime,"缺少达到时间");
|
|
|
String position = request.getPosition();
|
|
|
- if(StrUtil.isEmpty(position)){
|
|
|
- return RestResponse.fail("缺少达到地点");
|
|
|
- }
|
|
|
+ Judge.notNull(position,"缺少达到地点");
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
+ Judge.isTrue(Values.erStatusRepairing(entity.getStatus()), "急修中的才能到达");
|
|
|
entity.setArriveTime(arriveTime);
|
|
|
boolean result = emergencyRepairService.updateById(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -303,25 +275,18 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("stop")
|
|
|
public RestResponse stopLift(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
- if(null == id || id < 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(id);
|
|
|
LocalDateTime stopDate = request.getStopDate();
|
|
|
- if(null == stopDate){
|
|
|
- return RestResponse.fail("请指定停梯时间");
|
|
|
- }
|
|
|
+ Judge.notNull(stopDate,"请指定停梯时间");
|
|
|
String safetyConfirm = request.getSafetyConfirm();
|
|
|
- if(StrUtil.isEmpty(safetyConfirm)){
|
|
|
- return RestResponse.fail("请完成安全确认");
|
|
|
- }
|
|
|
+ Judge.notNull(safetyConfirm,"请完成安全确认");
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
+ Judge.isTrue(Values.erStatusRepairing(entity.getStatus()),"急修中的才能停梯");
|
|
|
entity.setStopDate(stopDate);
|
|
|
entity.setSafetyConfirm(safetyConfirm);
|
|
|
boolean result = emergencyRepairService.updateById(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -333,16 +298,15 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("cost/add")
|
|
|
public RestResponse costAdd(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
+ Judge.id(id);
|
|
|
List<ErCostItem> erCostItems = request.getErCostItems();
|
|
|
- if(id == null || null == erCostItems || erCostItems.isEmpty()){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(erCostItems,"缺少收费项");
|
|
|
BigDecimal costTotal = new BigDecimal(0);
|
|
|
erCostItems.forEach(item -> {
|
|
|
costTotal.add(item.getCostMoney());
|
|
|
});
|
|
|
boolean result = erCostItemService.saveBatch(erCostItems);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -353,11 +317,9 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("cost/delete")
|
|
|
public RestResponse costDelete(@RequestBody RepairRequest request){
|
|
|
Long erCostItemId = request.getErCostItemId();
|
|
|
- if(null == erCostItemId || erCostItemId <= 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(erCostItemId);
|
|
|
boolean result = erCostItemService.removeById(erCostItemId);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -368,11 +330,9 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("cost/modify")
|
|
|
public RestResponse costModify(@RequestBody RepairRequest request){
|
|
|
List<ErCostItem> erCostItems = request.getErCostItems();
|
|
|
- if(null == erCostItems || erCostItems.isEmpty()){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(erCostItems);
|
|
|
boolean result = erCostItemService.updateBatchById(erCostItems);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -387,7 +347,7 @@ public class EmergencyRepairController {
|
|
|
return RestResponse.success(liftFaultService.list());
|
|
|
}
|
|
|
List<LiftFault> lists = liftFaultService.listByLiftCategory(liftCategory);
|
|
|
- return null != lists ? RestResponse.success(lists) : RestResponse.fail();
|
|
|
+ return Judge.result(lists);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -413,14 +373,9 @@ public class EmergencyRepairController {
|
|
|
* @return
|
|
|
*/
|
|
|
private RestResponse assemble(List<LiftFault> liftFaults){
|
|
|
- if (ObjectUtil.isEmpty(liftFaults)) {
|
|
|
- return RestResponse.fail("没有故障信息");
|
|
|
- }
|
|
|
-
|
|
|
+ Judge.notNull(liftFaults,"没有故障信息");
|
|
|
List<String> categories = liftFaults.stream().map(LiftFault::getFaultCategory).distinct().collect(Collectors.toList());
|
|
|
- if (ObjectUtil.isEmpty(categories)) {
|
|
|
- return RestResponse.fail("没有故障类型");
|
|
|
- }
|
|
|
+ Judge.notNull(categories,"没有故障类型");
|
|
|
List<LiftFaultCategory> liftFaultCategories = new ArrayList<>();
|
|
|
categories.forEach(category -> {
|
|
|
log.info("category: {}", category);
|
|
|
@@ -452,30 +407,20 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("evaluate")
|
|
|
public RestResponse evaluate(@RequestBody EvaluationRequest request){
|
|
|
Long recordId = request.getRecordId();
|
|
|
- if(null == recordId || recordId <= 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(recordId);
|
|
|
String customerSign = request.getCustomerSign();
|
|
|
- if(StrUtil.isEmpty(customerSign)){
|
|
|
- return RestResponse.fail("请签名");
|
|
|
- }
|
|
|
+ Judge.notNull(customerSign,"请签名");
|
|
|
EmergencyRepair repair = emergencyRepairService.getById(recordId);
|
|
|
- if(null == repair){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
- if(repair.getStatus() != Values.ER_STATUS_FINISH){
|
|
|
- return RestResponse.fail("该急修未完成不能评价");
|
|
|
- }
|
|
|
- Evaluation old = evaluationService.findByRecord(recordId);
|
|
|
- if (null != old) {
|
|
|
- return RestResponse.fail("该急修已经存在评价");
|
|
|
- }
|
|
|
+ Judge.notNull(repair);
|
|
|
+ Judge.isTrue(Values.erStatusFinish(repair.getStatus()),"该急修未完成不能评价");
|
|
|
+ int count = evaluationService.countByRecord(recordId);
|
|
|
+ Judge.notTrue(count > 0,"该急修已经存在评价");
|
|
|
Evaluation evaluation = new Evaluation();
|
|
|
//复制属性到评价bean
|
|
|
BeanUtil.copyProperties(request,evaluation);
|
|
|
evaluation.setPostDate(LocalDateTime.now());
|
|
|
boolean result = evaluationService.save(evaluation);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -486,22 +431,14 @@ public class EmergencyRepairController {
|
|
|
@PostMapping("repairOrder")
|
|
|
public RestResponse repairOrder(@RequestBody RepairRequest request){
|
|
|
Long id = request.getId();
|
|
|
- if (null == id || id <= 0){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.id(id);
|
|
|
LocalDateTime recoveryDate = request.getRecoveryDate();
|
|
|
- if(null == recoveryDate){
|
|
|
- return RestResponse.fail("请填写恢复时间");
|
|
|
- }
|
|
|
+ Judge.notNull(recoveryDate,"请填写恢复时间");
|
|
|
String mainSign = request.getMainSign();
|
|
|
String secondSign = request.getSecondSign();
|
|
|
- if(StrUtil.hasEmpty(mainSign,secondSign)){
|
|
|
- return RestResponse.fail("请签名");
|
|
|
- }
|
|
|
+ Judge.notTrue(StrUtil.hasEmpty(mainSign,secondSign),"请签名");
|
|
|
EmergencyRepair entity = emergencyRepairService.getById(id);
|
|
|
- if(null == entity){
|
|
|
- return RestResponse.failParam();
|
|
|
- }
|
|
|
+ Judge.notNull(entity);
|
|
|
entity.setFaultPart(request.getFaultPart());
|
|
|
entity.setFaultReason(request.getFaultReason());
|
|
|
entity.setFaultHandle(request.getFaultHandle());
|
|
|
@@ -512,6 +449,6 @@ public class EmergencyRepairController {
|
|
|
//修改状态已完成
|
|
|
entity.setStatus(Values.ER_STATUS_FINISH);
|
|
|
boolean result = emergencyRepairService.updateById(entity);
|
|
|
- return result ? RestResponse.success(result) : RestResponse.fail();
|
|
|
+ return Judge.result(result);
|
|
|
}
|
|
|
}
|
wucizhong