1.博瑞科，设备管理接口调试及bug修改

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/device/controller/DeviceBaseinfoController.java

@@ -16,23 +16,28 @@
  */
 package org.springblade.salesPart.device.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 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.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.salesPart.device.entity.DeviceBaseinfo;
-import org.springblade.salesPart.device.vo.DeviceBaseinfoVO;
 import org.springblade.salesPart.device.service.IDeviceBaseinfoService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.salesPart.device.vo.DeviceBaseinfoVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 设备管理 控制器
@@ -66,7 +71,14 @@ public class DeviceBaseinfoController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入deviceBaseinfo")
 	public R<IPage<DeviceBaseinfo>> list(DeviceBaseinfo deviceBaseinfo, Query query) {
-		IPage<DeviceBaseinfo> pages = deviceBaseinfoService.page(Condition.getPage(query), Condition.getQueryWrapper(deviceBaseinfo));
+		LambdaQueryWrapper<DeviceBaseinfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(DeviceBaseinfo::getTenantId, AuthUtil.getTenantId())
+			.like(ObjectUtils.isNotNull(deviceBaseinfo.getDeviceName()), DeviceBaseinfo::getDeviceName, deviceBaseinfo.getDeviceName())
+			.like(ObjectUtils.isNotNull(deviceBaseinfo.getDeviceCode()), DeviceBaseinfo::getDeviceCode, deviceBaseinfo.getDeviceCode())
+			.eq(ObjectUtils.isNotNull(deviceBaseinfo.getDeviceStatus()), DeviceBaseinfo::getDeviceStatus, deviceBaseinfo.getDeviceStatus())
+			.eq(DeviceBaseinfo::getIsDeleted, 0)
+			.orderByDesc(DeviceBaseinfo::getCreateTime);
+		IPage<DeviceBaseinfo> pages = deviceBaseinfoService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 
@@ -97,8 +109,13 @@ public class DeviceBaseinfoController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入deviceBaseinfo")
-	public R update(@Valid @RequestBody DeviceBaseinfo deviceBaseinfo) {
-		return R.status(deviceBaseinfoService.updateById(deviceBaseinfo));
+	public R update(@Valid @RequestBody List<DeviceBaseinfo> deviceBaseinfo) {
+		for (DeviceBaseinfo item : deviceBaseinfo) {
+			item.setUpdateTime(new Date());
+			item.setUpdateUser(AuthUtil.getUserId());
+			item.setUpdateUserName(AuthUtil.getUserName());
+		}
+		return R.status(deviceBaseinfoService.updateBatchById(deviceBaseinfo));
 	}
 
 	/**
@@ -111,7 +128,7 @@ public class DeviceBaseinfoController extends BladeController {
 		return R.status(deviceBaseinfoService.saveOrUpdate(deviceBaseinfo));
 	}
 
-	
+
 	/**
 	 * 删除 设备管理
 	 */
@@ -122,5 +139,5 @@ public class DeviceBaseinfoController extends BladeController {
 		return R.status(deviceBaseinfoService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/device/controller/DeviceProductdataController.java

@@ -16,23 +16,26 @@
  */
 package org.springblade.salesPart.device.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 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.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.salesPart.device.entity.DeviceProductdata;
-import org.springblade.salesPart.device.vo.DeviceProductdataVO;
 import org.springblade.salesPart.device.service.IDeviceProductdataService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.salesPart.device.vo.DeviceProductdataVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 设备生产数据表 控制器
@@ -66,7 +69,16 @@ public class DeviceProductdataController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入deviceProductdata")
 	public R<IPage<DeviceProductdata>> list(DeviceProductdata deviceProductdata, Query query) {
-		IPage<DeviceProductdata> pages = deviceProductdataService.page(Condition.getPage(query), Condition.getQueryWrapper(deviceProductdata));
+		LambdaQueryWrapper<DeviceProductdata> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(DeviceProductdata::getDeviceCode, deviceProductdata.getDeviceCode())
+			.eq(DeviceProductdata::getTenantId, AuthUtil.getTenantId())
+			.like(ObjectUtils.isNotNull(deviceProductdata.getDeviceName()), DeviceProductdata::getDeviceName, deviceProductdata.getDeviceName())
+			.like(ObjectUtils.isNotNull(deviceProductdata.getTaskCode()), DeviceProductdata::getTaskCode, deviceProductdata.getTaskCode())
+			.gt(ObjectUtils.isNotNull(deviceProductdata.getStartTime()), DeviceProductdata::getStartTime, deviceProductdata.getStartTime())
+			.lt(ObjectUtils.isNotNull(deviceProductdata.getEndTime()), DeviceProductdata::getEndTime, deviceProductdata.getEndTime())
+			.eq(DeviceProductdata::getIsDeleted, 0)
+			.orderByDesc(DeviceProductdata::getCreateTime);
+		IPage<DeviceProductdata> pages = deviceProductdataService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 
@@ -111,7 +123,7 @@ public class DeviceProductdataController extends BladeController {
 		return R.status(deviceProductdataService.saveOrUpdate(deviceProductdata));
 	}
 
-	
+
 	/**
 	 * 删除 设备生产数据表
 	 */
@@ -122,5 +134,5 @@ public class DeviceProductdataController extends BladeController {
 		return R.status(deviceProductdataService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }