1.优化basicdata

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreContactController.java

@@ -102,11 +102,7 @@ public class BasicdataStoreContactController extends BladeController {
 		List<BasicdataStoreContactEntity> storeContactEntities = basicdataStoreContactService.list(Wrappers.<BasicdataStoreContactEntity>query().lambda()
 			.eq(BasicdataStoreContactEntity::getShopId, basicdataStoreContact.getShopId())
 		);
-		if(storeContactEntities.size() > 0){
-			basicdataStoreContact.setDefaultType(false);
-		}else{
-			basicdataStoreContact.setDefaultType(true);
-		}
+        basicdataStoreContact.setDefaultType(storeContactEntities.size() <= 0);
 		return R.status(basicdataStoreContactService.save(basicdataStoreContact));
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataOpenIncomingClient.java

@@ -18,10 +18,6 @@ public class BasicdataOpenIncomingClient implements IBasicdataOpenIncomingClient
 	@Override
 	public Boolean checkOpenIncoming(Long warehouseId, Long brandId) {
 		BasicdataOpenIncomingSettingEntity settingEntity = basicdataOpenIncomingSettingService.findEntityByParam(warehouseId,brandId);
-		if(Objects.isNull(settingEntity)){
-			return false;
-		}else{
-			return true;
-		}
+        return !Objects.isNull(settingEntity);
 	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -383,14 +383,12 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			log.info(">>>>>> basicdataClient.getClientCode() {}", basicdataClient.getClientCode());
 			//查询客户编码和客户名称是否存在
 			boolean b = basicdataClients.stream().anyMatch(ii -> {
-				if (ii.getClientCode() != null && !ii.getClientCode().equals("")) {
+				if (ii.getClientCode() != null && !ii.getClientCode().isEmpty()) {
 					log.info(">>>>>>>>>>>>> 1{}", ii.getClientCode());
 					log.info(">>>>>>>>>>>>> 2{}", ii.getClientName());
 
-					if (ii.getClientCode().equals(basicdataClient.getClientCode())
-						|| ii.getClientName().equals(basicdataClient.getClientName().trim())) {
-						return true;
-					}
+                    return ii.getClientCode().equals(basicdataClient.getClientCode())
+                            || ii.getClientName().equals(basicdataClient.getClientName().trim());
 				}
 				return false;
 			});

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -198,7 +198,6 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 	@Transactional(rollbackFor = Exception.class)
 	public void importDriverArtery(List<BasicdataDriverArteryImproterExcel> data) {
 		log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}", data);
-		outerLoop:
         for (BasicdataDriverArteryImproterExcel datum : data) {
 
             try {
@@ -214,8 +213,8 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                 if (!ObjectUtils.isEmpty(datum.getPhone())) {
                     String phone = datum.getPhone();
                     BasicdataDriverArteryEntity arteryEntity = baseMapper.findEntityByPhone(phone);
-					if(!Objects.isNull(arteryEntity)){
-						throw new ServiceException(phone+"手机号码已存在！");
+                    if (!Objects.isNull(arteryEntity)) {
+                        throw new ServiceException(phone + "手机号码已存在！");
                     }
 
                     R<User> userR = userClient.userInfoByPhone("627683", datum.getPhone());
@@ -257,11 +256,11 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                 List<JSONObject> warehouseList = new ArrayList<>();
                 if (!ObjectUtils.isEmpty(datum.getWarehouseName())) {
                     String warehouseNames = datum.getWarehouseName();
-					warehouseNames = warehouseNames.replaceAll("，",",");
+                    warehouseNames = warehouseNames.replaceAll("，", ",");
                     List<String> warehouseNameList = new ArrayList<>();
-					if(warehouseNames.contains(",")){
+                    if (warehouseNames.contains(",")) {
                         warehouseNameList = Arrays.asList(warehouseNames.split(","));
-					}else{
+                    } else {
                         warehouseNameList.add(warehouseNames);
                     }
 
@@ -272,8 +271,8 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                             throw new ServiceException("未找到仓库！");
                         } else {
                             JSONObject jsonObject = new JSONObject();
-							jsonObject.put("warehouseId",byName.getId());
-							jsonObject.put("warehouseName",wn);
+                            jsonObject.put("warehouseId", byName.getId());
+                            jsonObject.put("warehouseName", wn);
                             warehouseList.add(jsonObject);
                         }
                     }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java

@@ -411,7 +411,7 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl<BasicdataFreigh
 			if (StrUtil.isNotBlank(rowMessage.toString())) {
 				message.append("<p>");
 				message.append(firstMessage);
-				message.append(rowMessage.toString());
+				message.append(rowMessage);
 				message.append("</p>");
 				message.append("<br>");
 			}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -130,7 +130,6 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 			excelWriter.finish();
 		} catch (IOException var6) {
 			log.error("导出错误>>>>>>",var6);
-				return;
         }
 		//return warehouseGoodsAreaList;
 	}
@@ -387,7 +386,6 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 		} catch (IOException var6) {
 			log.error("导出错误>>>>>>",var6);
-			return;
         }
 		}else if (type ==2){
 			//sheetOne
@@ -440,7 +438,6 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 			} catch (IOException var6) {
 				log.error("导出错误>>>>>>",var6);
-				return;
             }
 
 		}else if (type ==3){
@@ -487,7 +484,6 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 			} catch (IOException var6) {
 				log.error("导出错误>>>>>>",var6);
-				return;
             }
 		}
 		//return warehouseGoodsAreaList;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -563,7 +563,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 						ArrayList<Long> longs = new ArrayList<>();
 						for (BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity : basicdataGoodsAllocationEntitiesDate) {
 							Long id = basicdataGoodsAllocationEntity.getId();
-							List<Long> longs1 = Arrays.asList(id);
+							List<Long> longs1 = Collections.singletonList(id);
 							//查询有无绑定货物
 							Integer integer = warehouseUpdownGoodsClient.selectCountByAllo(id.toString());
 							if (integer > 0) {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java

@@ -2888,7 +2888,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (StrUtil.isNotEmpty(rowMessage.toString())) {
 			message.append("<p>");
 			message.append(firstMessage);
-			message.append(rowMessage.toString());
+			message.append(rowMessage);
 			message.append("</p>");
 			message.append("<br>");
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -252,7 +252,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 							log.info(method+ "查询到司机信息，进行绑定！>>>:{}",driverArteryEntity.getPhone());
 							//绑定用户
 							basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
-							basicdataDrivermiddleEntity.setDriverId(driverArteryEntity.getId());;
+							basicdataDrivermiddleEntity.setDriverId(driverArteryEntity.getId());
                         }
 					}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/util/EasyExcelUtil.java

@@ -47,7 +47,7 @@ public class EasyExcelUtil {
 		if (builder == null) {
 			return null;
 		} else {
-			((ExcelReaderSheetBuilder) builder.sheet(sheetNo).headRowNumber(headRowNumber)).doRead();
+			builder.sheet(sheetNo).headRowNumber(headRowNumber).doRead();
 			return dataListener.getDataList();
 		}
 	}
@@ -57,7 +57,7 @@ public class EasyExcelUtil {
 		if (builder == null) {
 			return null;
 		} else {
-			((ExcelReaderSheetBuilder) builder.sheet(sheetNo).headRowNumber(headRowNumber)).registerConverter(new TrimConverter()).doRead();
+			builder.sheet(sheetNo).headRowNumber(headRowNumber).registerConverter(new TrimConverter()).doRead();
 			return dataListener.getDataList();
 		}
 	}