2024年1月31日11:30:52

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/controller/AnnualBudgetController.java

@@ -12,6 +12,8 @@ import org.springblade.box.tube.annualBudget.service.IAnnualBudgetService;
 import org.springblade.box.tube.entity.AnnualBudget;
 import org.springblade.box.tube.vo.AnnualBudgetVO;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.entity.StorageType;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -20,7 +22,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.stock.entity.StockGoods;
 import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,8 +43,7 @@ public class AnnualBudgetController extends BladeController {
 
 	private final IAnnualBudgetService annualBudgetService;
 
-	private final RedisTemplate<String, Object> redisTemplate;
-	private final IRedisClient redisClient;//redis缓存处理
+	private final IUserClient iUserClient;
 
 	/**
 	 * 详情
@@ -70,9 +73,8 @@ public class AnnualBudgetController extends BladeController {
 
 		IPage<AnnualBudget> page = annualBudgetService.page(Condition.getPage(query), lambdaQueryWrapper);
 
-		redisClient.basicData("all");
-		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-
+		//用户
+		List<User> userList = iUserClient.selectUserAll();
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().forEach(item -> {
 				if (item.getCreateUser() != null){

blade-service/blade-client/src/main/java/org/springblade/client/vehicle/controller/VehicleBrandController.java

@@ -26,11 +26,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
 import org.springblade.client.entity.VehicleBrand;
 import org.springblade.client.excel.VehicleBrandExcel;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.VehicleBrandVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -39,7 +39,9 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.stock.entity.StockGoods;
 import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.client.vehicle.service.IVehicleBrandService;
@@ -64,8 +66,7 @@ public class VehicleBrandController extends BladeController {
 
 	private final IVehicleBrandService vehicleBrandService;
 
-	private final IRedisClient redisClient;//redis缓存处理
-	private final RedisTemplate<String, Object> redisTemplate;
+	private final IUserClient iUserClient;
 
 	/**
 	 * 详情
@@ -92,21 +93,20 @@ public class VehicleBrandController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(vehicleBrand.getUpdateUser()), VehicleBrand::getUpdateUser, vehicleBrand.getUpdateUser());
 		IPage<VehicleBrand> pages = vehicleBrandService.page(Condition.getPage(query), lambdaQueryWrapper);
 
-		redisClient.basicData("all");
-		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-
-		if (CollectionUtils.isNotEmpty(pages.getRecords())){
-			pages.getRecords().stream().forEach(item ->{
-				if (item.getCreateUser() != null){
+		//用户
+		List<User> userList = iUserClient.selectUserAll();
+		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
+			pages.getRecords().stream().forEach(item -> {
+				if (item.getCreateUser() != null) {
 					User user = userList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().orElse(null);
-					if (ObjectUtil.isNotEmpty(user)){
+					if (ObjectUtil.isNotEmpty(user)) {
 						item.setCreateUserName(user.getName());
 					}
 				}
 
-				if (item.getUpdateUser() != null){
+				if (item.getUpdateUser() != null) {
 					User info = userList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().orElse(null);
-					if (ObjectUtil.isNotEmpty(info)){
+					if (ObjectUtil.isNotEmpty(info)) {
 						item.setUpdateUserName(info.getName());
 					}
 				}
@@ -177,12 +177,11 @@ public class VehicleBrandController extends BladeController {
 	public R importBrand(@RequestParam("file") MultipartFile file) {
 		//导入数据
 		List<VehicleBrandExcel> excelList = ExcelUtil.read(file, VehicleBrandExcel.class);
-		if(CollectionUtils.isEmpty(excelList))
-		{
+		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");
 		}
 
-		return vehicleBrandService.importBrand(excelList,false,file);
+		return vehicleBrandService.importBrand(excelList, false, file);
 	}
 
 	/**

blade-service/blade-client/src/main/java/org/springblade/client/vehicle/controller/VehicleModelController.java

@@ -26,10 +26,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
-import org.springblade.client.entity.VehicleModel;
-import org.springblade.client.entity.VehicleSeries;
+import org.springblade.client.entity.*;
 import org.springblade.client.excel.VehicleModelExcel;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.VehicleModelVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -38,7 +36,9 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.stock.entity.StockGoods;
 import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -66,8 +66,7 @@ import java.util.stream.Collectors;
 public class VehicleModelController extends BladeController {
 
 	private final IVehicleModelService vehicleModelService;
-	private final IRedisClient redisClient;//redis缓存处理
-	private final RedisTemplate<String, Object> redisTemplate;
+	private final IUserClient iUserClient;
 
 	/**
 	 * 详情
@@ -93,9 +92,9 @@ public class VehicleModelController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(vehicleModel.getUpdateUser()), VehicleModel::getUpdateUser, vehicleModel.getUpdateUser());
 		IPage<VehicleModel> pages = vehicleModelService.page(Condition.getPage(query), lambdaQueryWrapper);
 
-		redisClient.basicData("all");
-		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
 
+		//用户
+		List<User> userList = iUserClient.selectUserAll();
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
 				if (item.getCreateUser() != null){

blade-service/blade-client/src/main/java/org/springblade/client/vehicle/controller/VehicleSeriesController.java

@@ -24,13 +24,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
-import org.springblade.client.entity.VehicleBrand;
-import org.springblade.client.entity.VehicleModel;
-import org.springblade.client.entity.VehicleSeries;
+import org.springblade.client.entity.*;
 import org.springblade.client.excel.VehicleSeriesExcel;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.VehicleSeriesVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -39,7 +37,9 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.stock.entity.StockGoods;
 import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -64,8 +64,7 @@ import java.util.stream.Collectors;
 public class VehicleSeriesController extends BladeController {
 
 	private final IVehicleSeriesService vehicleSeriesService;
-	private final IRedisClient redisClient;//redis缓存处理
-	private final RedisTemplate<String, Object> redisTemplate;
+	private final IUserClient iUserClient;
 
 	/**
 	 * 详情
@@ -91,21 +90,20 @@ public class VehicleSeriesController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(vehicleSeries.getUpdateUser()), VehicleSeries::getUpdateUser, vehicleSeries.getUpdateUser());
 		IPage<VehicleSeries> pages = vehicleSeriesService.page(Condition.getPage(query), lambdaQueryWrapper);
 
-		redisClient.basicData("all");
-		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-
-		if (CollectionUtils.isNotEmpty(pages.getRecords())){
-			pages.getRecords().stream().forEach(item ->{
-				if (item.getCreateUser() != null){
+		//用户
+		List<User> userList = iUserClient.selectUserAll();
+		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
+			pages.getRecords().stream().forEach(item -> {
+				if (item.getCreateUser() != null) {
 					User user = userList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().orElse(null);
-					if (ObjectUtil.isNotEmpty(user)){
+					if (ObjectUtil.isNotEmpty(user)) {
 						item.setCreateUserName(user.getName());
 					}
 				}
 
-				if (item.getUpdateUser() != null){
+				if (item.getUpdateUser() != null) {
 					User info = userList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().orElse(null);
-					if (ObjectUtil.isNotEmpty(info)){
+					if (ObjectUtil.isNotEmpty(info)) {
 						item.setUpdateUserName(info.getName());
 					}
 				}
@@ -176,12 +174,11 @@ public class VehicleSeriesController extends BladeController {
 	public R importSeries(@RequestParam("file") MultipartFile file) {
 		//导入数据
 		List<VehicleSeriesExcel> excelList = ExcelUtil.read(file, VehicleSeriesExcel.class);
-		if(CollectionUtils.isEmpty(excelList))
-		{
+		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");
 		}
 
-		return vehicleSeriesService.importSeries(excelList,false,file);
+		return vehicleSeriesService.importSeries(excelList, false, file);
 	}
 
 	/**
@@ -198,7 +195,7 @@ public class VehicleSeriesController extends BladeController {
 
 		//根据厂商去重
 		List<VehicleSeries> manufacturerList = new ArrayList<>();
-		if (ObjectUtil.isNotEmpty(list)){
+		if (ObjectUtil.isNotEmpty(list)) {
 			manufacturerList = list.stream().collect(Collectors.collectingAndThen(
 				Collectors.toCollection(() -> new TreeSet<>(
 					Comparator.comparing(VehicleSeries::getManufacturerId))), ArrayList::new));
@@ -207,7 +204,7 @@ public class VehicleSeriesController extends BladeController {
 		List<Map<String, Object>> mapList = new ArrayList<>();
 
 		//根据厂商获得车系
-		if (ObjectUtil.isNotEmpty(manufacturerList)){
+		if (ObjectUtil.isNotEmpty(manufacturerList)) {
 			manufacturerList.forEach(series -> {
 				Map<String, Object> map = new HashMap<>();
 
@@ -217,7 +214,7 @@ public class VehicleSeriesController extends BladeController {
 					.eq(VehicleSeries::getManufacturerId, series.getManufacturerId());
 				List<VehicleSeries> seriesList = vehicleSeriesService.list(lambdaMap);
 
-				map.put("name",series.getManufacturerName());
+				map.put("name", series.getManufacturerName());
 				map.put(series.getManufacturerName(), seriesList);
 				mapList.add(map);
 			});

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -26,8 +26,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -63,9 +61,6 @@ public class SalaryController extends BladeController {
 
 	private final ISalaryService salaryService;
 	private final IUserClient userClient;
-	private final ISalaryItemService salaryItemService;
-	private final IRedisClient redisClient;//redis缓存处理
-	private final RedisTemplate<String, Object> redisTemplate;
 	/**
 	 * 详情
 	 */
@@ -91,8 +86,7 @@ public class SalaryController extends BladeController {
 		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByDesc(Salary::getMoon);
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), lambdaQueryWrapper);
 
-		redisClient.basicData("all");
-		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+		List<User> userList = userClient.selectUserAll();
 
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{