by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(property):

Browse Source 
- TbMeterInfoServiceImpl 中模拟 token 上下文
 - resident服务分包
This commit is contained in:
zcxlsm
2025-09-06 14:26:44 +08:00
parent 0bf8cf45e8
commit 1e4eec8401
11 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ResidentPersonController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ResidentUnitController.java
View File

@@ -19,7 +19,7 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.residentVo.ResidentUnitVo;
import org.dromara.property.domain.bo.residentBo.ResidentUnitBo;
import org.dromara.property.service.IResidentUnitService;
import org.dromara.property.service.residentService.IResidentUnitService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/xcx/XResidentPersonController.java
View File

@@ -18,7 +18,7 @@ import org.dromara.common.web.core.BaseController;
import org.dromara.property.api.model.LoginResidentPerson;
import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

2
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteResidentPersonServiceImpl.java
View File

@@ -11,7 +11,7 @@ import org.dromara.property.api.model.LoginResidentPerson;
import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.common.core.exception.residentPerson.ResidentPersonException;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import java.util.List;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/listener/ResidentPersonImportListener.java
View File

@@ -19,8 +19,8 @@ import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonImportVo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.domain.vo.residentVo.ResidentUnitVo;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.IResidentUnitService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentUnitService;
import java.util.Date;
import java.util.List;

13
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/residentImpl/ResidentPersonServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.residentImpl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.BCrypt;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -13,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.vo.residentVo.ResidentUnitVo;
import org.dromara.property.service.IResidentUnitService;
import org.dromara.property.service.residentService.IResidentUnitService;
import org.dromara.sis.api.RemoteSisAuthService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -22,7 +23,7 @@ import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.domain.entity.resident.ResidentPerson;
import org.dromara.property.mapper.ResidentPersonMapper;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -147,7 +148,11 @@ public class ResidentPersonServiceImpl implements IResidentPersonService {
// 首次入驻新用户权限组默认使用公司权限
ResidentUnitVo ruVo = residentUnitService.queryById(bo.getUnitId());
// 密码加密，不存明文密码
add.setPassword(BCrypt.hashpw("123456"));
if (Objects.equals(add.getPassword(), "") || add.getPassword() == null){
add.setPassword(BCrypt.hashpw("123456"));
}else {
add.setPassword(BCrypt.hashpw(add.getPassword()));
}
//查询该单位下是否有管理员
new LambdaQueryWrapper<ResidentPerson>().eq(ResidentPerson::getUnitId, bo.getUnitId())
.eq(ResidentPerson::getUserRoles, 1);

6
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/residentImpl/ResidentUnitServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.residentImpl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.crypto.digest.BCrypt;
@@ -13,14 +13,14 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.entity.resident.ResidentPerson;
import org.dromara.property.mapper.ResidentPersonMapper;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.dromara.property.service.ITbRoomService;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.residentBo.ResidentUnitBo;
import org.dromara.property.domain.vo.residentVo.ResidentUnitVo;
import org.dromara.property.domain.entity.resident.ResidentUnit;
import org.dromara.property.mapper.ResidentUnitMapper;
import org.dromara.property.service.IResidentUnitService;
import org.dromara.property.service.residentService.IResidentUnitService;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;

9
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterInfoServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl.smartDevicesImpl;
import cn.dev33.satoken.context.mock.SaTokenContextMockUtil;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
@@ -335,7 +336,9 @@ public class TbMeterInfoServiceImpl implements ITbMeterInfoService {
private void handleMeterCommunicationFailure(LoginUser user, JSONObject jsonObject, List<TbMeterInfoVo> meterInfoVoList, String tokenValue) {
meterInfoVoList.forEach(item -> item.setCommunicationState(0L));
jsonObject.put("data", meterInfoVoList);
remoteMessageService.sendMessage(user.getUserId(), tokenValue, jsonObject.toString());
SaTokenContextMockUtil.setMockContext(() -> {
remoteMessageService.sendMessage(user.getUserId(), tokenValue, jsonObject.toString());
});
}
/**
@@ -377,6 +380,8 @@ public class TbMeterInfoServiceImpl implements ITbMeterInfoService {
}
jsonObject.put("data", meterInfoVoList);
remoteMessageService.sendMessage(user.getUserId(), tokenValue, jsonObject.toString());
SaTokenContextMockUtil.setMockContext(() -> {
remoteMessageService.sendMessage(user.getUserId(), tokenValue, jsonObject.toString());
});
}
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IResidentPersonService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/residentService/IResidentPersonService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service;
package org.dromara.property.service.residentService;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IResidentUnitService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/residentService/IResidentUnitService.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service;
package org.dromara.property.service.residentService;
import org.dromara.property.domain.vo.residentVo.ResidentUnitVo;
import org.dromara.property.domain.bo.residentBo.ResidentUnitBo;

2
ruoyi-modules/Property/src/main/java/org/dromara/property/utils/UploadFaceUtil.java
View File

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.property.domain.bo.residentBo.ResidentPersonBo;
import org.dromara.property.domain.vo.residentVo.ResidentPersonVo;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.residentService.IResidentPersonService;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.resource.api.domain.RemoteFile;
import org.springframework.stereotype.Service;