fix(合并): 解决master to dev的冲突

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryPositionController.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.library.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
+
 import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
 import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
 import io.swagger.annotations.Api;
@@ -11,6 +12,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/impl/DeviceLibraryPositionServiceImpl.java

-//package com.tykj.dev.readmachine.devreadmachine.service.impl;
-//
-//import com.github.wenhao.jpa.PredicateBuilder;
-//import com.github.wenhao.jpa.Specifications;
-//import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
-//import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
-//import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
-//import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
-//import com.tykj.dev.device.user.util.UserUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Optional;
-//
-///**
-// * @author zsp
-// * @create 2021/12/13 16:23
-// */
-//@Service
-//public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionService {
-//
-//    @Autowired
-//    private DeviceLibraryPositionDao deviceLibraryPositionDao;
-//
-//    @Override
-//    public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
-//        deviceLibraryPositionDao.save(deviceLibraryPosition);
-//    }
-//
-//    @Override
-//    public void updateDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
-//        deviceLibraryPositionDao.save(deviceLibraryPosition);
-//    }
-//
-//    @Override
-//    public void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions) {
-//        deviceLibraryPositionDao.saveAll(deviceLibraryPositions);
-//    }
-//
-//    @Override
-//    public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) {
-//        return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId);
-//
-//    }
-//
-//    @Override
-//    public List<DeviceLibraryPosition> findByStorageLocationIds(List<Integer> StorageLocationIds) {
-//        return deviceLibraryPositionDao.findAllByStorageLocationIdIn(StorageLocationIds);
-//    }
-//
-//    @Override
-//    public DeviceLibraryPosition findById(Integer id) {
-//        DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
-//        Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id);
-//        if(positionDaoById.isPresent()){
-//            deviceLibraryPosition = positionDaoById.get();
-//        }
-//        return deviceLibraryPosition;
-//    }
-//
-//    @Override
-//    public void deleteByPosition(Integer id) {
-//        deviceLibraryPositionDao.deleteById(id);
-//    }
-//
-//    @Override
-//    public DeviceLibraryPosition findByDeviceId(Integer deviceId) {
-//        return deviceLibraryPositionDao.findByDeviceId(deviceId);
-//    }
-//
-//    @Override
-//    public DeviceLibraryPosition findByDeviceIds(List<Integer> deviceIds) {
-//        return deviceLibraryPositionDao.findAllByDeviceIdIn(deviceIds);
-//    }
-//
-//    @Override
-//    public void onlyUpdateStorageLocation(Integer StorageLocationId, String StorageLocation,Integer deviceId) {
-//        if (findByDeviceId(deviceId)!=null){
-//            deviceLibraryPositionDao.onlyUpdateStorageLocation(StorageLocationId,StorageLocation,deviceId);
-//        }
-//    }
-//
-//    @Override
-//    public void batchUpdateStorageLocation(Integer StorageLocationId, String StorageLocation, List<Integer> deviceIds) {
-//        deviceLibraryPositionDao.batchUpdateStorageLocation(StorageLocationId,StorageLocation,deviceIds);
-//    }
-//
-//    @Override
-//    public List<DeviceLibraryPosition> fnConditionQuery(QueryTheWarehouseVo queryTheWarehouseVo) {
-//        PredicateBuilder<DeviceLibraryPosition> builder = createBuilder(queryTheWarehouseVo);
-//        return deviceLibraryPositionDao.findAll(builder.build());
-//    }
-//
-//    private PredicateBuilder<DeviceLibraryPosition> createBuilder(QueryTheWarehouseVo queryTheWarehouseVo){
-//        PredicateBuilder<DeviceLibraryPosition> predicateBuilder = Specifications.and();
-//        predicateBuilder.eq(queryTheWarehouseVo.getModel()!=null,"model",queryTheWarehouseVo.getModel());
-//        predicateBuilder.eq(queryTheWarehouseVo.getName()!=null,"name",queryTheWarehouseVo.getName());
-//        predicateBuilder.like(queryTheWarehouseVo.getSeqNumber()!=null,"seqNumber",
-//                "%"+queryTheWarehouseVo.getSeqNumber()+"%");
-//        predicateBuilder.eq(queryTheWarehouseVo.getStorageLocationId()!=null,"storageLocationId",
-//                queryTheWarehouseVo.getStorageLocationId());
-//        predicateBuilder.in(queryTheWarehouseVo.getStorageLocationIds()!=null,"")
-//        return predicateBuilder;
-//    }
-//}