From 9d23fd9341dbba2053e32057d2974b9a69f28cd5 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Fri, 12 Sep 2025 19:23:46 +0800 Subject: [PATCH] 1 --- .../api/RemoteResidentPersonService.java | 22 ++++++++- .../RemoteResidentPersonServiceImpl.java | 37 ++++++++++++++- .../TbMeterRecordServiceImpl.java | 5 ++ .../controller/SisAuthRecordController.java | 47 +++++-------------- .../sis/service/ISisAuthRecordService.java | 21 +++------ .../impl/SisAuthRecordServiceImpl.java | 10 ++++ 6 files changed, 89 insertions(+), 53 deletions(-) diff --git a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteResidentPersonService.java b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteResidentPersonService.java index 0ab4d6f5..9e012304 100644 --- a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteResidentPersonService.java +++ b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteResidentPersonService.java @@ -13,10 +13,20 @@ import java.util.List; */ public interface RemoteResidentPersonService { - // 查询已上传图片，未授权人员 + /** + * 查询已上传图片，未授权人员 + * + * @return list + */ List queryUnAuthPerson(); - // 更新E8平台id + /** + * 更新e8平台Id + * + * @param personId 人员id + * @param e8Id e8平台Id + * @return Boolean + */ Boolean updateE8Id(Long personId, Long e8Id); /** @@ -27,4 +37,12 @@ public interface RemoteResidentPersonService { * @return 结果 */ LoginResidentPerson getResidentPersonInfo(String phone, String tenantId) throws ResidentPersonException; + + /** + * 根据入驻员工id,查询信息 + * + * @param personId 入驻员工id + * @return vo + */ + RemoteResidentPersonVo queryById(Long personId); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteResidentPersonServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteResidentPersonServiceImpl.java index f72452d2..e6b60a87 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteResidentPersonServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteResidentPersonServiceImpl.java @@ -27,7 +27,11 @@ public class RemoteResidentPersonServiceImpl implements RemoteResidentPersonServ private final IResidentPersonService residentPersonService; - // 查询已上传图片，未授权人员 + /** + * 查询已上传图片，未授权人员 + * + * @return list + */ @Override public List queryUnAuthPerson() { List listVo = residentPersonService.queryUnAuthPerson(); @@ -48,7 +52,13 @@ public class RemoteResidentPersonServiceImpl implements RemoteResidentPersonServ }).toList(); } - // 更新E8平台id + /** + * 更新e8平台Id + * + * @param personId 人员id + * @param e8Id e8平台Id + * @return Boolean + */ @Override public Boolean updateE8Id(Long personId, Long e8Id) { ResidentPersonBo bo = new ResidentPersonBo(); @@ -98,4 +108,27 @@ public class RemoteResidentPersonServiceImpl implements RemoteResidentPersonServ }); } + /** + * 根据入驻员工id,查询信息 + * + * @param personId 入驻员工id + * @return vo + */ + @Override + public RemoteResidentPersonVo queryById(Long personId) { + ResidentPersonVo vo = residentPersonService.queryById(personId); + if (vo != null) { + RemoteResidentPersonVo remoteResidentPersonVo = new RemoteResidentPersonVo(); + remoteResidentPersonVo.setId(vo.getId()); + remoteResidentPersonVo.setOssId(vo.getImg()); + remoteResidentPersonVo.setName(vo.getUserName()); + remoteResidentPersonVo.setGender(vo.getGender()); + remoteResidentPersonVo.setAuthBegDate(vo.getAuthBegDate()); + remoteResidentPersonVo.setAuthEndDate(vo.getAuthEndDate()); + remoteResidentPersonVo.setAuthGroupId(vo.getAuthGroupId()); + return remoteResidentPersonVo; + } + return null; + } + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java index 2adb353c..7d5011cd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java @@ -218,6 +218,11 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService { record.setPreviousReading(record.getCurrentReading()); } + // 如果上次抄表记录为0，则设置为当前读数 + if (record.getPreviousReading().compareTo(BigDecimal.ZERO) == 0) { + record.setPreviousReading(record.getCurrentReading()); + } + // 通信状态改为离线 TbMeterInfoBo bo = new TbMeterInfoBo(); bo.setId(info.getId()); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java index 65869781..5fd0fc90 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java @@ -7,14 +7,13 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.core.domain.TreeNode; +import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.web.core.BaseController; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.sis.domain.vo.SisAuthRecordVo; @@ -69,28 +68,6 @@ public class SisAuthRecordController extends BaseController { return R.ok(sisAuthRecordService.queryById(id)); } - /** - * 新增授权记录 - */ -// @SaCheckPermission("sis:authRecord:add") -// @Log(title = "人员库授权", businessType = BusinessType.INSERT) -// @RepeatSubmit() -// @PostMapping() -// public R add(@Validated(AddGroup.class) @RequestBody SisAuthRecordBo bo) { -// return toAjax(sisAuthRecordService.insertByBo(bo)); -// } - - /** - * 修改授权记录 - */ -// @SaCheckPermission("sis:authRecord:edit") -// @Log(title = "授权记录", businessType = BusinessType.UPDATE) -// @RepeatSubmit() -// @PutMapping() -// public R edit(@Validated(EditGroup.class) @RequestBody SisAuthRecordBo bo) { -// return toAjax(sisAuthRecordService.updateByBo(bo)); -// } - /** * 删除授权记录 * @@ -104,16 +81,6 @@ public class SisAuthRecordController extends BaseController { return toAjax(sisAuthRecordService.deleteWithValidByIds(List.of(ids), true)); } - /** - * 查询库id授权的设备 - * - * @param libId 人像库id - */ -// @GetMapping("/authDevice/{libId}") -// public R> queryAuthDevice(@PathVariable("libId") String libId) { -// return R.ok(sisAuthRecordService.queryAuthDevice(libId)); -// } - /** * 查询所有可授权设备 * @@ -123,4 +90,16 @@ public class SisAuthRecordController extends BaseController { public R>> tree() { return R.ok(sisAuthRecordService.authDeviceTree()); } + + /** + * 手动授权接口 + * + * @param personId 人员id + */ + @RepeatSubmit() + @GetMapping("/auth/{id}") + public R auth(@NotNull(message = "人员id不能为空") + @PathVariable("id") Long personId) { + return toAjax(sisAuthRecordService.manualAuth(personId)); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java index 5c7b032a..95e30171 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java @@ -68,21 +68,6 @@ public interface ISisAuthRecordService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - /** - * 查询库id授权的设备 - * - * @param libId 人像库id - * @return List - */ -// List queryAuthDevice(String libId); - - /** - * 根据人像库id删除授权记录 - * - * @param libId 人像库id - */ -// Boolean deleteByLibId(Long libId); - /** * 查询所有可授权设备树 * @@ -121,5 +106,11 @@ public interface ISisAuthRecordService { */ Boolean queryByGroupIds(Collection groupIds); + /** + * 手动授权 + * + * @param personId 人员id + */ + Boolean manualAuth(Long personId); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java index 1bf055bc..f49469de 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java @@ -394,4 +394,14 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService { List authVoList = baseMapper.selectVoList(lqw); return CollUtil.isNotEmpty(authVoList); } + + /** + * 手动授权 + * + * @param personId 人员id + */ + @Override + public Boolean manualAuth(Long personId) { + return false; + } }