Commit 3b09a3e3 authored by liguofu@yeejoin.com's avatar liguofu@yeejoin.com

优化:空工大,设备附件上传时,附件会重复的问题

parent e82a5421
...@@ -162,7 +162,7 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -162,7 +162,7 @@ public class EquipmentDetailController extends AbstractBaseController {
* 根id查询 * 根id查询
* *
* **/ * **/
@RequestMapping(value = "equipment/{code}", method = RequestMethod.GET) @RequestMapping(value = "/equipment/{code}", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据二维码查询", notes = "根据二维码查询") @ApiOperation(httpMethod = "GET", value = "根据二维码查询", notes = "根据二维码查询")
public EquipmentDate selectByCode(HttpServletRequest request, @PathVariable String code) { public EquipmentDate selectByCode(HttpServletRequest request, @PathVariable String code) {
...@@ -229,7 +229,7 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -229,7 +229,7 @@ public class EquipmentDetailController extends AbstractBaseController {
* *
* 修改 * 修改
* **/ * **/
@RequestMapping(value = "equipment/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/equipment/updateById", method = RequestMethod.PUT)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改") @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) { public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
......
...@@ -90,6 +90,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -90,6 +90,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
item.setFileType(type); item.setFileType(type);
item.setObjectType(BillContentEnum.ZB.getKey()); item.setObjectType(BillContentEnum.ZB.getKey());
item.setObjectId(id); item.setObjectId(id);
item.setId(null);
}); });
return list; return list;
} }
...@@ -203,8 +204,14 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -203,8 +204,14 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
equipmentDetail.setCode(byId.getCode()); equipmentDetail.setCode(byId.getCode());
equipmentDetailMapper.updateById(equipmentDetail); equipmentDetailMapper.updateById(equipmentDetail);
//3.保存图片 //3.保存图片
iUploadFileService.remove(new QueryWrapper<UploadFile>().eq("object_type", BillContentEnum.ZB.getKey()) // TODO start 查询该设备所属分类下所有设备得附件资源【空工大】
.eq("object_id", equipmentDetail.getId())); List<EquipmentDetail> equipmentDetailList = equipmentDetailMapper.queryListByCode(equipmentDetail.getCode());
if(equipmentDetailList.size() > 0) {
List<Long> ids = equipmentDetailList.stream().map(EquipmentDetail::getId).collect(Collectors.toList());
iUploadFileService.remove(new QueryWrapper<UploadFile>().eq("object_type", BillContentEnum.ZB.getKey())
.in("object_id", ids));
}
// TODO end 查询该设备所属分类下所有设备得附件资源【空工大】
saveFile(equipmentDetail); saveFile(equipmentDetail);
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment