java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

增加批量查询用户信息的判断

dev
pref_mail@163.com 1 month ago
parent
15910f2446
commit
a8887072ca
4 changed files with 78 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
  2. 92
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
  3. 23
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java
  4. 23
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java

9
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
Unescape View File

@ -81,11 +81,14 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
List<BasicdataPriceTemplateVO> records = baseMapper.selectBasicdataPriceTemplatePage(page, basicdataPriceTemplate);
if (CollUtil.isNotEmpty(records)) {
List<Long> userIds = records.stream().map(BasicdataPriceTemplateVO::getCreateUser).collect(Collectors.toList());
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), userIds.stream().map(Object::toString).collect(Collectors.joining(",")));
Map<Long, String> names = new HashMap<>();
if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) {
names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName));
if(CollUtil.isNotEmpty(userIds)){
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA));
if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) {
names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName));
}
}
for (BasicdataPriceTemplateVO record : records) {
Long createUser = record.getCreateUser();
record.setUserName(names.get(createUser));

92
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
Unescape View File

@ -95,12 +95,10 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
private final BasicdataWarehouseMapper basicdataWarehouseMapper;
private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
private final IBasicPrintTemplateClient basicPrintTemplateClient;
private final IUserClient userClient;
private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
private final IBasicPrintTemplateClient basicPrintTemplateClient;
private final IUserClient userClient;
@Override
@ -123,21 +121,21 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
@Transactional
public boolean insertTray(BasicdataTrayDTO basicdataTrayDTO) {
//托盘新增需要添加托盘码
BasicdataTrayEntity basicdataTrayEntity =null;
BasicdataTrayEntity basicdataTrayEntity = null;
boolean result = false;
if (Func.isEmpty(basicdataTrayDTO)){
if (Func.isEmpty(basicdataTrayDTO)) {
log.warn("无参数");
return false;
}else {
} else {
Integer number = basicdataTrayDTO.getNumber();
//查询仓库编号
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseMapper.selectById(basicdataTrayDTO.getWarehouseId());
ArrayList<BasicdataTrayEntity> basicdataTrayEntities = new ArrayList<>();
for (Integer i = 0; i < number; i++) {
basicdataTrayEntity = new BasicdataTrayEntity();
BeanUtils.copyProperties(basicdataTrayDTO,basicdataTrayEntity);
BeanUtils.copyProperties(basicdataTrayDTO, basicdataTrayEntity);
//String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6");
String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),"465897");
String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS, basicdataWarehouseEntity.getWarehouseCode(), "465897");
// basicdataTrayEntity.setTrayStatus("1");
//String uuid = "1" + Func.random(18, RandomType.INT).trim();
//long id = Long.parseLong(uuid);
@ -161,7 +159,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
@Override
public IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page, Map<String, Object> basicdataTray) {
IPage<BasicdataTrayVO> trayList= trayMapper.selectTrayList(page,basicdataTray);
IPage<BasicdataTrayVO> trayList = trayMapper.selectTrayList(page, basicdataTray);
// for (int i = 0; i < trayList.getRecords().size(); i++) {
// if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){
// trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType()));
@ -172,67 +170,69 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
@Override
public IPage<WarehouseParcelListVO> getpackageList(IPage<WarehouseParcelListVO> page, BasicdataTrayDTO basicdataTray) {
List<WarehouseParcelListVO> list = trayMapper.selectPackageList(page,basicdataTray);
List<WarehouseParcelListVO> list = trayMapper.selectPackageList(page, basicdataTray);
return page.setRecords(list);
}
@Override
public IPage<WarehouseStockListVO> getinventoryList(IPage<WarehouseStockListVO> page, BasicdataTrayDTO basicdataTray) {
List<WarehouseStockListVO> list =trayMapper.selectInventoryList(page,basicdataTray);
List<WarehouseStockListVO> list = trayMapper.selectInventoryList(page, basicdataTray);
return page.setRecords(list);
}
@Override
public IPage<BasicdataStockArticleVO> getlclList(IPage<BasicdataStockArticleVO> page, BasicdataTrayDTO basicdataTray) {
IPage<BasicdataStockArticleVO> data = trayMapper.selectlclList(page,basicdataTray);
IPage<BasicdataStockArticleVO> data = trayMapper.selectlclList(page, basicdataTray);
List<BasicdataStockArticleVO> records = data.getRecords();
//获取所有的操作人ID
List<Long> operateUserIds = records.stream().map(BasicdataStockArticleVO::getOperateUser).collect(Collectors.toList());
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA));
List<User> listR = new ArrayList<>();
if (CollUtil.isEmpty(operateUserIds)) {
R<List<User>> temp = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA));
if (temp.isSuccess() && temp.getData() != null) {
listR.addAll(temp.getData());
}
}
for (BasicdataStockArticleVO record : records) {
if (listR.isSuccess() && listR.getData() != null) {
for (User datum : listR.getData()) {
if(datum.getId().equals(record.getOperateUser())){
record.setOperateUserName(datum.getRealName());
}
for (User datum : listR) {
if (datum.getId().equals(record.getOperateUser())) {
record.setOperateUserName(datum.getRealName());
}
}
}
}
return data;
}
@Override
public IPage<WarehouseParcelListVO> getpackageListhistory(IPage<WarehouseParcelListVO> page, BasicdataTrayDTO basicdataTray) {
List<WarehouseParcelListVO> list = trayMapper.selectPackageListhistory(page,basicdataTray);
List<WarehouseParcelListVO> list = trayMapper.selectPackageListhistory(page, basicdataTray);
return page.setRecords(list);
}
@Override
public IPage<WarehouseStockListVO> getinventoryListhistory(IPage<WarehouseStockListVO> page, BasicdataTrayDTO basicdataTray) {
List<WarehouseStockListVO> list = trayMapper.selectinventoryListhistory(page,basicdataTray);
List<WarehouseStockListVO> list = trayMapper.selectinventoryListhistory(page, basicdataTray);
return page.setRecords(list);
}
@Override
public IPage<BasicdataStockArticleVO> getlclListhistory(IPage<BasicdataStockArticleVO> page, BasicdataTrayDTO basicdataTray) {
List<BasicdataStockArticleVO> list = trayMapper.selectlclListhistory(page,basicdataTray);
List<BasicdataStockArticleVO> list = trayMapper.selectlclListhistory(page, basicdataTray);
return page.setRecords(list);
}
@Override
public Boolean vacantById(BasicdataTrayEntity basicdataTray,String remark) {
public Boolean vacantById(BasicdataTrayEntity basicdataTray, String remark) {
// //删除托盘货物绑定表
// Boolean aBoolean = warehouseTrayGoodsClient.removeByMasterId(basicdataTray.getId());
// //删除托盘打托方式表
// Boolean aBoolean1 = warehouseTrayTypeClient.removeByMasterId(basicdataTray.getId());
// log.info("删除托盘货物绑定表>>>>>>>>>>>>>>>>{}",aBoolean);
// log.info("删除托盘打托方式表>>>>>>>>>>>>>>>>{}",aBoolean1);
log.info("basicdataTray>>>>>>>>>>>>>>{}",basicdataTray.getPalletCode());
Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(),remark);
log.info("basicdataTray>>>>>>>>>>>>>>{}", basicdataTray.getPalletCode());
Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(), remark);
//修改托盘表状态
// boolean update = this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
// .eq(BasicdataTrayEntity::getId, basicdataTray.getId())
@ -240,6 +240,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
// );
return aBoolean;
}
@Override
public WarehouseTraybarCode printCode(List<Long> ids) throws Exception {
WarehouseTraybarCode warehouseTraybarCode = new WarehouseTraybarCode();
@ -251,7 +252,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
String html = TemplateUtil.getTemplateByUrl2(template.getTemplateUrl());
warehouseTraybarCode.setTemplateHtml(html);
warehouseTraybarCode.setTemplateId(template.getId());
if(ObjectUtils.isNull(ids)){
if (ObjectUtils.isNull(ids)) {
throw new ServiceException("参数错误");
}
//查询登录租户
@ -265,7 +266,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
map.put("palletName", trayQRCode.getPalletName());
String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode());
map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
map.put("tenant","汇通物流");
map.put("tenant", "汇通物流");
data.add(map);
}
warehouseTraybarCode.setDataList(data);
@ -279,7 +280,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
if (ObjectUtil.isEmpty(template)) {
throw new ServiceException("模板内容未找到");
}
if(ObjectUtils.isNull(ids)){
if (ObjectUtils.isNull(ids)) {
throw new ServiceException("参数错误");
}
//查询登录租户
@ -300,12 +301,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
String htmlTemplate = getTrayCodePdfTemplate();
List<WarehouseTrayQRCode> trayQRCodes = baseMapper.getTrayByIds(ids);
for (WarehouseTrayQRCode trayQRCode : trayQRCodes) {
// WarehouseTrayQRCode trayQRCode = baseMapper.getTray(id);
String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode());
String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode());
String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode());
String code = QRCodeUtil.getEmpAutograph(filename);
@ -338,7 +338,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
return IOUtils.toString(resourceAsStream, StandardCharsets.UTF_8);
} catch (IOException e) {
e.printStackTrace();
}finally {
} finally {
resourceAsStream.close();
}
}
@ -361,11 +361,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
// if (trayIdList.size()>0){
// continue;
// }
this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
.in(BasicdataTrayEntity::getId,longs)
.set(BasicdataTrayEntity::getDisableType,2)
.eq(BasicdataTrayEntity::getTrayStatus,1)
);
this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
.in(BasicdataTrayEntity::getId, longs)
.set(BasicdataTrayEntity::getDisableType, 2)
.eq(BasicdataTrayEntity::getTrayStatus, 1)
);
//List<BasicdataTrayEntity> list = this.list(new QueryWrapper<BasicdataTrayEntity>().lambda().in(BasicdataTrayEntity::getId, ids));
//}
return R.success("成功");
@ -373,7 +373,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
@Override
public R addable(String ids) {
this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
.in(BasicdataTrayEntity::getId, Func.toLongList(ids))
.set(BasicdataTrayEntity::getDisableType, 1)
);
@ -381,9 +381,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
}
@Override
public Boolean vacantBycodes(List<String> codes,String remark) {
public Boolean vacantBycodes(List<String> codes, String remark) {
for (String code : codes) {
Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code,remark);
Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code, remark);
}
return true;
}
@ -392,11 +392,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
public List<TrayPackageExcelVO> exportPackage(Long id) {
// List<WarehouseParcelListVO> list = trayMapper.selectPackageList(page,basicdataTray)
List<WarehouseParcelListVO> list = trayMapper.exportPackage(id);
List<WarehouseParcelListVO> list = trayMapper.exportPackage(id);
List<TrayPackageExcelVO> data = new ArrayList<>();
for (WarehouseParcelListVO warehouseParcelListVO : list) {
TrayPackageExcelVO trayPackageExcelVO = BeanUtil.copyProperties(warehouseParcelListVO, TrayPackageExcelVO.class);
trayPackageExcelVO.setFleeingName(0==warehouseParcelListVO.getIsFleeing()?"正常":"串货");
trayPackageExcelVO.setFleeingName(0 == warehouseParcelListVO.getIsFleeing() ? "正常" : "串货");
data.add(trayPackageExcelVO);
}
@ -408,7 +408,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
public List<TrayInventoryExcelVO> exportInventory(Long id) {
// List<WarehouseStockListVO> list =trayMapper.selectInventoryList(page,basicdataTray);
List<WarehouseStockListVO> list =trayMapper.exportInventory(id);
List<WarehouseStockListVO> list = trayMapper.exportInventory(id);
List<TrayInventoryExcelVO> data = new ArrayList<>();
for (WarehouseStockListVO warehouseStockListVO : list) {
TrayInventoryExcelVO trayInventoryExcelVO = BeanUtil.copyProperties(warehouseStockListVO, TrayInventoryExcelVO.class);

23
blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java
Unescape View File

@ -56,19 +56,22 @@ public class BillLoadingDetailsReader implements ExportReader {
userIds.add(detailsVO.getExamineUser());
}
}
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
List<User> data = listR.getData();
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
for (BillLoadingDetailsVO detailsVO : detailsPage) {
if (StrUtil.isNotEmpty(detailsVO.getScanUser())) {
detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser())));
}
if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) {
detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser())));
if(!userIds.isEmpty()){
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA));
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
List<User> data = listR.getData();
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
for (BillLoadingDetailsVO detailsVO : detailsPage) {
if (StrUtil.isNotEmpty(detailsVO.getScanUser())) {
detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser())));
}
if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) {
detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser())));
}
}
}
}
}
return detailsPage;
}

23
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java
Unescape View File

@ -117,20 +117,23 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
userIds.add(detailsVO.getExamineUser());
}
}
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
List<User> data = listR.getData();
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
for (BillLoadingDetailsVO detailsVO : detailsPage) {
if (StrUtil.isNotEmpty(detailsVO.getScanUser())) {
detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser())));
}
if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) {
detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser())));
if(!userIds.isEmpty()){
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA));
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
List<User> data = listR.getData();
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
for (BillLoadingDetailsVO detailsVO : detailsPage) {
if (StrUtil.isNotEmpty(detailsVO.getScanUser())) {
detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser())));
}
if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) {
detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser())));
}
}
}
}
}
return page.setRecords(detailsPage);
}

Write Preview
Loading…
Cancel
Save