|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
package jnpf.service.impl;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.mapper.RecycleBucketMapper;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
@ -26,6 +27,7 @@ import jnpf.model.QueryModel;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
@ -333,11 +335,18 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public void saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) throws Exception {
|
|
|
|
|
public String saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) {
|
|
|
|
|
recycleBucketForm = JsonUtil.getJsonToBean(
|
|
|
|
|
generaterSwapUtil.swapDatetime(RecycleBucketConstant.getFormData(), recycleBucketForm), RecycleBucketForm.class);
|
|
|
|
|
RecycleBucketEntity entity = JsonUtil.getJsonToBean(recycleBucketForm, RecycleBucketEntity.class);
|
|
|
|
|
|
|
|
|
|
//同一设备最多只能绑定俩回收桶
|
|
|
|
|
LambdaQueryWrapper<RecycleBucketEntity> wrapper = new LambdaQueryWrapper<>(RecycleBucketEntity.class)
|
|
|
|
|
.eq(RecycleBucketEntity::getDeviceCode, recycleBucketForm.getDeviceCode())
|
|
|
|
|
.isNull(RecycleBucketEntity::getDeleteMark);
|
|
|
|
|
List<RecycleBucketEntity> list = this.list(wrapper);
|
|
|
|
|
if (list.size() >= 2) {
|
|
|
|
|
return "该设备已存在两台回收桶!";
|
|
|
|
|
}
|
|
|
|
|
if (isSave) {
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
|
entity.setBucketCode(generaterSwapUtil.getBillNumber("bucketCode", false));
|
|
|
|
@ -345,8 +354,11 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
|
|
|
|
|
} else {
|
|
|
|
|
entity.setBucketCode(generaterSwapUtil.getBillNumber("bucketCode", false));
|
|
|
|
|
}
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
|
|
|
|
|
boolean back = this.saveOrUpdate(entity);
|
|
|
|
|
if (back) {
|
|
|
|
|
return "操作成功";
|
|
|
|
|
}
|
|
|
|
|
return "操作失败";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|