Skip to content

D
device-back
提交 2fd58a22 authored 作者: 133's avatar 133
浏览文件
操作

[清退] 提交代码 修改状态问题

上级 f6a7fc82
隐藏空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 9 行删除
dev-loss/src/main/java/com/tykj/dev/device/loss/entity/domain/DeviceLoss.java
浏览文件 @ 2fd58a22
......@@ -12,6 +12,7 @@ import org.hibernate.annotations.Where;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.Transient;
......@@ -94,6 +95,7 @@ public class DeviceLoss extends BaseEntity {
* 丢失单据
*/
@ApiModelProperty(value = "丢失单据")
@Column(name = "loss_file",columnDefinition = "TEXT")
private String lossFile;
/**
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelQueryController.java
浏览文件 @ 2fd58a22
......@@ -5,6 +5,7 @@ import com.tykj.dev.device.sendback.entity.vo.DeviceIdLIstVo;
import com.tykj.dev.device.sendback.entity.vo.ModelAndTypeVo;
import com.tykj.dev.device.sendback.entity.vo.RepelManagementVo;
import com.tykj.dev.device.sendback.entity.vo.SendBackOutFormVo;
import com.tykj.dev.device.sendback.service.AgainStorageBillService;
import com.tykj.dev.device.sendback.service.RepelQueryService;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.vo.TaskSelectVo;
......@@ -42,6 +43,9 @@ public class RepelQueryController {
@Autowired
TaskService taskService;
@Autowired
AgainStorageBillService againStorageBillService;
@Autowired
TaskUtils taskUtils;
......@@ -239,4 +243,13 @@ public class RepelQueryController {
public ResponseEntity clearedList4(@RequestBody RepelManagementVo repelManagementVo){
return ResponseEntity.ok(repelQueryService.retiredDeviceList(repelManagementVo));
}
/**
* 重新入库查询业务详情
*/
@PostMapping(value ="/againStorage/{taskId}")
@ApiOperation(value = "重新入库查询业务详情", notes = "重新入库查询业务详情")
public ResponseEntity findAgainStorage(@PathVariable Integer taskId){
return ResponseEntity.ok(againStorageBillService.findByid(taskId));
}
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/AgainStorageBill.java
浏览文件 @ 2fd58a22
package com.tykj.dev.device.sendback.entity.domain;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.misc.base.BaseEntity;
import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.Transient;
import java.util.List;
/**
* @author zjm
......@@ -20,6 +25,8 @@ import javax.persistence.EntityListeners;
*/
@Data
@Entity
@AllArgsConstructor
@NoArgsConstructor
@EntityListeners(AuditingEntityListener.class)
@ApiModel("重新入库业务")
public class AgainStorageBill extends BaseEntity {
......@@ -27,6 +34,9 @@ public class AgainStorageBill extends BaseEntity {
@Column(name = "dev_ids", columnDefinition = "TEXT")
private String DevIds;
@Transient
private List<DeviceLibrary> deviceLibraries;
public AgainStorageBill(String devIds) {
DevIds = devIds;
}
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/AgainStorageBillService.java
浏览文件 @ 2fd58a22
package com.tykj.dev.device.sendback.service;
import com.tykj.dev.device.sendback.entity.domain.AgainStorageBill;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import java.util.List;
......@@ -17,4 +18,6 @@ public interface AgainStorageBillService {
* @param ids 装备id
*/
void againPutInStorage(List<Integer> ids, SecurityUser securityUser);
AgainStorageBill findByid(Integer taskId);
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/AgainStorageBillServiceImpl.java
浏览文件 @ 2fd58a22
package com.tykj.dev.device.sendback.service.impl;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.domin.DeviceLog;
import com.tykj.dev.device.sendback.entity.domain.AgainStorageBill;
import com.tykj.dev.device.sendback.repository.AgainStorageBillDao;
import com.tykj.dev.device.sendback.service.AgainStorageBillService;
......@@ -16,7 +19,9 @@ import com.tykj.dev.device.user.subject.service.UserService;
import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.DeviceLifeStatus;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
......@@ -24,6 +29,8 @@ import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
......@@ -44,6 +51,9 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
@Autowired
TaskService taskService;
@Autowired
DeviceLogService deviceLogService;
@Autowired
MessageService messageService;
@Autowired
......@@ -59,6 +69,21 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
AgainStorageBill againStorageBill= againStorageBillDao.save(new AgainStorageBill(StringUtils.ListToString(ids)));
TaskBto taskBto=againStorageTask(securityUser.getCurrentUserInfo().getUnitsId(),againStorageBill.getId(),securityUser.getCurrentUserInfo().getUserId());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),securityUser.getUsername()+"发起了重新入库",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
devLogAdd(deviceLibraries,"重新入库",securityUser.getCurrentUserInfo().getUserId());
}
@Override
public AgainStorageBill findByid(Integer taskId) {
TaskBto taskBto=taskService.get(taskId);
Optional<AgainStorageBill> againStorageBillOptional = againStorageBillDao.findById(taskBto.getBillId());
if (againStorageBillOptional.isPresent()){
AgainStorageBill againStorageBill=againStorageBillOptional.get();
againStorageBill.setDeviceLibraries(deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(StringUtils.stringToList(againStorageBill.getDevIds())));
return againStorageBill;
}else {
throw new ApiException(ResponseEntity.status(500).body("[重新入库] 没有找到对应的bill-id"));
}
}
/**
......@@ -78,4 +103,23 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
private List<Integer> gainThisUser(Integer userId,Integer unitId){
return userService.findAllByUnite(unitId).stream().filter(user -> user.getUnitsId()!=userId).map(User::getUserId).collect(Collectors.toList());
}
/**
* 异步添加装备日志
* @param deviceLibraries
* @param remark
* @param userId
*/
public void devLogAdd(List<DeviceLibrary> deviceLibraries,String remark,Integer userId){
List<DeviceLog> logDtos=new ArrayList<>();
deviceLibraries.forEach(
deviceLibrary -> {
logDtos.add(new DeviceLogDto(deviceLibrary.getId(),remark,null,userId).toDo());
}
);
CompletableFuture.runAsync(() -> {
deviceLogService.saveAllLog(logDtos);
});
}
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ 2fd58a22
......@@ -261,6 +261,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), JacksonUtil.toJSon(modelCounts1), ""));
}
}else {
//添加本级清退任务
//后面和区县的一起提交给省
}
}
);
......@@ -346,6 +349,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
list.add(new RepelTaskStatistical(deviceRepel.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), model, ""));
}
}else {
//同上 缺失
}
}
);
......@@ -1011,8 +1016,23 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
messageService.add(messageBto);
}
/**
* 根据单位id查询用户 去除用户id
* @param userId
* @param unitId
* @return
*/
private List<Integer> gainThisUser(Integer userId,Integer unitId){
return userService.findAllByUnite(unitId).stream().filter(user -> user.getUnitsId()!=userId).map(User::getUserId).collect(Collectors.toList());
}
/**
* 根据单位id查询用户id集合
* @param unitId
* @return
*/
private List<Integer> findUnitId(Integer unitId){
return userService.findAllByUnite(unitId).stream().map(User::getUserId).collect(Collectors.toList());
}
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ 2fd58a22
......@@ -111,14 +111,6 @@ public class RepelQueryServiceImpl implements RepelQueryService {
int isNotSub = 1;
if (units.getLevel()==2) {
TaskBto taskBto = taskService.findFatherIdAndCustomInfo(taskId);
// DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskBto.getBillId());
// boolean flag= repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(),deviceRepelDetail.getRepelId()).stream().allMatch(e->e.getTaskStatus()==1);
// if (flag){
// TaskBto parentTask= taskService.get(taskBto.getParentTaskId());
// if (parentTask.getBillStatus()!= StatusEnum.END.id) {
// taskService.moveToSpecial(parentTask, StatusEnum.SEND_BACK_1212, 0);
// }
// }
if (!taskBto.getBillStatus().equals(StatusEnum.END.id)) {
isNotSub = 0;
}
......@@ -360,7 +352,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
private Specification<DeviceLibrary> getRetiredSpecification(RepelManagementVo repelManagementVo) {
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
predicateBuilder.in("lifeStatus", DeviceLifeStatus.REPEL.id);
predicateBuilder.eq("lifeStatus", DeviceLifeStatus.RETIRE.id);
return predicateBuilder.build();
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论