|
@@ -1,24 +1,33 @@
|
|
|
package org.dromara.backstage.consumption.service.impl;
|
|
package org.dromara.backstage.consumption.service.impl;
|
|
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
|
|
+import cn.hutool.core.map.MapUtil;
|
|
|
|
|
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
|
|
|
|
|
+import org.dromara.backstage.basics.service.IPtRoomService;
|
|
|
|
|
+import org.dromara.backstage.consumption.domain.bo.XfTermParamBo;
|
|
|
|
|
+import org.dromara.backstage.consumption.domain.vo.XfTermParamVo;
|
|
|
|
|
+import org.dromara.common.core.exception.ServiceException;
|
|
|
|
|
+import org.dromara.common.core.utils.MapstructUtils;
|
|
|
|
|
+import org.dromara.common.core.utils.StringUtils;
|
|
|
|
|
+import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
+import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.dromara.backstage.consumption.domain.XfTerm;
|
|
import org.dromara.backstage.consumption.domain.XfTerm;
|
|
|
import org.dromara.backstage.consumption.domain.bo.XfTermBo;
|
|
import org.dromara.backstage.consumption.domain.bo.XfTermBo;
|
|
|
import org.dromara.backstage.consumption.domain.vo.XfTermVo;
|
|
import org.dromara.backstage.consumption.domain.vo.XfTermVo;
|
|
|
import org.dromara.backstage.consumption.mapper.XfTermMapper;
|
|
import org.dromara.backstage.consumption.mapper.XfTermMapper;
|
|
|
import org.dromara.backstage.consumption.service.IXfTermService;
|
|
import org.dromara.backstage.consumption.service.IXfTermService;
|
|
|
-import org.dromara.common.core.utils.MapstructUtils;
|
|
|
|
|
-import org.dromara.common.core.utils.StringUtils;
|
|
|
|
|
-import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
|
|
-import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
-import java.util.Collection;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
+import java.util.Collection;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 消费设备Service业务层处理
|
|
* 消费设备Service业务层处理
|
|
@@ -32,6 +41,8 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
|
|
|
|
|
private final XfTermMapper baseMapper;
|
|
private final XfTermMapper baseMapper;
|
|
|
|
|
|
|
|
|
|
+ private final IPtRoomService roomService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询消费设备
|
|
* 查询消费设备
|
|
|
*
|
|
*
|
|
@@ -43,6 +54,14 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
return baseMapper.selectVoById(termId);
|
|
return baseMapper.selectVoById(termId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public XfTermParamVo queryById4Param(Long termId){
|
|
|
|
|
+ XfTerm xfTerm = baseMapper.selectById(termId);
|
|
|
|
|
+ if(xfTerm==null){
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
|
|
+ return MapstructUtils.convert(xfTerm, XfTermParamVo.class);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 分页查询消费设备列表
|
|
* 分页查询消费设备列表
|
|
|
*
|
|
*
|
|
@@ -53,6 +72,21 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<XfTermVo> queryPageList(XfTermBo bo, PageQuery pageQuery) {
|
|
public TableDataInfo<XfTermVo> queryPageList(XfTermBo bo, PageQuery pageQuery) {
|
|
|
QueryWrapper<XfTerm> lqw = buildQueryWrapper(bo,"t");
|
|
QueryWrapper<XfTerm> lqw = buildQueryWrapper(bo,"t");
|
|
|
|
|
+ Map<String, Object> params = bo.getParams();
|
|
|
|
|
+ Object roomId1 = params.get("roomId");
|
|
|
|
|
+ List<Long> roomIds = new ArrayList<>();
|
|
|
|
|
+ if(roomId1!=null){
|
|
|
|
|
+ Object type = params.get("type");
|
|
|
|
|
+ if(type!=null && type.toString().equals("area")){
|
|
|
|
|
+ List<PtRoomVo> ptRoomVos = roomService.queryRoomByAreaId(Long.parseLong(roomId1.toString()));
|
|
|
|
|
+ if(CollectionUtil.isNotEmpty(ptRoomVos)){
|
|
|
|
|
+ roomIds.addAll(ptRoomVos.stream().map(PtRoomVo::getRoomId).toList());
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
|
|
+ roomIds.add(Long.valueOf(roomId1.toString()));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ lqw.in(CollectionUtil.isNotEmpty(roomIds),"t.room_id", roomIds);
|
|
|
Page<XfTermVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
|
|
Page<XfTermVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
|
|
|
return TableDataInfo.build(result);
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
}
|
|
@@ -69,6 +103,20 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
return baseMapper.selectVoList(lqw);
|
|
return baseMapper.selectVoList(lqw);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public List<XfTermVo> queryListByIds(List<Long> ids){
|
|
|
|
|
+ LambdaQueryWrapper<XfTerm> lqw = Wrappers.lambdaQuery();
|
|
|
|
|
+ return baseMapper.selectVoList(lqw.in(XfTerm::getTermId, ids));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public Map<Long,XfTermVo> queryMapByIds(List<Long> ids){
|
|
|
|
|
+ List<XfTermVo> xfTermVos = queryListByIds(ids);
|
|
|
|
|
+ if(CollectionUtil.isNotEmpty(xfTermVos)){
|
|
|
|
|
+ return xfTermVos.stream().collect(Collectors.toMap(XfTermVo::getTermId, x -> x));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return MapUtil.empty();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private LambdaQueryWrapper<XfTerm> buildQueryWrapper(XfTermBo bo) {
|
|
private LambdaQueryWrapper<XfTerm> buildQueryWrapper(XfTermBo bo) {
|
|
|
Map<String, Object> params = bo.getParams();
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<XfTerm> lqw = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<XfTerm> lqw = Wrappers.lambdaQuery();
|
|
@@ -120,11 +168,23 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
return baseMapper.updateById(update) > 0;
|
|
return baseMapper.updateById(update) > 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public Boolean updateParamByBo(XfTermParamBo bo){
|
|
|
|
|
+ XfTerm update = MapstructUtils.convert(bo, XfTerm.class);
|
|
|
|
|
+ return baseMapper.updateById(update) > 0;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 保存前的数据校验
|
|
* 保存前的数据校验
|
|
|
*/
|
|
*/
|
|
|
- private void validEntityBeforeSave(XfTerm entity) {
|
|
|
|
|
- //TODO 做一些数据校验,如唯一约束
|
|
|
|
|
|
|
+ private void validEntityBeforeSave(XfTerm entity){
|
|
|
|
|
+ //设备机号和设备名称必须唯一
|
|
|
|
|
+ Long aLong = baseMapper.selectCount(Wrappers.<XfTerm>lambdaQuery()
|
|
|
|
|
+ .ne(entity.getTermId() != null,XfTerm::getTermId, entity.getTermId())
|
|
|
|
|
+ .and(queryWrapper -> queryWrapper.eq(XfTerm::getTermNo, entity.getTermNo()).or().eq(XfTerm::getTermName, entity.getTermName())
|
|
|
|
|
+ ));
|
|
|
|
|
+ if(aLong>0){
|
|
|
|
|
+ throw new ServiceException("设备机号重复");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -136,8 +196,8 @@ public class XfTermServiceImpl implements IXfTermService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
|
|
- if (isValid) {
|
|
|
|
|
- //TODO 做一些业务上的校验,判断是否需要校验
|
|
|
|
|
|
|
+ if(isValid){
|
|
|
|
|
+ //可以删除
|
|
|
}
|
|
}
|
|
|
return baseMapper.deleteByIds(ids) > 0;
|
|
return baseMapper.deleteByIds(ids) > 0;
|
|
|
}
|
|
}
|