Skip to content

D
device-back
提交 909912bc authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

feat(装备模块,3D模块): 新增修改存放位置的接口

新增修改存放位置的接口
上级 56c6f4b7
隐藏空白字符变更
内嵌 并排
正在显示 包含 253 行增加 和 159 行删除
dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryPositionService.java
浏览文件 @ 909912bc
package com.tykj.dev.device.library.service;
import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
import java.util.List;
......@@ -43,4 +44,11 @@ public interface DeviceLibraryPositionService {
* @param deviceIds 装备id的集合
*/
void batchUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,List<Integer> deviceIds);
/**
* 条件查询
* @param queryTheWarehouseVo 条件查询类
* @return
*/
List<DeviceLibraryPosition> fnConditionQuery(QueryTheWarehouseVo queryTheWarehouseVo);
}
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryPositionServiceImpl.java
浏览文件 @ 909912bc
//package com.tykj.dev.device.library.service.impl;
//
//import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
//import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
//import com.tykj.dev.device.library.service.DeviceLibraryService;
//import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
//import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
//import com.tykj.dev.device.user.util.UserUtils;
//import lombok.val;
//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 UserUtils userUtils;
//
// @Autowired
// private DeviceLibraryService deviceLibraryService;
//
// @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 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) {
// DeviceLibraryPosition deviceLibraryPosition= findById(id);
// DeviceLibrary deviceLibrary = deviceLibraryService.getOne(deviceLibraryPosition.getDeviceId());
// deviceLibrary.setStorageLocation(null);
// deviceLibrary.setStorageLocationId(null);
// deviceLibraryPositionDao.delete(deviceLibraryPosition);
// deviceLibraryService.update(deviceLibrary);
// }
//}
package com.tykj.dev.device.library.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();
List<Integer> storageLocationIds = queryTheWarehouseVo.getStorageLocationIds();
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.in(queryTheWarehouseVo.getStorageLocationIds()!=null && !storageLocationIds.isEmpty(),
"storageLocationId",storageLocationIds.toArray(new Integer[]{}));
return predicateBuilder;
}
}
dev-library/src/main/java/com/tykj/dev/device/library/subject/model/vo/QueryTheWarehouseVo.java 0 → 100644
浏览文件 @ 909912bc
package com.tykj.dev.device.library.subject.model.vo;
import com.tykj.dev.misc.base.CustomPage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import java.util.List;
/**
* @author zsp
* @create 2021/12/30 13:05
*/
@Data
@ApiModel("装备3D查询类")
public class QueryTheWarehouseVo extends CustomPage {
@ApiModelProperty(value = "型号", example = "bmxx")
public String model;
@ApiModelProperty(value = "名称", example = "BM-1")
public String name;
// @ApiModelProperty(value = "存储位置Id")
// private Integer storageLocationId;
@ApiModelProperty(value = "装备序列号", example = "123-1")
public String seqNumber;
@ApiModelProperty(value = "库房ids")
private List<Integer> storageLocationIds;
}
dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/impl/DeviceLibraryPositionServiceImpl.java
浏览文件 @ 909912bc
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.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);
}
}
//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;
// }
//}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论