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

refactor(property):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source 
- 水电气表业务、厂商业务移动至物业模块
This commit is contained in:
zcxlsm
2025-07-17 13:12:11 +08:00
parent 3f97caad42
commit e1f716c70b
30 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/meterConfig
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Validated
@RequiredArgsConstructor

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

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/meter
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Validated
@RequiredArgsConstructor

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

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/meterRoom
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Validated
@RequiredArgsConstructor

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

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/factory
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 厂商管理对象 td_factory
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeter.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 水电气对象 tb_meter
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterConfig.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 水电气配置对象 tb_meter_config
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbMeterRoom.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 仪房间关联对象 tb_meter_room
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFactoryBo.java
View File

@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 厂商管理业务对象 td_factory
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterBo.java
View File

@@ -2,7 +2,6 @@ package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbMeter;
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;
@@ -13,7 +12,7 @@ import jakarta.validation.constraints.*;
* 水电气业务对象 tb_meter
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterConfigBo.java
View File

@@ -2,7 +2,6 @@ package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbMeterConfig;
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;
@@ -13,7 +12,7 @@ import jakarta.validation.constraints.*;
* 水电气配置业务对象 tb_meter_config
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbMeterRoomBo.java
View File

@@ -2,7 +2,6 @@ package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbMeterRoom;
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;
@@ -13,7 +12,7 @@ import jakarta.validation.constraints.*;
* 仪房间关联业务对象 tb_meter_room
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFactoryVo.java
View File

@@ -14,7 +14,7 @@ import java.io.Serializable;
* 厂商管理视图对象 td_factory
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterConfigVo.java
View File

@@ -10,7 +10,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
@@ -18,7 +17,7 @@ import java.util.Date;
* 水电气配置视图对象 tb_meter_config
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@ExcelIgnoreUnannotated

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterRoomVo.java
View File

@@ -3,14 +3,11 @@ package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbMeterRoom;
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;
@@ -18,7 +15,7 @@ import java.util.Date;
* 仪房间关联视图对象 tb_meter_room
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@ExcelIgnoreUnannotated

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbMeterVo.java
View File

@@ -10,7 +10,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
@@ -18,7 +17,7 @@ import java.util.Date;
* 水电气视图对象 tb_meter
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Data
@ExcelIgnoreUnannotated

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFactoryMapper.java
View File

@@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 厂商管理Mapper接口
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Mapper
public interface TbFactoryMapper extends BaseMapperPlus<TbFactory, TbFactoryVo> {

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterConfigMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbMeterConfig;
import org.dromara.property.domain.vo.TbMeterConfigVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 水电气配置Mapper接口
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Mapper
public interface TbMeterConfigMapper extends BaseMapperPlus<TbMeterConfig, TbMeterConfigVo> {
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbMeter;
import org.dromara.property.domain.vo.TbMeterVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 水电气Mapper接口
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Mapper
public interface TbMeterMapper extends BaseMapperPlus<TbMeter, TbMeterVo> {
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbMeterRoomMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbMeterRoom;
import org.dromara.property.domain.vo.TbMeterRoomVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 仪房间关联Mapper接口
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Mapper
public interface TbMeterRoomMapper extends BaseMapperPlus<TbMeterRoom, TbMeterRoomVo> {
}

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

@@ -12,7 +12,7 @@ import java.util.List;
* 厂商管理Service接口
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
public interface ITbFactoryService {

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterConfigService.java
View File

@@ -1,6 +1,5 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbMeterConfig;
import org.dromara.property.domain.vo.TbMeterConfigVo;
import org.dromara.property.domain.bo.TbMeterConfigBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -13,7 +12,7 @@ import java.util.List;
* 水电气配置Service接口
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
public interface ITbMeterConfigService {

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterRoomService.java
View File

@@ -1,6 +1,5 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbMeterRoom;
import org.dromara.property.domain.vo.TbMeterRoomVo;
import org.dromara.property.domain.bo.TbMeterRoomBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -13,7 +12,7 @@ import java.util.List;
* 仪房间关联Service接口
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
public interface ITbMeterRoomService {

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbMeterService.java
View File

@@ -1,6 +1,5 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbMeter;
import org.dromara.property.domain.vo.TbMeterVo;
import org.dromara.property.domain.bo.TbMeterBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -13,7 +12,7 @@ import java.util.List;
* 水电气Service接口
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
public interface ITbMeterService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFactoryServiceImpl.java
View File

@@ -24,7 +24,7 @@ import java.util.Collection;
* 厂商管理Service业务层处理
*
* @author mocheng
* @date 2025-06-18
* @since 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterConfigServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
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;
@@ -24,7 +23,7 @@ import java.util.Collection;
* 水电气配置Service业务层处理
*
* @author lsm
* @date 2025-07-17
* @since 2025-07-17
*/
@Slf4j
@RequiredArgsConstructor

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterRoomServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
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;
@@ -24,7 +23,7 @@ import java.util.Collection;
* 仪房间关联Service业务层处理
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Slf4j
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbMeterServiceImpl.java
View File

@@ -24,7 +24,7 @@ import java.util.Collection;
* 水电气Service业务层处理
*
* @author LionLi
* @date 2025-07-17
* @since 2025-07-17
*/
@Slf4j
@RequiredArgsConstructor