Commit d8321e5b authored by 刘林's avatar 刘林

fix(jg):删除useInfo表中status等于待删除

parent d280341d
...@@ -364,10 +364,10 @@ public class DataHandlerController extends BaseController { ...@@ -364,10 +364,10 @@ public class DataHandlerController extends BaseController {
/** /**
* @return * @return
* @apiNote 删除不等于已认领的设备 * @apiNote 删除useInfo表中status等于待删除(手动修改为待删除)的设备
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "删除不等于已认领的设备", notes = "删除不等于已认领的设备") @ApiOperation(httpMethod = "PUT", value = "删除useInfo表中status等于待删除(手动修改为待删除)的设备", notes = "删除useInfo表中status等于待删除(手动修改为待删除)的设备")
@PutMapping(value = "/equip/deleteEquipIsNotClaimed") @PutMapping(value = "/equip/deleteEquipIsNotClaimed")
public ResponseModel<Integer> deleteEquip(@RequestParam(value = "useUnitCreditCode") String useUnitCreditCode, public ResponseModel<Integer> deleteEquip(@RequestParam(value = "useUnitCreditCode") String useUnitCreditCode,
@RequestParam(value = "equList") String equList, @RequestParam(value = "equList") String equList,
......
...@@ -2291,8 +2291,13 @@ public class DataHandlerServiceImpl { ...@@ -2291,8 +2291,13 @@ public class DataHandlerServiceImpl {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!records.isEmpty() && isDelete) { if (!records.isEmpty() && isDelete) {
superviseInfoMapper.deleteDataAll(records); int batchSize = 1000;
this.deleteFromEs(records); for (int i = 0; i < records.size(); i += batchSize) {
int end = Math.min(i + batchSize, records.size());
List<String> batch = records.subList(i, end);
superviseInfoMapper.deleteDataAll(batch);
deleteFromEs(batch);
}
} }
return records.size(); return records.size();
} }
......
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