记录仪曲线设置根据设备编号批量新增入参修改

develop-QA
qinyulong 3 months ago
parent 4b416df9c6
commit 52648b80ee
  1. 24
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java
  2. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java
  3. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java
  4. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java

@ -0,0 +1,24 @@
package org.springblade.desk.device.pojo.request;
import lombok.Data;
import org.springblade.desk.device.pojo.entity.RecorderCompareEntity;
import java.util.List;
/**
* 记录仪曲线配置批量新增 - 保存请求参数
*
* @author qyl
*/
@Data
public class RecorderCompareSave {
/**
* 化验含量
*/
private String code;
/**
* 化验含量明细
*/
private List<RecorderCompareEntity> recorderCompareEntities;
}

@ -17,6 +17,7 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel;
import org.springblade.desk.device.pojo.request.RecorderCompareSave;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -121,9 +122,8 @@ public class RecorderCompareController extends BladeController {
@PostMapping("/submit-list") @PostMapping("/submit-list")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
@Operation(summary = "根据设备编号批量新增", description = "传入modelPrototype集合和设备编号") @Operation(summary = "根据设备编号批量新增", description = "传入modelPrototype集合和设备编号")
public R submitList(@Valid @RequestBody List<RecorderCompareEntity> recorderCompareEntities, public R submitList(@Valid @RequestBody RecorderCompareSave recorderCompareSave) {
@Parameter(description = "设备编号", required = true) @RequestParam String code) { return R.status(recorderCompareService.submitList(recorderCompareSave));
return R.status(recorderCompareService.submitList(recorderCompareEntities, code));
} }
/** /**
* 导出数据 * 导出数据

@ -28,7 +28,7 @@ package org.springblade.desk.device.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; import org.springblade.desk.device.pojo.entity.RecorderCompareEntity;
import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel;
import org.springblade.desk.device.pojo.vo.RecorderCompareVO; import org.springblade.desk.device.pojo.request.RecorderCompareSave;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseService;
@ -62,9 +62,8 @@ public interface IRecorderCompareService extends BaseService<RecorderCompareEnti
/** /**
* 根据设备编号批量新增 * 根据设备编号批量新增
* *
* @param recorderCompareEntities * @param recorderCompareSave
* @param code
* @return * @return
*/ */
Boolean submitList(List<RecorderCompareEntity> recorderCompareEntities, String code); Boolean submitList(RecorderCompareSave recorderCompareSave);
} }

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity;
import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; import org.springblade.desk.device.pojo.entity.RecorderCompareEntity;
import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel;
import org.springblade.desk.device.pojo.request.RecorderCompareSave;
import org.springblade.desk.device.pojo.vo.RecorderCompareVO; import org.springblade.desk.device.pojo.vo.RecorderCompareVO;
import org.springblade.desk.device.mapper.RecorderCompareMapper; import org.springblade.desk.device.mapper.RecorderCompareMapper;
import org.springblade.desk.device.service.IRecorderCompareService; import org.springblade.desk.device.service.IRecorderCompareService;
@ -52,11 +53,11 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl<RecorderCompareM
} }
@Override @Override
public Boolean submitList(List<RecorderCompareEntity> recorderCompareEntities, String code) { public Boolean submitList(RecorderCompareSave recorderCompareSave) {
recorderCompareEntities.forEach(recorderCompareEntity -> { recorderCompareSave.getRecorderCompareEntities().forEach(recorderCompareEntity -> {
recorderCompareEntity.setCode(code); recorderCompareEntity.setCode(recorderCompareSave.getCode());
}); });
return this.saveBatch(recorderCompareEntities); return this.saveBatch(recorderCompareSave.getRecorderCompareEntities());
} }
} }

Loading…
Cancel
Save