Skip to content

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

fix(合并冲突): 合并冲突

解决冲突
上级 dc9c1495 b06c54bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 62 行删除
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ b41e119f
......@@ -2308,14 +2308,16 @@ public class RepairController {
repairDetails.forEach(repairDetail -> {
if (repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
repairDetail.setDeviceRepairBillId(0);
repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
repairDetailDao.save(repairDetail);
}else {
//下级
RepairDetail repairDetail1 = repairDetailDao.findById(repairDetail.getPid()).get();
repairDetail1.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
repairDetailDao.save(repairDetail1);
repairDetailDao.deleteById(repairDetail.getId());
}
repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
// if (repairDetail.getLocationUnit())
//
// repairDetail.setLocationUnit(repairDetail.getOwnUnit());
repairDetailDao.save(repairDetail);
});
//直接删除维修单
repairBillService.delete(repairBill.getId());
......@@ -2387,12 +2389,20 @@ public class RepairController {
List<RepairDetail> repairDetails = byRepairBackBillId.stream().filter(repairDetail -> repairDetail.getDeviceRepairBillId() != null && !repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()) && repairDetail.getRepairStatus().equals(RepairStatusEnum.RECEIVE_WAIT_STORAGE.id) && repairDetail.getLocationUnit().equals(currentUserUnitName))
.collect(Collectors.toList());
for (RepairDetail repairDetail : repairDetails) {
if (!repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
repairDetail.setRepairBackBillId(0);
}
repairDetail.setRepairStatus(2);
// repairDetail.setLocationUnit(repairDetail.getOwnUnit());
repairDetail.setRepairBackBillId(null);
repairDetail.setRepairStatus(RepairStatusEnum.REPAIRING.id);
repairDetailDao.save(repairDetail);
// if (repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
// repairDetail.setRepairBackBillId(null);
// repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
// repairDetailDao.save(repairDetail);
// }else {
// //下级
// RepairDetail repairDetail1 = repairDetailDao.findById(repairDetail.getPid()).get();
// repairDetail1.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
// repairDetailDao.save(repairDetail1);
// repairDetailDao.deleteById(repairDetail.getId());
// }
}
//删除账单
repairBackBillService.delete(repairBackBill.getId());
......
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java
浏览文件 @ b41e119f
......@@ -189,59 +189,9 @@ public class RepairDetailServiceImpl implements RepairDetailService {
}
}
);
// repairDetails.forEach(repairDetail -> {
// BillVo billVo = new BillVo();
// billVo.setRepairBillId(repairDetail.getDeviceRepairBillId());
// billVo.setDevicesId(repairDetail.getDeviceId());
// billVo.setRepairDetailId(repairDetail.getId());
// billVos.add(billVo);
// //根据装备id查询装备
// DeviceLibrary library = deviceLibraryService.getOne(repairDetail.getDeviceId());
// DeviceLibrary deviceLibrary = library.setConfigName();
// BeanUtils.copyProperties(deviceLibrary,billVo);
// //通过账单id和businessType查询task对象
// //过滤出状态是 StatusEnum.REVOKEALLOTTASK.id
// List<Task> taskList = taskService.findByBillIdAndBusinessType(repairDetail.getDeviceRepairBillId(), BusinessEnum.REPAIR.id);
// ClearTaskVo clearTaskVo = new ClearTaskVo();
// clearTaskVo.setTaskId(taskList.get(0).getId());
// clearTaskVo.setBusinessType(BusinessEnum.REPAIR.id);
// clearTaskVo.setBillVos(billVos);
// clearTaskVos.add(clearTaskVo);
// });
return map1;
}
// @Override
// public void setDevicesOwnUnit(List<SetDevicesOwnUnit> setDevicesOwnUnits) {
// //修改装备的所属以及备注
// //1 通过装备id修改装备的所属
// //1.2 获取装备的id
// List<Integer> deviceIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getDeviceId).collect(Collectors.toList());
// //修改装备的所属和装备的状态
// deviceLibraryService.updateDevicesOwnUnit(deviceIds);
// //修改维修单的remark
// List<Integer> repairBillIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairBillId).collect(Collectors.toList());
// //根据sendBill查询
//// List<RepairSendBill> repairBills = new ArrayList<>();
// String remark = "装备正在进行清退处理,维修任务终止";
// repairBillIds.forEach(integer -> {
// RepairSendBill sendBill = repairSendBillDao.findByDeviceRepairBillId(integer);
// String scriptJson = sendBill.getScriptJson();
// List<ScriptSaveVo> scriptSaveVos = JacksonUtil.readValueToList(scriptJson, ScriptSaveVo.class);
// for (ScriptSaveVo scriptSaveVo : scriptSaveVos) {
// scriptSaveVo.setRemark(remark);
// sendBill.setScriptJson(JacksonUtil.toJSon(scriptJson));
// repairSendBillDao.save(sendBill);
// }
// });
// List<Integer> repairDetailIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairDetailId).collect(Collectors.toList());
// //删除维修详情
// repairDetailIds.forEach(integer -> {
// deviceRepairDetailDao.deleteById(integer);
// });
//
// }
@Override
public void setDevicesOwnUnit(List<BillVo> billVos) {
//修改装备的所属以及备注
......
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java
浏览文件 @ b41e119f
......@@ -435,7 +435,7 @@ public class SelfCheckController {
}
@ApiOperation(value = "自查审核", notes = "可以通过这个接口自查审核")
@PatchMapping(value = "/selfExaminationConfirm")
@PostMapping(value = "/selfExaminationConfirm")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity selfExaminationConfirm(@RequestBody @Validated SelfCheckConfirmVo selfCheckConfirmVo) {
TaskBto taskBto = taskService.get(selfCheckConfirmVo.getTaskId());
......
dev-union/pom.xml
浏览文件 @ b41e119f
......@@ -54,6 +54,24 @@
<activatedProperties>prod</activatedProperties>
</properties>
</profile>
<!--生产环境正式-->
<profile>
<id>prodM</id>
<properties>
<pom.package>war</pom.package>
<activatedProperties>prodM</activatedProperties>
</properties>
</profile>
<!--生产环境测试-->
<profile>
<id>prodT</id>
<properties>
<pom.package>war</pom.package>
<activatedProperties>prodT</activatedProperties>
</properties>
</profile>
</profiles>
<dependencies>
......
dev-union/src/main/resources/application-prodM.properties 0 → 100644
浏览文件 @ b41e119f
spring.datasource.driver-class-name=com.oscar.Driver
spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
#spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB?useSSL=false&rewriteBatchedStatements=TRUE
spring.datasource.username=SYSDBA
spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equip/file/
#preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file
dev-union/src/main/resources/application-prodT.properties 0 → 100644
浏览文件 @ b41e119f
spring.datasource.driver-class-name=com.oscar.Driver
spring.datasource.url=jdbc:oscar://10.153.6.10:2003/OSRDB
spring.datasource.username=SYSDBA
spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equipTest/file/
spring.jmx.enabled=false
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论