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; package com.tykj.dev.device.library.service;
import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition; import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
import java.util.List; import java.util.List;
...@@ -43,4 +44,11 @@ public interface DeviceLibraryPositionService { ...@@ -43,4 +44,11 @@ public interface DeviceLibraryPositionService {
* @param deviceIds 装备id的集合 * @param deviceIds 装备id的集合
*/ */
void batchUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,List<Integer> deviceIds); 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; package com.tykj.dev.device.library.service.impl;
//
//import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao; import com.github.wenhao.jpa.PredicateBuilder;
//import com.tykj.dev.device.library.service.DeviceLibraryPositionService; import com.github.wenhao.jpa.Specifications;
//import com.tykj.dev.device.library.service.DeviceLibraryService; import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
//import com.tykj.dev.device.library.subject.domin.DeviceLibrary; import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
//import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition; import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
//import com.tykj.dev.device.user.util.UserUtils; import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
//import lombok.val; import com.tykj.dev.device.user.util.UserUtils;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
//
//import java.util.List; import java.util.List;
//import java.util.Optional; import java.util.Optional;
//
///** /**
// * @author zsp * @author zsp
// * @create 2021/12/13 16:23 * @create 2021/12/13 16:23
// */ */
//@Service @Service
//public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionService { public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionService {
//
// @Autowired @Autowired
// private UserUtils userUtils; private DeviceLibraryPositionDao deviceLibraryPositionDao;
//
// @Autowired @Override
// private DeviceLibraryService deviceLibraryService; public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
// deviceLibraryPositionDao.save(deviceLibraryPosition);
// @Autowired }
// private DeviceLibraryPositionDao deviceLibraryPositionDao;
// @Override
// @Override public void updateDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
// public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) { deviceLibraryPositionDao.save(deviceLibraryPosition);
// deviceLibraryPositionDao.save(deviceLibraryPosition); }
// }
// @Override
// @Override public void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions) {
// public void updateDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) { deviceLibraryPositionDao.saveAll(deviceLibraryPositions);
// deviceLibraryPositionDao.save(deviceLibraryPosition); }
// }
// @Override
// @Override public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) {
// public void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions) { return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId);
// deviceLibraryPositionDao.saveAll(deviceLibraryPositions);
// } }
//
// @Override @Override
// public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) { public List<DeviceLibraryPosition> findByStorageLocationIds(List<Integer> StorageLocationIds) {
// return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId); return deviceLibraryPositionDao.findAllByStorageLocationIdIn(StorageLocationIds);
// }
// }
// @Override
// @Override public DeviceLibraryPosition findById(Integer id) {
// public DeviceLibraryPosition findById(Integer id) { DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
// DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition(); Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id);
// Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id); if(positionDaoById.isPresent()){
// if(positionDaoById.isPresent()){ deviceLibraryPosition = positionDaoById.get();
// deviceLibraryPosition = positionDaoById.get(); }
// } return deviceLibraryPosition;
// return deviceLibraryPosition; }
// }
// @Override
// @Override public void deleteByPosition(Integer id) {
// public void deleteByPosition(Integer id) { deviceLibraryPositionDao.deleteById(id);
// DeviceLibraryPosition deviceLibraryPosition= findById(id); }
// DeviceLibrary deviceLibrary = deviceLibraryService.getOne(deviceLibraryPosition.getDeviceId());
// deviceLibrary.setStorageLocation(null); @Override
// deviceLibrary.setStorageLocationId(null); public DeviceLibraryPosition findByDeviceId(Integer deviceId) {
// deviceLibraryPositionDao.delete(deviceLibraryPosition); return deviceLibraryPositionDao.findByDeviceId(deviceId);
// deviceLibraryService.update(deviceLibrary); }
// }
//} @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; //package com.tykj.dev.readmachine.devreadmachine.service.impl;
//
import com.github.wenhao.jpa.PredicateBuilder; //import com.github.wenhao.jpa.PredicateBuilder;
import com.github.wenhao.jpa.Specifications; //import com.github.wenhao.jpa.Specifications;
import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao; //import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
import com.tykj.dev.device.library.service.DeviceLibraryPositionService; //import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition; //import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
import com.tykj.dev.device.user.util.UserUtils; //import com.tykj.dev.device.library.subject.model.vo.QueryTheWarehouseVo;
import org.springframework.beans.factory.annotation.Autowired; //import com.tykj.dev.device.user.util.UserUtils;
import org.springframework.stereotype.Service; //import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
import java.util.List; //
import java.util.Optional; //import java.util.List;
//import java.util.Optional;
/** //
* @author zsp ///**
* @create 2021/12/13 16:23 // * @author zsp
*/ // * @create 2021/12/13 16:23
@Service // */
public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionService { //@Service
//public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionService {
@Autowired //
private DeviceLibraryPositionDao deviceLibraryPositionDao; // @Autowired
// private DeviceLibraryPositionDao deviceLibraryPositionDao;
@Override //
public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) { // @Override
deviceLibraryPositionDao.save(deviceLibraryPosition); // public void addDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
} // deviceLibraryPositionDao.save(deviceLibraryPosition);
// }
@Override //
public void updateDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) { // @Override
deviceLibraryPositionDao.save(deviceLibraryPosition); // public void updateDeviceLibraryPosition(DeviceLibraryPosition deviceLibraryPosition) {
} // deviceLibraryPositionDao.save(deviceLibraryPosition);
// }
@Override //
public void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions) { // @Override
deviceLibraryPositionDao.saveAll(deviceLibraryPositions); // public void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions) {
} // deviceLibraryPositionDao.saveAll(deviceLibraryPositions);
// }
@Override //
public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) { // @Override
return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId); // public List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId) {
// return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId);
} //
// }
@Override //
public List<DeviceLibraryPosition> findByStorageLocationIds(List<Integer> StorageLocationIds) { // @Override
return deviceLibraryPositionDao.findAllByStorageLocationIdIn(StorageLocationIds); // public List<DeviceLibraryPosition> findByStorageLocationIds(List<Integer> StorageLocationIds) {
} // return deviceLibraryPositionDao.findAllByStorageLocationIdIn(StorageLocationIds);
// }
@Override //
public DeviceLibraryPosition findById(Integer id) { // @Override
DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition(); // public DeviceLibraryPosition findById(Integer id) {
Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id); // DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
if(positionDaoById.isPresent()){ // Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id);
deviceLibraryPosition = positionDaoById.get(); // if(positionDaoById.isPresent()){
} // deviceLibraryPosition = positionDaoById.get();
return deviceLibraryPosition; // }
} // return deviceLibraryPosition;
// }
@Override //
public void deleteByPosition(Integer id) { // @Override
deviceLibraryPositionDao.deleteById(id); // public void deleteByPosition(Integer id) {
} // deviceLibraryPositionDao.deleteById(id);
// }
@Override //
public DeviceLibraryPosition findByDeviceId(Integer deviceId) { // @Override
return deviceLibraryPositionDao.findByDeviceId(deviceId); // public DeviceLibraryPosition findByDeviceId(Integer deviceId) {
} // return deviceLibraryPositionDao.findByDeviceId(deviceId);
// }
@Override //
public DeviceLibraryPosition findByDeviceIds(List<Integer> deviceIds) { // @Override
return deviceLibraryPositionDao.findAllByDeviceIdIn(deviceIds); // public DeviceLibraryPosition findByDeviceIds(List<Integer> deviceIds) {
} // return deviceLibraryPositionDao.findAllByDeviceIdIn(deviceIds);
// }
@Override //
public void onlyUpdateStorageLocation(Integer StorageLocationId, String StorageLocation,Integer deviceId) { // @Override
if (findByDeviceId(deviceId)!=null){ // public void onlyUpdateStorageLocation(Integer StorageLocationId, String StorageLocation,Integer deviceId) {
deviceLibraryPositionDao.onlyUpdateStorageLocation(StorageLocationId,StorageLocation,deviceId); // if (findByDeviceId(deviceId)!=null){
} // deviceLibraryPositionDao.onlyUpdateStorageLocation(StorageLocationId,StorageLocation,deviceId);
} // }
// }
@Override //
public void batchUpdateStorageLocation(Integer StorageLocationId, String StorageLocation, List<Integer> deviceIds) { // @Override
deviceLibraryPositionDao.batchUpdateStorageLocation(StorageLocationId,StorageLocation,deviceIds); // 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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论