|
@@ -20,10 +20,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import jakarta.annotation.Resource;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
|
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
|
|
|
import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
|
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
@@ -47,12 +50,15 @@ import java.util.List;
|
|
|
@Service
|
|
|
public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetRoom> implements TargetRoomService {
|
|
|
|
|
|
+ @Resource
|
|
|
+ private MonitorTargetService monitorTargetService;
|
|
|
+
|
|
|
@Override
|
|
|
public Page<TargetRoom> page(TargetRoomPageParam targetRoomPageParam) {
|
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
|
QueryWrapper<TargetRoom> queryWrapper = new QueryWrapper<TargetRoom>().checkSqlInjection();
|
|
|
- if(ObjectUtil.isNotEmpty(targetRoomPageParam.getRoomId())) {
|
|
|
- queryWrapper.lambda().like(TargetRoom::getName, targetRoomPageParam.getRoomId());
|
|
|
+ if(ObjectUtil.isNotEmpty(targetRoomPageParam.getName())) {
|
|
|
+ queryWrapper.lambda().like(TargetRoom::getName, targetRoomPageParam.getName());
|
|
|
}
|
|
|
queryWrapper.lambda().eq(TargetRoom::getCreateOrg, loginUser.getOrgId()).eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
if(ObjectUtil.isAllNotEmpty(targetRoomPageParam.getSortField(), targetRoomPageParam.getSortOrder())) {
|
|
@@ -84,6 +90,12 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public void delete(List<TargetRoomIdParam> targetRoomIdParamList) {
|
|
|
+ for (TargetRoomIdParam targetRoomIdParam : targetRoomIdParamList) {
|
|
|
+ List<MonitorTarget> targetListByRoom = monitorTargetService.getTargetListByRoom(targetRoomIdParam.getId());
|
|
|
+ if (!targetListByRoom.isEmpty()) {
|
|
|
+ throw new CommonException("该房间中存在冰箱,不可删除!");
|
|
|
+ }
|
|
|
+ }
|
|
|
// 执行删除
|
|
|
this.removeByIds(CollStreamUtil.toList(targetRoomIdParamList, TargetRoomIdParam::getId));
|
|
|
}
|
|
@@ -109,6 +121,10 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
|
|
|
queryWrapper.eq(TargetRoom::getCreateOrg,loginUser.getOrgId())
|
|
|
.eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
|
|
|
.orderByAsc(TargetRoom::getSortCode);
|
|
|
- return list(queryWrapper);
|
|
|
+ List<TargetRoom> list = list(queryWrapper);
|
|
|
+ list.forEach(targetRoom -> {
|
|
|
+ targetRoom.setRegionCount(monitorTargetService.getTargetCount(null,targetRoom.getId()).getTotal());
|
|
|
+ });
|
|
|
+ return list;
|
|
|
}
|
|
|
}
|