Skip to content

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

[维修]提交

上级 cb773b03
隐藏空白字符变更
内嵌 并排
正在显示 包含 102 行增加 和 18 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ 215f4f7b
......@@ -256,7 +256,8 @@ public enum LogType {
RETRIEVE_4(9013,RETRIEVE.id,ORIGIN_STATUS.id,END.id,"省装备找回报告发起记录"),
RETRIEVE_5(9014,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1401.id,"发起装备找回上报"),
RETRIEVE_6(9015,RETRIEVE.id,RETRIEVE1401.id,END.id,"审核装备找回完成，查看找回结果"),
RETRIEVE_7(9016,RETRIEVE.id,RETRIEVE1402.id,END.id,"找回装备任务市审核不通过，任务结束"),
RETRIEVE_8(9017,RETRIEVE.id,RETRIEVE1403.id,END.id,"找回装备任务省审核不通过，任务结束"),
WORK_H1(79, WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),
WORK_H2(80, WORK_HANDOVER.id, WORKHANDOVER1011.id, END.id, "工作交接完成"),
......@@ -318,7 +319,9 @@ public enum LogType {
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_16(141,ALLOT_BACK.id, BACK_DRAFT.id, ALLOT_BACKING.id, "从草稿发起退回"),
ALLOT_BACK_17(142,ALLOT_BACK.id, ORIGIN_STATUS.id, BACK_DRAFT.id, "从草稿发起退回"),
;
public Integer id;
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ 215f4f7b
......@@ -589,12 +589,12 @@ public class DeviceCheckController {
// 获取所有在库装备与不在库装备
Map<String, List<DeviceLibrary>> devInLib = deviceRepo.findAll().stream()
.filter(device -> device.getOwnUnit().equals(device.getLocationUnit()))
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.collect(groupingBy(DeviceLibrary::getOwnUnit));
Map<String, List<DeviceLibrary>> devNotInLib = deviceRepo.findAll().stream()
.filter(device -> !device.getOwnUnit().equals(device.getLocationUnit()))
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.collect(groupingBy(DeviceLibrary::getOwnUnit));
......@@ -723,12 +723,12 @@ public class DeviceCheckController {
// 3 构建被查单位的 自查账单 与 自查任务
// 获取所有在库装备与不在库装备
Map<String, List<DeviceLibrary>> devInLib = deviceRepo.findAll().stream()
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.filter(device -> device.getOwnUnit().equals(device.getLocationUnit()))
.collect(groupingBy(DeviceLibrary::getOwnUnit));
Map<String, List<DeviceLibrary>> devNotInLib = deviceRepo.findAll().stream()
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.filter(device -> !device.getOwnUnit().equals(device.getLocationUnit()))
.collect(groupingBy(DeviceLibrary::getOwnUnit));
......@@ -1269,7 +1269,7 @@ public class DeviceCheckController {
.stream()
.filter(dev -> unitNameList.contains(dev.getOwnUnit()))
.filter(dev -> initUnitNames.contains(dev.getOwnUnit()))
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.map(transUtil::device2InitStatVo)
.collect(toList());
......@@ -1319,7 +1319,7 @@ public class DeviceCheckController {
List<CheckDeviceStatVo> cds = deviceRepo.findAll()
.stream()
.filter(dev -> unitNameList.contains(dev.getOwnUnit()))
.filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
// .filter(d->d.getLifeStatus() != 2 & d.getLifeStatus() != 14)
.map(transUtil::device2InitStatVo)
.collect(toList());
......
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ 215f4f7b
......@@ -842,6 +842,7 @@ public class JavaToPdfHtmlFreeMarker {
list.add(documentDevice1.toOneCount());
count.set(len-(pageCount-1)*784);
}else if (len==784){
documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber()));
list.add(documentDevice.toOneCount());
lists.add(list);
list = new ArrayList<>();
......@@ -862,6 +863,7 @@ public class JavaToPdfHtmlFreeMarker {
int yu = num % 56;
count.set(num + yu);
}else {
documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber()));
list.add(documentDevice.toOneCount());
lists.add(list);
list = new ArrayList<>();
......@@ -870,6 +872,7 @@ public class JavaToPdfHtmlFreeMarker {
}
}else {
documentDevice.setDeviceSerialNumber(toString(documentDevice.getDeviceSerialNumber()));
list.add(documentDevice.toOneCount());
int yu=len%56;
totle=totle+(56-yu);
......@@ -962,7 +965,7 @@ public class JavaToPdfHtmlFreeMarker {
count.set(totle);
}
}
if (list.size()==19){
if (list.size()==14){
lists.add(list);
list = new ArrayList<>();
count.set(0);
......
dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java
浏览文件 @ 215f4f7b
......@@ -152,6 +152,24 @@ public class DeviceLibraryController {
return ResultUtil.success(map);
}
@ApiOperation(value = "查询某单位检查装备列表", notes = "可以通过这个接口查询装备列表")
@GetMapping("/selectCheckDeviceListByUnit/{unitName}")
public ResponseEntity selectCheckDeviceListByUnit(@PathVariable("unitName") String unitName) {
String unit = unitName;
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
predicateBuilder.eq("ownUnit", unit);
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
deviceLibraries.forEach(DeviceLibrary::setConfigName);
List<DeviceLibrary> deviceLibraryEntities = deviceLibraries.stream()
.filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit)&&(deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==14))
.collect(Collectors.toList());
deviceLibraries.removeAll(deviceLibraryEntities);
Map<String,Object> map = new HashMap<>();
map.put("stockDevices",deviceLibraryEntities);
map.put("notInStockDevices",deviceLibraries);
return ResultUtil.success(map);
}
@ApiOperation(value = "模糊查询可配发的在库装备列表", notes = "可以通过这个接口查询可配发装备")
@PostMapping("/selectAllotDeviceList")
public ResponseEntity selectAllotDeviceList(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) {
......
dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/LossBillServiceImpl.java
浏览文件 @ 215f4f7b
......@@ -163,12 +163,13 @@ public class LossBillServiceImpl implements LossBillService {
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.RETRIEVE1401);
deviceLoss.setProvinceUnitName(units.getName());
deviceLoss.setProvinceDes(retrieveAuditvo.getDes());
taskService.moveToEnd(taskBto);
if (retrieveAuditvo.getType()==1){
taskService.moveToEnd(taskBto);
deviceLoss.setBackStatus(2);
deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.IN_LIBRARY.id,StringUtils.stringToList(deviceLoss.getDevIds()));
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"装备找回业务审核成功",gainThisUser(user.getUserId(),user.getUnitsId())));
}else {
taskService.moveToEnd(taskService.moveToSpecial(taskBto,StatusEnum.RETRIEVE1403));
User user1= userService.findByUser(taskBto.getCreateUserId());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"装备找回业务审核不通过",findUnitId(user1.getUnitsId())));
deviceLoss.setBackStatus(3);
......@@ -182,9 +183,8 @@ public class LossBillServiceImpl implements LossBillService {
taskBto.setOwnUnit(parentUnits.getUnitId());
taskService.moveToSpecial(taskBto,StatusEnum.RETRIEVE1401,0);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"装备找回业务审核成功",gainThisUser(user.getUserId(),user.getUnitsId())));
}else {
taskService.moveToEnd(taskBto);
taskService.moveToEnd(taskService.moveToSpecial(taskBto,StatusEnum.RETRIEVE1402));
deviceLoss.setBackStatus(3);
User user1= userService.findByUser(taskBto.getCreateUserId());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"装备找回业务审核不通过",findUnitId(user1.getUnitsId())));
......
dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java
浏览文件 @ 215f4f7b
......@@ -158,7 +158,7 @@ public class MatchingDeviceController {
}
@ApiOperation(value = "添加配套设备审核", notes = "可以通过这个接口添加配套设备审核")
@PostMapping(value = "/confirm")
@PostMapping(value = "/confirm")//不用了
@Transactional(rollbackFor = Exception.class)
public ResponseEntity confirm(@RequestBody @Validated MatchingDeviceBillConfirmVo matchingDeviceBillConfirmVo) {
TaskBto taskBto = taskService.get(matchingDeviceBillConfirmVo.getTaskId());
......
dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java
浏览文件 @ 215f4f7b
......@@ -94,10 +94,16 @@ public enum StatusEnum {
LOSS1301(1301,"丢失装备等待省审核"),
RETRIEVE1400(1400,"装备找回等待市审核"),
RETRIEVE1401(1401,"装备找回等待省审核"),
RETRIEVE1402(1402,"装备找回市审核不通过"),
RETRIEVE1403(1403,"装备找回省审核不通过"),
// SEND_BACK_1204(1204, "入库待审核"),
......
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java
浏览文件 @ 215f4f7b
......@@ -162,12 +162,14 @@ public class PackingController {
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity addPack(@RequestBody @Validated AddPack addPack){
//相同名称的同级列装
if (packingLibraryService.hasSamePack(addPack.getPartParentId(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange())) {
// if (packingLibraryService.nameIsExist(addPack.getModel(), addPack.getName())) {
// Map<String, Object> map = new HashMap<>();
// map.put("error", "型号" + addPack.getModel() + "下名称为" + addPack.getName() + "的装备已存在");
// return ResponseEntity.ok(map);
// }
//同级列装是否有同级范围的
Boolean matchingRangeIsExist = packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(), addPack.getMatchingRange(), addPack.getType(), addPack.getStyle(), addPack.getName(), addPack.getSecretLevel(), addPack.getInvisibleRange());
if (matchingRangeIsExist) {
Map<String, Object> map = new HashMap<>();
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 215f4f7b
......@@ -1271,9 +1271,11 @@ public class RepairController {
//获取维修详情单
RepairDetail repairDetail1 = deviceRepairDetailService.getOne(id);
if (repairDetail1.getDeviceRepairBillId()==0){
//已领取入库（本级）
repairDetail1.setRepairStatus(5);
deviceRepairDetailService.update(repairDetail1);
DeviceLibrary deviceLibrary = deviceLibraryService.getOne(repairDetail1.getDeviceId());
//在库
deviceLibrary.setLifeStatus(2);
deviceLibraryService.update(deviceLibrary);
//存装备日志
......@@ -1281,7 +1283,7 @@ public class RepairController {
deviceLogService.addLog(deviceLogDto);
}
else {
//获取旧状态
//获取旧状态 下级送来的
Integer oldStatus = repairDetail1.getRepairStatus();
if (repairStatusChangeVo.getNewStatus()==2&&repairDetail1.getOwnUnit().equals(userUtils.getCurrentUserUnitName())){
repairDetail1.setRepairStatus(5);
......@@ -1398,7 +1400,7 @@ public class RepairController {
}
//获取维修详情
List<RepairDetail> repairDetails = getRepairDetail(repairBill.getId());
repairDetails.forEach(repairDetail -> repairDetail.setLocationUnit(deviceLibraryMap.get(repairDetail.getDeviceId()).getLocationUnit()));
// repairDetails.forEach(repairDetail -> repairDetail.setLocationUnit(deviceLibraryMap.get(repairDetail.getDeviceId()).getLocationUnit()));
repairBillDetailVo.setRepairDetails(repairDetails);
//设置装备备注
deviceLibraries.forEach(deviceLibrary -> {
......@@ -1443,7 +1445,6 @@ public class RepairController {
if (repairBackBill.getScriptJson()!=null){
repairBackBill.setScripts(JacksonUtil.readValue(repairBackBill.getScriptJson(),new TypeReference<List<ScriptSaveVo>>() {}));
}
repairBillDetailVo.setRepairBackBill(repairBackBill);
if (repairBackBill.getStartUseraId() != null) {
repairBackBill.setStartUserA(userPublicService.getOne(repairBackBill.getStartUseraId()).getName());
}
......@@ -1454,6 +1455,7 @@ public class RepairController {
if (repairBackBill.getReceiveUserbId() != null) {
repairBackBill.setReceiveUserB(userPublicService.getOne(repairBackBill.getReceiveUserbId()).getName());
}
repairBillDetailVo.setRepairBackBill(repairBackBill);
List<DeviceLibrary> deviceLibraryList = new ArrayList<>();
List<DeviceLibrary> deviceLibraryList2 = new ArrayList<>();
String[] strings1;
......
dev-rfid/src/main/java/com/tykj/dev/rfid/controller/AccessController.java
浏览文件 @ 215f4f7b
......@@ -124,15 +124,39 @@ public class AccessController {
//
// }
// }
if (inPutCardIds.size()>0){
LibraryWarningLog libraryWarningLog = new LibraryWarningLog();
libraryWarningLog.setStatus("0");
libraryWarningLog.setWarningType(4);
libraryWarningLog.setWarningHandle(2);
libraryWarningLog.setInventoryResults("正常入库" + inPutCardIds.size() + "台");
LibraryWarningLog libraryWarningLog1 = libraryWarningLogService.addEntity(libraryWarningLog);
for (String outPutCardId : outPutCardIds) {
LibraryWarningLogDetail libraryWarningLogDetail = new LibraryWarningLogDetail();
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.getAllByRfidCardId(outPutCardId);
if (deviceLibraries.size()>0) {
DeviceLibrary d = deviceLibraries.get(0);
libraryWarningLogDetail.setDeviceId(d.getId());
libraryWarningLogDetail.setInventoryResults("正常入库");
libraryWarningLogDetail.setLibraryWarningLogId(libraryWarningLog1.getId());
libraryWarningLogDetail.setStatus(0);
libraryWarningLogDetailService.addEntity(libraryWarningLogDetail);
}
}
}
if (outPutCardIds.size()>0) {
//白名单出库装备
List<String> white = new ArrayList<>();
//如果实际出库的卡号在可以出库的卡号范围内
if (canOutputCardIds.containsAll(outPutCardIds)) {
white.addAll(outPutCardIds);
//设置实际出库的装备白名单为已读
inputOutputDeviceService.setRead(outputDevices.stream()
.filter(inputOutputDevice -> outPutCardIds.contains(inputOutputDevice.getRfidCardId()))
.collect(Collectors.toList()));
//成功出库不报警
log.info("出库"+outPutCardIds.size()+"件装备都在白名单不报警");
addWhiteOutPutLog(white);
return DataResult.success();
} else {
//获取可出库装备和当前出库装备交集
......@@ -141,6 +165,7 @@ public class AccessController {
inputOutputDeviceService.setRead(outputDevices.stream()
.filter(inputOutputDevice -> canOutputCardIds.contains(inputOutputDevice.getRfidCardId()))
.collect(Collectors.toList()));
white.addAll(outputDevices.stream().filter(inputOutputDevice -> canOutputCardIds.contains(inputOutputDevice.getRfidCardId())).map(InputOutputDevice::getRfidCardId).collect(Collectors.toList()));
//获取所有不在白名单的装备
outPutCardIds.removeAll(canOutputCardIds);
List<DeviceLibrary> deviceLibraries = new ArrayList<>();
......@@ -176,6 +201,7 @@ public class AccessController {
});
//出库异常报警
log.info(idList.size()+"件不在出库白名单的装备出库报警");
addWhiteOutPutLog(white);
return DataResult.failed();
}
//不在系统的rfid不报警
......@@ -216,7 +242,7 @@ public class AccessController {
}
/**
* 获取最近10s内出库异常的装备Id
* 获取最近2s内出库异常的装备Id
*/
private List<Integer> getLatestWarningDeviceIds(){
Long warningInterval = Long.valueOf(systemVariableService.getVaule("warningInterval"));
......@@ -226,4 +252,25 @@ public class AccessController {
return isOutPut&&isLatest;
}).map(LibraryWarningLogDetail::getDeviceId).collect(Collectors.toList());
}
private void addWhiteOutPutLog(List<String> white){
LibraryWarningLog warningLog = new LibraryWarningLog();
warningLog.setStatus("0");
warningLog.setWarningType(3);
warningLog.setWarningHandle(2);
warningLog.setInventoryResults("正常出库" + white.size() + "台");
LibraryWarningLog warningLog1 = libraryWarningLogService.addEntity(warningLog);
for (String outPutCardId : white) {
LibraryWarningLogDetail libraryWarningLogDetail = new LibraryWarningLogDetail();
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.getAllByRfidCardId(outPutCardId);
if (deviceLibraries.size()>0) {
DeviceLibrary d = deviceLibraries.get(0);
libraryWarningLogDetail.setDeviceId(d.getId());
libraryWarningLogDetail.setInventoryResults("正常出库");
libraryWarningLogDetail.setLibraryWarningLogId(warningLog1.getId());
libraryWarningLogDetail.setStatus(0);
libraryWarningLogDetailService.addEntity(libraryWarningLogDetail);
}
}
}
}
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/LibraryWarningLog.java
浏览文件 @ 215f4f7b
......@@ -47,7 +47,7 @@ public class LibraryWarningLog {
* /**
* 告警类型(0:入库异常,1:出库异常,2:盘点异常)
*/
@ApiModelProperty(value = "告警类型(0:入库异常,1:出库异常,2:盘点异常)")
@ApiModelProperty(value = "告警类型(0:入库异常,1:出库异常,2:盘点异常,3:出库正常,4入库正常)")
private Integer warningType;
/**
* 是否处理 0为否 1为是
......
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java
浏览文件 @ 215f4f7b
......@@ -176,11 +176,13 @@ public class SelfCheckController {
public ResponseEntity compare(@RequestBody CompareVo compareVo) {
Map<Integer,DeviceLibrary> deviceLibraryMap = deviceLibraryService.getAllDeviceMap();
CompareResultVo compareResultVo = new CompareResultVo();
//所有装备id的集合
List<Integer> list = compareVo.getDeivceIdList();
List<String> list1 = new ArrayList<>();
List<DeviceLibrary> deviceLibraryEntities = new ArrayList<>();
List<DeviceLibrary> newList = new ArrayList<>();
List<DeviceLibrary> resultList = new ArrayList<>();
//前端出
List<Integer> detailIds = compareVo.getDetailIdList();
for (int i = 0;i<list.size();i++) {
DeviceLibrary d = deviceLibraryMap.get(list.get(i));
......
dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java
浏览文件 @ 215f4f7b
......@@ -303,6 +303,7 @@ public class TaskController {
@ApiOperation(value = "任务日志", notes = "根据任务id查询任务日志")
@GetMapping("/taskLog/id")
public ResponseEntity getTasklog(Integer taskId){
List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskId);
Map<String, Object> map = new HashMap<>();
for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论