1

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<RemoteResidentPersonVo> queryUnAuthPerson() {
         List<ResidentPersonVo> 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;
+    }
+
 }

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());