From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
index bb01472..ea3c954 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
@@ -17,21 +17,16 @@
 package org.springblade.modules.house.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.modules.house.dto.UserHouseLabelDTO;
-import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.vo.HouseLabelVO;
-import org.springblade.modules.house.mapper.UserHouseLabelMapper;
-import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.entity.HouseLabelEntity;
+import org.springblade.modules.house.vo.UserHouseLabelVO;
+import org.springblade.modules.house.mapper.HouseLabelMapper;
+import org.springblade.modules.house.service.IHouseLabelService;
 import org.springblade.modules.label.entity.LabelEntity;
 import org.springblade.modules.label.service.ILabelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.util.List;
 
 /**
  * 房屋-标签 服务实现类
@@ -40,13 +35,13 @@
  * @since 2023-10-28
  */
 @Service
-public class HouseLabelServiceImpl extends ServiceImpl<UserHouseLabelMapper, UserHouseLabelEntity> implements IUserHouseLabelService {
+public class HouseLabelServiceImpl extends ServiceImpl<HouseLabelMapper, HouseLabelEntity> implements IHouseLabelService {
 
 	@Autowired
 	private ILabelService labelService;
 
 	@Override
-	public IPage<HouseLabelVO> selectHouseLabelPage(IPage<HouseLabelVO> page, HouseLabelVO houseLabel) {
+	public IPage<UserHouseLabelVO> selectHouseLabelPage(IPage<UserHouseLabelVO> page, UserHouseLabelVO houseLabel) {
 		return page.setRecords(baseMapper.selectHouseLabelPage(page, houseLabel));
 	}
 
@@ -56,15 +51,15 @@
 	 * @return
 	 */
 	@Override
-	public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity houseLabel) {
+	public boolean saveOrUpdateHouseLabel(HouseLabelEntity houseLabel) {
 		// 查询标签名称
 		LabelEntity labelEntity = labelService.getById(houseLabel.getLabelId());
 		houseLabel.setLabelName(labelEntity.getLabelName());
 		// 判断同一个房屋同一个标签是否已存在,已存在则更新,不存在则新增
-		QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("house_code",houseLabel.getHouseCode())
-					.eq("label_id",houseLabel.getLabelId());
-		UserHouseLabelEntity one = getOne(queryWrapper);
+			.eq("label_id",houseLabel.getLabelId());
+		HouseLabelEntity one = getOne(queryWrapper);
 		if (null != one){
 			houseLabel.setId(one.getId());
 			// 更新
@@ -72,12 +67,5 @@
 		}
 		// 插入
 		return save(houseLabel);
-	}
-
-	@Override
-	public List<Integer> selectUserLabelList(UserHouseLabelDTO userHouseLabelDTO) {
-		userHouseLabelDTO.setUserId(AuthUtil.getUserId());
-		List<Integer> list = baseMapper.getUserLabelList(userHouseLabelDTO);
-		return list;
 	}
 }

--
Gitblit v1.9.3