Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbLightInfoController.java

@@ -0,0 +1,116 @@
+package org.dromara.property.controller.smartDevicesController;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbLightInfoBo;
+import org.dromara.property.service.smartDevicesService.ITbLightInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 灯控开关信息
+ * 前端访问路由地址为:/property/lightInfo
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/lightInfo")
+public class TbLightInfoController extends BaseController {
+
+    private final ITbLightInfoService tbLightInfoService;
+
+    /**
+     * 查询灯控开关信息列表
+     */
+    @SaCheckPermission("property:lightInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<TbLightInfoVo> list(TbLightInfoBo bo, PageQuery pageQuery) {
+        return tbLightInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出灯控开关信息列表
+     */
+    @SaCheckPermission("property:lightInfo:export")
+    @Log(title = "灯控开关信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TbLightInfoBo bo, HttpServletResponse response) {
+        List<TbLightInfoVo> list = tbLightInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "灯控开关信息", TbLightInfoVo.class, response);
+    }
+
+    /**
+     * 获取灯控开关信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("property:lightInfo:query")
+    @GetMapping("/{id}")
+    public R<TbLightInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                    @PathVariable("id") Long id) {
+        return R.ok(tbLightInfoService.queryById(id));
+    }
+
+    /**
+     * 新增灯控开关信息
+     */
+    @SaCheckPermission("property:lightInfo:add")
+    @Log(title = "灯控开关信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改灯控开关信息
+     */
+    @SaCheckPermission("property:lightInfo:edit")
+    @Log(title = "灯控开关信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除灯控开关信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("property:lightInfo:remove")
+    @Log(title = "灯控开关信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(tbLightInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 灯开关控制
+     *
+     * @param bo bean
+     */
+    @PostMapping("/switch")
+    public R<Void> switchSingleLight(@RequestBody TbLightInfoBo bo) {
+        return toAjax(tbLightInfoService.switchSingleLight(bo));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterConfigController.java

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.TbMeterConfigVo;
-import org.dromara.property.domain.bo.TbMeterConfigBo;
-import org.dromara.property.service.ITbMeterConfigService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterConfigBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterConfigService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterInfoController.java

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.TbMeterInfoVo;
-import org.dromara.property.domain.bo.TbMeterInfoBo;
-import org.dromara.property.service.ITbMeterInfoService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterInfoService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.TbMeterRecordVo;
-import org.dromara.property.domain.bo.TbMeterRecordBo;
-import org.dromara.property.service.ITbMeterRecordService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterRecordService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRoomController.java

@@ -1,4 +1,4 @@
-package org.dromara.property.controller;
+package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.property.domain.vo.TbMeterRoomVo;
-import org.dromara.property.domain.bo.TbMeterRoomBo;
-import org.dromara.property.service.ITbMeterRoomService;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRoomBo;
+import org.dromara.property.service.smartDevicesService.ITbMeterRoomService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbLightInfo.java

@@ -0,0 +1,66 @@
+package org.dromara.property.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 灯控开关信息对象 tb_light_info
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tb_light_info")
+public class TbLightInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 位置描述
+     */
+    private String locationRemark;
+
+    /**
+     * 开关状态（0：关，1：开）
+     */
+    private Boolean isOn;
+
+    /**
+     * 灯控模块编码
+     */
+    private Long code;
+
+    /**
+     * 园区编码
+     */
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    private Long unitId;
+
+    /**
+     * 所属楼层ID
+     */
+    private Long floorId;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java

@@ -0,0 +1,68 @@
+package org.dromara.property.domain.bo.smartDevicesBo;
+
+import org.dromara.property.domain.TbLightInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 灯控开关信息业务对象 tb_light_info
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TbLightInfo.class, reverseConvertGenerate = false)
+public class TbLightInfoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 位置描述
+     */
+    @NotBlank(message = "位置描述不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String locationRemark;
+
+    /**
+     * 开关状态（0：关，1：开）
+     */
+    @NotNull(message = "开关状态（0：关，1：开）不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Boolean isOn;
+
+    /**
+     * 灯控模块编码
+     */
+    @NotNull(message = "灯控模块编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long code;
+
+    /**
+     * 楼层ID
+     */
+    @NotNull(message = "层ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long floorId;
+
+    /**
+     * 园区编码
+     */
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    private Long unitId;
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterConfigBo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.bo;
+package org.dromara.property.domain.bo.smartDevicesBo;
 
 import org.dromara.property.domain.TbMeterConfig;
 import org.dromara.common.mybatis.core.domain.BaseEntity;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.bo;
+package org.dromara.property.domain.bo.smartDevicesBo;
 
 import org.dromara.property.domain.TbMeterInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.bo;
+package org.dromara.property.domain.bo.smartDevicesBo;
 
 import org.dromara.property.domain.TbMeterRecord;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 抄记录业务对象 tb_meter_record

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRoomBo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.bo;
+package org.dromara.property.domain.bo.smartDevicesBo;
 
 import org.dromara.property.domain.TbMeterRoom;
 import org.dromara.common.mybatis.core.domain.BaseEntity;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/ActivitiesStatusEnum.java

@@ -0,0 +1,41 @@
+package org.dromara.property.domain.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/4 10:35
+ * @Description:活动状态枚举
+ **/
+@Getter
+public enum ActivitiesStatusEnum {
+    /**
+     * 未开始
+     */
+    NOTSTARTED("未开始", "1"),
+    /**
+     * 待提货
+     */
+    INPROGRESS("待提货", "2"),
+    /**
+     * 已结束
+     */
+    HASENDED("已结束", "3");
+
+
+    private final String name;
+    private final String value;
+
+    ActivitiesStatusEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbLightInfoVo.java

@@ -0,0 +1,87 @@
+package org.dromara.property.domain.vo.smartDevicesVo;
+
+import org.dromara.property.domain.TbLightInfo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 灯控开关信息视图对象 tb_light_info
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TbLightInfo.class)
+public class TbLightInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 位置描述
+     */
+    @ExcelProperty(value = "位置描述")
+    private String locationRemark;
+
+    /**
+     * 开关状态（0：关，1：开）
+     */
+    @ExcelProperty(value = "开关状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=：关，1：开")
+    private Boolean isOn;
+
+    /**
+     * 灯控模块编码
+     */
+    @ExcelProperty(value = "灯控模块编码")
+    private Long code;
+
+    /**
+     * 园区编码
+     */
+    @ExcelProperty(value = "园区编码")
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    @ExcelProperty(value = "建筑名称")
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    @ExcelProperty(value = "单元编码")
+    private Long unitId;
+
+    /**
+     * 楼层ID
+     */
+    @ExcelProperty(value = "楼层ID")
+    private Long floorId;
+
+    /**
+     * 楼层
+     */
+    @ExcelProperty(value = "楼层")
+    private String floorName;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterConfigVo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.vo;
+package org.dromara.property.domain.vo.smartDevicesVo;
 
 import org.dromara.property.domain.TbMeterConfig;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.vo;
+package org.dromara.property.domain.vo.smartDevicesVo;
 
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java

@@ -1,19 +1,15 @@
-package org.dromara.property.domain.vo;
+package org.dromara.property.domain.vo.smartDevicesVo;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import org.dromara.property.domain.TbMeterRecord;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRoomVo.java

@@ -1,4 +1,4 @@
-package org.dromara.property.domain.vo;
+package org.dromara.property.domain.vo.smartDevicesVo;
 
 import org.dromara.property.domain.TbMeterRoom;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbLightInfoMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.property.mapper.smartDevicesMapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.property.domain.TbLightInfo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 灯控开关信息Mapper接口
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Mapper
+public interface TbLightInfoMapper extends BaseMapperPlus<TbLightInfo, TbLightInfoVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterConfigMapper.java

@@ -1,8 +1,8 @@
-package org.dromara.property.mapper;
+package org.dromara.property.mapper.smartDevicesMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.TbMeterConfig;
-import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java

@@ -1,7 +1,7 @@
-package org.dromara.property.mapper;
+package org.dromara.property.mapper.smartDevicesMapper;
 
 import org.dromara.property.domain.TbMeterInfo;
-import org.dromara.property.domain.vo.TbMeterInfoVo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java

@@ -1,7 +1,7 @@
-package org.dromara.property.mapper;
+package org.dromara.property.mapper.smartDevicesMapper;
 
 import org.dromara.property.domain.TbMeterRecord;
-import org.dromara.property.domain.vo.TbMeterRecordVo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRoomMapper.java

@@ -1,8 +1,8 @@
-package org.dromara.property.mapper;
+package org.dromara.property.mapper.smartDevicesMapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.TbMeterRoom;
-import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.enums.ActivitiesStatusEnum;
 import org.dromara.property.domain.vo.CustomerNoticesVo;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
@@ -21,11 +22,9 @@ import org.dromara.property.domain.vo.PopularActivitiesVo;
 import org.dromara.property.domain.PopularActivities;
 import org.dromara.property.mapper.PopularActivitiesMapper;
 import org.dromara.property.service.IPopularActivitiesService;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 import java.util.logging.Handler;
 import java.util.stream.Collectors;
 
@@ -130,6 +129,7 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService {
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(PopularActivitiesBo bo) {
         PopularActivities add = MapstructUtils.convert(bo, PopularActivities.class);
         validEntityBeforeSave(add);
@@ -147,9 +147,10 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService {
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(PopularActivitiesBo bo) {
         PopularActivities update = MapstructUtils.convert(bo, PopularActivities.class);
-        validEntityBeforeSave(update);
+        validEntityBeforeUpdate(update);
         return baseMapper.updateById(update) > 0;
     }
 
@@ -157,6 +158,18 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService {
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(PopularActivities entity) {
+        //TODO拿当前时间和开始时间和结束时间做对比修改状态
+        Date now = new Date();
+        entity.setStatus(
+            now.before(entity.getStartTime()) ? ActivitiesStatusEnum.NOTSTARTED.getValue() :
+                now.after(entity.getEndTime()) ? ActivitiesStatusEnum.HASENDED.getValue() : ActivitiesStatusEnum.INPROGRESS.getValue()
+        );
+    }
+
+    /**
+     * 修改前的数据校验
+     */
+    private void validEntityBeforeUpdate(PopularActivities entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbLightInfoServiceImpl.java

@@ -0,0 +1,160 @@
+package org.dromara.property.service.impl.smartDevicesImpl;
+
+import cn.hutool.core.lang.Assert;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.vo.TbFloorVo;
+import org.dromara.property.service.ITbFloorService;
+import org.springframework.stereotype.Service;
+import org.dromara.property.domain.bo.smartDevicesBo.TbLightInfoBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo;
+import org.dromara.property.domain.TbLightInfo;
+import org.dromara.property.mapper.smartDevicesMapper.TbLightInfoMapper;
+import org.dromara.property.service.smartDevicesService.ITbLightInfoService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 灯控开关信息Service业务层处理
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TbLightInfoServiceImpl implements ITbLightInfoService {
+
+    private final TbLightInfoMapper baseMapper;
+    private final ITbFloorService floorService;
+
+    /**
+     * 查询灯控开关信息
+     *
+     * @param id 主键
+     * @return 灯控开关信息
+     */
+    @Override
+    public TbLightInfoVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询灯控开关信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 灯控开关信息分页列表
+     */
+    @Override
+    public TableDataInfo<TbLightInfoVo> queryPageList(TbLightInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TbLightInfo> lqw = buildQueryWrapper(bo);
+        Page<TbLightInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(r -> r.setFloorName(floorService.queryById(r.getFloorId()).getFloorName()));
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的灯控开关信息列表
+     *
+     * @param bo 查询条件
+     * @return 灯控开关信息列表
+     */
+    @Override
+    public List<TbLightInfoVo> queryList(TbLightInfoBo bo) {
+        LambdaQueryWrapper<TbLightInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TbLightInfo> buildQueryWrapper(TbLightInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TbLightInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(TbLightInfo::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getLocationRemark()), TbLightInfo::getLocationRemark, bo.getLocationRemark());
+        lqw.eq(bo.getIsOn() != null, TbLightInfo::getIsOn, bo.getIsOn());
+        lqw.eq(bo.getCode() != null, TbLightInfo::getCode, bo.getCode());
+        lqw.eq(bo.getCommunityId() != null, TbLightInfo::getCommunityId, bo.getCommunityId());
+        lqw.eq(bo.getBuildingId() != null, TbLightInfo::getBuildingId, bo.getBuildingId());
+        lqw.eq(bo.getUnitId() != null, TbLightInfo::getUnitId, bo.getUnitId());
+        lqw.eq(bo.getFloorId() != null, TbLightInfo::getFloorId, bo.getFloorId());
+        return lqw;
+    }
+
+    /**
+     * 新增灯控开关信息
+     *
+     * @param bo 灯控开关信息
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(TbLightInfoBo bo) {
+        TbLightInfo add = MapstructUtils.convert(bo, TbLightInfo.class);
+        assert add != null;
+        TbFloorVo floor = floorService.queryById(add.getFloorId());
+        add.setBuildingId(floor.getBuildingId());
+        add.setCommunityId(floor.getCommunityId());
+        boolean flag = baseMapper.insert(add) > 0;
+        Assert.isTrue(flag, "新增灯控开关信息失败");
+        return flag;
+    }
+
+    /**
+     * 修改灯控开关信息
+     *
+     * @param bo 灯控开关信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(TbLightInfoBo bo) {
+        TbLightInfo update = MapstructUtils.convert(bo, TbLightInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TbLightInfo entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除灯控开关信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 单个灯开关控制
+     *
+     * @param bo bean
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean switchSingleLight(TbLightInfoBo bo){
+        TbLightInfo update = MapstructUtils.convert(bo, TbLightInfo.class);
+        boolean flag = baseMapper.updateById(update) > 0;
+        Assert.isTrue(flag, "修改灯开关失败");
+        return flag;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterConfigServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.property.service.impl;
+package org.dromara.property.service.impl.smartDevicesImpl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.TbMeterConfigBo;
-import org.dromara.property.domain.vo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterConfigBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo;
 import org.dromara.property.domain.TbMeterConfig;
-import org.dromara.property.mapper.TbMeterConfigMapper;
-import org.dromara.property.service.ITbMeterConfigService;
+import org.dromara.property.mapper.smartDevicesMapper.TbMeterConfigMapper;
+import org.dromara.property.service.smartDevicesService.ITbMeterConfigService;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,4 +1,4 @@
-package org.dromara.property.service.impl;
+package org.dromara.property.service.impl.smartDevicesImpl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.TbMeterInfoBo;
-import org.dromara.property.domain.vo.TbMeterInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
 import org.dromara.property.domain.TbMeterInfo;
-import org.dromara.property.mapper.TbMeterInfoMapper;
-import org.dromara.property.service.ITbMeterInfoService;
+import org.dromara.property.mapper.smartDevicesMapper.TbMeterInfoMapper;
+import org.dromara.property.service.smartDevicesService.ITbMeterInfoService;
 
 import java.util.List;
 import java.util.Map;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.property.service.impl;
+package org.dromara.property.service.impl.smartDevicesImpl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.TbMeterRecordBo;
-import org.dromara.property.domain.vo.TbMeterRecordVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
 import org.dromara.property.domain.TbMeterRecord;
-import org.dromara.property.mapper.TbMeterRecordMapper;
-import org.dromara.property.service.ITbMeterRecordService;
+import org.dromara.property.mapper.smartDevicesMapper.TbMeterRecordMapper;
+import org.dromara.property.service.smartDevicesService.ITbMeterRecordService;
 
 import java.util.List;
 import java.util.Map;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRoomServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.property.service.impl;
+package org.dromara.property.service.impl.smartDevicesImpl;
 
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.TbMeterRoomBo;
-import org.dromara.property.domain.vo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRoomBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo;
 import org.dromara.property.domain.TbMeterRoom;
-import org.dromara.property.mapper.TbMeterRoomMapper;
-import org.dromara.property.service.ITbMeterRoomService;
+import org.dromara.property.mapper.smartDevicesMapper.TbMeterRoomMapper;
+import org.dromara.property.service.smartDevicesService.ITbMeterRoomService;
 
 import java.util.List;
 import java.util.Map;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbLightInfoService.java

@@ -0,0 +1,75 @@
+package org.dromara.property.service.smartDevicesService;
+
+import org.dromara.property.domain.vo.smartDevicesVo.TbLightInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbLightInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 灯控开关信息Service接口
+ *
+ * @author lsm
+ * @since 2025-08-19
+ */
+public interface ITbLightInfoService {
+
+    /**
+     * 查询灯控开关信息
+     *
+     * @param id 主键
+     * @return 灯控开关信息
+     */
+    TbLightInfoVo queryById(Long id);
+
+    /**
+     * 分页查询灯控开关信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 灯控开关信息分页列表
+     */
+    TableDataInfo<TbLightInfoVo> queryPageList(TbLightInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的灯控开关信息列表
+     *
+     * @param bo 查询条件
+     * @return 灯控开关信息列表
+     */
+    List<TbLightInfoVo> queryList(TbLightInfoBo bo);
+
+    /**
+     * 新增灯控开关信息
+     *
+     * @param bo 灯控开关信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(TbLightInfoBo bo);
+
+    /**
+     * 修改灯控开关信息
+     *
+     * @param bo 灯控开关信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(TbLightInfoBo bo);
+
+    /**
+     * 校验并批量删除灯控开关信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 单个灯开关控制
+     *
+     * @param bo bean
+     */
+    Boolean switchSingleLight(TbLightInfoBo bo);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterConfigService.java

@@ -1,7 +1,7 @@
-package org.dromara.property.service;
+package org.dromara.property.service.smartDevicesService;
 
-import org.dromara.property.domain.vo.TbMeterConfigVo;
-import org.dromara.property.domain.bo.TbMeterConfigBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterConfigVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterConfigBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterInfoService.java

@@ -1,8 +1,7 @@
-package org.dromara.property.service;
+package org.dromara.property.service.smartDevicesService;
 
-import org.dromara.property.domain.TbMeterInfo;
-import org.dromara.property.domain.vo.TbMeterInfoVo;
-import org.dromara.property.domain.bo.TbMeterInfoBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java

@@ -1,8 +1,7 @@
-package org.dromara.property.service;
+package org.dromara.property.service.smartDevicesService;
 
-import org.dromara.property.domain.TbMeterRecord;
-import org.dromara.property.domain.vo.TbMeterRecordVo;
-import org.dromara.property.domain.bo.TbMeterRecordBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRoomService.java

@@ -1,7 +1,7 @@
-package org.dromara.property.service;
+package org.dromara.property.service.smartDevicesService;
 
-import org.dromara.property.domain.vo.TbMeterRoomVo;
-import org.dromara.property.domain.bo.TbMeterRoomBo;
+import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRoomVo;
+import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRoomBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 

ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/PopularActivitiesTasks.java

@@ -0,0 +1,50 @@
+package org.dromara.property.tasks;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PopularActivities;
+import org.dromara.property.domain.enums.ActivitiesStatusEnum;
+import org.dromara.property.mapper.PopularActivitiesMapper;
+import org.dromara.property.service.IPopularActivitiesService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuyongle
+ * @version 1.0
+ * @description: TODO
+ * @date 2025/8/20 10:22
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class PopularActivitiesTasks {
+    private final PopularActivitiesMapper popularActivitiesMapper;
+    /**
+     *  修改活动到期的活动状态
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(cron = "0 0 */1 * * ?")
+    //@GetMapping("/serviceWorkOrderTaskId")
+    private void handlePopularActivities() {
+        List<PopularActivities> popularActivities = popularActivitiesMapper.selectList(
+            new LambdaQueryWrapper<PopularActivities>()
+                .ne(PopularActivities::getStatus, ActivitiesStatusEnum.HASENDED.getValue())
+        );
+        Date now = new Date();
+        popularActivities.stream().forEach(entity ->{
+            //TODO拿当前时间和开始时间和结束时间做对比修改状态
+            entity.setStatus(
+                now.before(entity.getStartTime()) ? ActivitiesStatusEnum.NOTSTARTED.getValue() :
+                    now.after(entity.getEndTime()) ? ActivitiesStatusEnum.HASENDED.getValue() : ActivitiesStatusEnum.INPROGRESS.getValue()
+            );
+        });
+        popularActivitiesMapper.updateBatchById(popularActivities);
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java

@@ -48,9 +48,9 @@ public class ServiceWorkOrderTasks {
     /**
      * 查询状态为创建工单的工单,查询当天排班人员,为工单自动派单
      */
-//    @Transactional(rollbackFor = Exception.class)
-//    @Scheduled(cron = "0 0 */1 * * ?")
-    @GetMapping("/serviceWorkOrderTaskId")
+    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(cron = "0 0 */1 * * ?")
+    //@GetMapping("/serviceWorkOrderTaskId")
     private void handleServiceWorkOrder() {
         List<ServiceWorkOrders> serviceWorkOrderList = workOrdersMapper.selectList(
             new LambdaQueryWrapper<ServiceWorkOrders>()
@@ -88,9 +88,9 @@ public class ServiceWorkOrderTasks {
     /**
      * 处理超过30分钟的工单
      */
-//    @Transactional(rollbackFor = Exception.class)
-//    @Scheduled(cron = "0 0 */1 * * ?")
-    @GetMapping("/thirtyWorkOrderTaskId")
+    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(cron = "0 0 */1 * * ?")
+//    @GetMapping("/thirtyWorkOrderTaskId")
     private void thirtyHandleServiceWorkOrder() {
         // 1. 查询当前状态为“已派单”的工单
         List<ServiceWorkOrders> serviceWorkOrderList = workOrdersMapper.selectList(