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

refactor(property):

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

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdFactoryController.java
View File

@@ -1,106 +0,0 @@
package org.dromara.sis.controller;
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.sis.domain.vo.TdFactoryVo;
import org.dromara.sis.domain.bo.TdFactoryBo;
import org.dromara.sis.service.ITdFactoryService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 厂商管理
* 前端访问路由地址为:/iot/factory
*
* @author lxj
* @date 2025-06-17
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/factory")
public class TdFactoryController extends BaseController {
private final ITdFactoryService tdFactoryService;
/**
* 查询厂商管理列表
*/
@SaCheckPermission("property:factory:list")
@GetMapping("/list")
public TableDataInfo<TdFactoryVo> list(TdFactoryBo bo, PageQuery pageQuery) {
return tdFactoryService.queryPageList(bo, pageQuery);
}
/**
* 导出厂商管理列表
*/
@SaCheckPermission("property:factory:export")
@Log(title = "厂商管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TdFactoryBo bo, HttpServletResponse response) {
List<TdFactoryVo> list = tdFactoryService.queryList(bo);
ExcelUtil.exportExcel(list, "厂商管理", TdFactoryVo.class, response);
}
/**
* 获取厂商管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:factory:query")
@GetMapping("/{id}")
public R<TdFactoryVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tdFactoryService.queryById(id));
}
/**
* 新增厂商管理
*/
@SaCheckPermission("property:factory:add")
@Log(title = "厂商管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TdFactoryBo bo) {
return toAjax(tdFactoryService.insertByBo(bo));
}
/**
* 修改厂商管理
*/
@SaCheckPermission("property:factory:edit")
@Log(title = "厂商管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TdFactoryBo bo) {
return toAjax(tdFactoryService.updateByBo(bo));
}
/**
* 删除厂商管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:factory:remove")
@Log(title = "厂商管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tdFactoryService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterConfigController.java
View File

@@ -1,106 +0,0 @@
package org.dromara.sis.controller;
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.sis.domain.vo.TdMeterConfigVo;
import org.dromara.sis.domain.bo.TdMeterConfigBo;
import org.dromara.sis.service.ITdMeterConfigService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 水电气配置
* 前端访问路由地址为:/iot/meterConfig
*
* @author lxj
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/meterConfig")
public class TdMeterConfigController extends BaseController {
private final ITdMeterConfigService tdMeterConfigService;
/**
* 查询水电气配置列表
*/
@SaCheckPermission("system:meterConfig:list")
@GetMapping("/list")
public TableDataInfo<TdMeterConfigVo> list(TdMeterConfigBo bo, PageQuery pageQuery) {
return tdMeterConfigService.queryPageList(bo, pageQuery);
}
/**
* 导出水电气配置列表
*/
@SaCheckPermission("system:meterConfig:export")
@Log(title = "水电气配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TdMeterConfigBo bo, HttpServletResponse response) {
List<TdMeterConfigVo> list = tdMeterConfigService.queryList(bo);
ExcelUtil.exportExcel(list, "水电气配置", TdMeterConfigVo.class, response);
}
/**
* 获取水电气配置详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:meterConfig:query")
@GetMapping("/{id}")
public R<TdMeterConfigVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tdMeterConfigService.queryById(id));
}
/**
* 新增水电气配置
*/
@SaCheckPermission("system:meterConfig:add")
@Log(title = "水电气配置", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TdMeterConfigBo bo) {
return toAjax(tdMeterConfigService.insertByBo(bo));
}
/**
* 修改水电气配置
*/
@SaCheckPermission("system:meterConfig:edit")
@Log(title = "水电气配置", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TdMeterConfigBo bo) {
return toAjax(tdMeterConfigService.updateByBo(bo));
}
/**
* 删除水电气配置
*
* @param ids 主键串
*/
@SaCheckPermission("system:meterConfig:remove")
@Log(title = "水电气配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tdMeterConfigService.deleteWithValidByIds(List.of(ids), true));
}
}

121
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterController.java
View File

@@ -1,121 +0,0 @@
package org.dromara.sis.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.sis.domain.bo.TdMeterBo;
import org.dromara.sis.domain.vo.TdMeterVo;
import org.dromara.sis.service.ITdMeterService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 水电气
* 前端访问路由地址为:/iot/meter
*
* @author LionLi
* @date 2025-06-19
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/meter")
public class TdMeterController extends BaseController {
private final ITdMeterService tdMeterService;
/**
* 查询水电气列表
*/
@SaCheckPermission("iot:meter:list")
@GetMapping("/list")
public TableDataInfo<TdMeterVo> list(TdMeterBo bo, PageQuery pageQuery) {
return tdMeterService.queryPageList(bo, pageQuery);
}
/**
* 打开或关闭表
*
* @param meterId 智能表id
* @param onOff 0: 打开，2：关闭
* @return 是否操作成功
*/
@SaCheckPermission("iot:meter:operate")
@Log(title = "开/关智能表", businessType = BusinessType.OTHER)
@GetMapping("/operate/{meterId}/{onOff}")
public R<Boolean> operate(@PathVariable("meterId") Long meterId, @PathVariable("onOff") Integer onOff) {
return R.ok(tdMeterService.operate(meterId, onOff));
}
/**
* 导出水电气列表
*/
@SaCheckPermission("iot:meter:export")
@Log(title = "导出智能表信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TdMeterBo bo, HttpServletResponse response) {
List<TdMeterVo> list = tdMeterService.queryList(bo);
ExcelUtil.exportExcel(list, "水电气", TdMeterVo.class, response);
}
/**
* 获取水电气详细信息
*
* @param id 主键
*/
@SaCheckPermission("iot:meter:query")
@GetMapping("/{id}")
public R<TdMeterVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tdMeterService.queryById(id));
}
/**
* 新增水电气
*/
@SaCheckPermission("iot:meter:add")
@Log(title = "添加智能表信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TdMeterBo bo) {
return toAjax(tdMeterService.insertByBo(bo));
}
/**
* 修改水电气
*/
@SaCheckPermission("iot:meter:edit")
@Log(title = "修改智能表信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TdMeterBo bo) {
return toAjax(tdMeterService.updateByBo(bo));
}
/**
* 删除水电气
*
* @param ids 主键串
*/
@SaCheckPermission("iot:meter:remove")
@Log(title = "删除智能表信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tdMeterService.deleteWithValidByIds(List.of(ids), true));
}
}

107
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/TdMeterRoomController.java
View File

@@ -1,107 +0,0 @@
package org.dromara.sis.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
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.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.sis.domain.bo.TdMeterRoomBo;
import org.dromara.sis.domain.vo.TdMeterRoomVo;
import org.dromara.sis.service.ITdMeterRoomService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 和房间的关联
* 前端访问路由地址为:/iot/meterRoom
*
* @author lxj
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/meterRoom")
public class TdMeterRoomController extends BaseController {
private final ITdMeterRoomService tdMeterRoomService;
/**
* 查询和房间的关联列表
*/
@SaCheckPermission("system:meterRoom:list")
@GetMapping("/list")
public TableDataInfo<TdMeterRoomVo> list(TdMeterRoomBo bo, PageQuery pageQuery) {
return tdMeterRoomService.queryPageList(bo, pageQuery);
}
/**
* 导出和房间的关联列表
*/
@SaCheckPermission("system:meterRoom:export")
@Log(title = "和房间的关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TdMeterRoomBo bo, HttpServletResponse response) {
List<TdMeterRoomVo> list = tdMeterRoomService.queryList(bo);
ExcelUtil.exportExcel(list, "和房间的关联", TdMeterRoomVo.class, response);
}
/**
* 获取和房间的关联详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:meterRoom:query")
@GetMapping("/{id}")
public R<TdMeterRoomVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tdMeterRoomService.queryById(id));
}
/**
* 新增和房间的关联
*/
@SaCheckPermission("system:meterRoom:add")
@Log(title = "和房间的关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TdMeterRoomBo bo) {
return toAjax(tdMeterRoomService.insertByBo(bo));
}
/**
* 修改和房间的关联
*/
@SaCheckPermission("system:meterRoom:edit")
@Log(title = "和房间的关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TdMeterRoomBo bo) {
return toAjax(tdMeterRoomService.updateByBo(bo));
}
/**
* 删除和房间的关联
*
* @param ids 主键串
*/
@SaCheckPermission("system:meterRoom:remove")
@Log(title = "和房间的关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tdMeterRoomService.deleteWithValidByIds(List.of(ids), true));
}
}

47
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java
View File

@@ -1,47 +0,0 @@
package org.dromara.sis.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/**
* 厂商管理对象 td_factory
*
* @author mocheng
* @date 2025-06-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("td_factory")
public class TdFactory extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 数据库id
*/
@TableId(value = "id")
private Long id;
/**
* 厂商编码
*/
private String factoryNo;
/**
* 设备厂商名称
*/
private String factoryName;
/**
* 备注
*/
private String remark;
}

107
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java
View File

@@ -1,107 +0,0 @@
package org.dromara.sis.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/**
* 水电气对象 td_meter
*
* @author LionLi
* @date 2025-06-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("td_meter")
public class TdMeter extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 水表名称
*/
private String meterName;
/**
* 设备编码
*/
private String meterCode;
/**
* 设备厂商
*/
private String factoryNo;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
private Integer meterType;
/**
* 表用途(1-分表，2-总表，3-公摊表)
*/
private Integer meterPurpose;
/**
* 分摊类型
* 1-不公摊
* 2-按分表用量
* 3-按租客面积
* 4-按房源数量
* 5-按固定比例
*/
private Integer shareType;
/**
* 付费类型(1-先付费，2-后付费)
*/
private Integer payType;
/**
* 当前表显示读数
*/
private Long display;
/**
* 最大表显读数(超过归0)
*/
private Long maxDisplay;
/**
* 计费倍率
*/
private Float billingRate;
/**
* 剩余量
*/
private Long surplus;
/**
* 通信状态
*/
private Integer communicationState;
/**
* 运行状态
*/
private Integer runningState;
/**
* 备注
*/
private String remark;
}

61
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java
View File

@@ -1,61 +0,0 @@
package org.dromara.sis.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 水电气配置对象 td_meter_config
*
* @author LionLi
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("td_meter_config")
public class TdMeterConfig extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
private Integer meterType;
/**
* 付费类型(1-先付费，2-后付费)
*/
private Integer payType;
/**
* 欠费是否断电/水/气(0-是，1-否)
*/
private Integer arrearsOutage;
/**
* 后付费模式下是否自动断电/水/气（0-是，1-否）
*/
private Integer autoOutage;
/**
* 当auto_outage=0的时候生效，逾期多少天自动断水/电/气
*/
private Integer overdueDay;
/**
* 备注
*/
private String remark;
}

47
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java
View File

@@ -1,47 +0,0 @@
package org.dromara.sis.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/**
* 和房间的关联对象 td_meter_room
*
* @author LionLi
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("td_meter_room")
public class TdMeterRoom extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 表id
*/
private Long meterId;
/**
* 房间id
*/
private Long roomId;
/**
* 备注
*/
private String remark;
}

46
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java
View File

@@ -1,46 +0,0 @@
package org.dromara.sis.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.TdFactory;
/**
* 厂商管理业务对象 td_factory
*
* @author lxj
* @date 2025-06-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TdFactory.class, reverseConvertGenerate = false)
public class TdFactoryBo extends BaseEntity {
/**
* 数据库id
*/
@NotNull(message = "数据库id不能为空", groups = {EditGroup.class})
private Long id;
/**
* 厂商编码
*/
@NotBlank(message = "厂商编码不能为空", groups = {AddGroup.class, EditGroup.class})
private String factoryNo;
/**
* 设备厂商名称
*/
@NotBlank(message = "设备厂商名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String factoryName;
/**
* 备注
*/
private String remark;
}

96
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java
View File

@@ -1,96 +0,0 @@
package org.dromara.sis.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.TdMeter;
import java.util.List;
/**
* 水电气业务对象 td_meter
*
* @author LionLi
* @date 2025-06-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TdMeter.class, reverseConvertGenerate = false)
public class TdMeterBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = {EditGroup.class})
private Long id;
/**
* 水表名称
*/
@NotBlank(message = "水表名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String meterName;
/**
* 设备编码
*/
private String meterCode;
/**
* 设备厂商
*/
@NotBlank(message = "设备厂商不能为空", groups = {AddGroup.class, EditGroup.class})
private String factoryNo;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
private Integer meterType;
/**
* 表用途(1-分表，2-总表，3-公摊表)
*/
private Integer meterPurpose;
/**
* 分摊类型
* 1-不公摊
* 2-按分表用量
* 3-按租客面积
* 4-按房源数量
* 5-按固定比例
*/
private Integer shareType;
/**
* 付费类型(1-先付费，2-后付费)
*/
private Integer payType;
/**
* 最大表显读数(超过归0)
*/
private Integer maxDisplay;
/**
* 计费倍率
*/
private Float billingRate;
/**
* 备注
*/
private String remark;
/**
* 设备厂商
*/
@NotBlank(message = "表绑定的房间不能为空", groups = {AddGroup.class})
private List<Long> roomIds;
}

64
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java
View File

@@ -1,64 +0,0 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.TdMeterConfig;
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.*;
/**
* 水电气配置业务对象 td_meter_config
*
* @author lxj
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TdMeterConfig.class, reverseConvertGenerate = false)
public class TdMeterConfigBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
private Integer meterType;
/**
* 付费类型(1-先付费，2-后付费)
*/
@NotNull(message = "付费类型(1-先付费，2-后付费)不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer payType;
/**
* 欠费是否断电/水/气(0-是，1-否)
*/
@NotNull(message = "欠费是否断电/水/气(0-是，1-否)不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer arrearsOutage;
/**
* 后付费模式下是否自动断电/水/气（0-是，1-否）
*/
@NotNull(message = "后付费模式下是否自动断电/水/气（0-是，1-否）不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer autoOutage;
/**
* 当auto_outage=0的时候生效，逾期多少天自动断水/电/气
*/
@NotNull(message = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer overdueDay;
/**
* 备注
*/
private String remark;
}

47
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterRoomBo.java
View File

@@ -1,47 +0,0 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.TdMeterRoom;
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.*;
/**
* 和房间的关联业务对象 td_meter_room
*
* @author lxj
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TdMeterRoom.class, reverseConvertGenerate = false)
public class TdMeterRoomBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 表id
*/
@NotNull(message = "表id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long meterId;
/**
* 房间id
*/
@NotNull(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long roomId;
/**
* 备注
*/
private String remark;
}

51
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java
View File

@@ -1,51 +0,0 @@
package org.dromara.sis.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.sis.domain.TdFactory;
import java.io.Serial;
import java.io.Serializable;
/**
* 厂商管理视图对象 td_factory
*
* @author lxj
* @date 2025-06-17
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TdFactory.class)
public class TdFactoryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 数据库id
*/
@ExcelProperty(value = "数据库id")
private Long id;
/**
* 厂商编码
*/
@ExcelProperty(value = "厂商编码")
private String factoryNo;
/**
* 设备厂商名称
*/
@ExcelProperty(value = "设备厂商名称")
private String factoryName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

73
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java
View File

@@ -1,73 +0,0 @@
package org.dromara.sis.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.sis.domain.TdMeterConfig;
import java.io.Serial;
import java.io.Serializable;
/**
* 水电气配置视图对象 td_meter_config
*
* @author lxj
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TdMeterConfig.class)
public class TdMeterConfigVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
@ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)")
private Integer meterType;
/**
* 付费类型(1-先付费，2-后付费)
*/
@ExcelProperty(value = "付费类型(1-先付费，2-后付费)")
private Integer payType;
/**
* 欠费是否断电/水/气(0-是，1-否)
*/
@ExcelProperty(value = "欠费是否断电/水/气(0-是，1-否)")
private Integer arrearsOutage;
/**
* 后付费模式下是否自动断电/水/气（0-是，1-否）
*/
@ExcelProperty(value = "后付费模式下是否自动断电/水/气", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=-是，1-否")
private Integer autoOutage;
/**
* 当auto_outage=0的时候生效，逾期多少天自动断水/电/气
*/
@ExcelProperty(value = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气")
private Integer overdueDay;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

52
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterRoomVo.java
View File

@@ -1,52 +0,0 @@
package org.dromara.sis.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.sis.domain.TdMeterRoom;
import java.io.Serial;
import java.io.Serializable;
/**
* 和房间的关联视图对象 td_meter_room
*
* @author LionLi
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TdMeterRoom.class)
public class TdMeterRoomVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 表id
*/
@ExcelProperty(value = "表id")
private Long meterId;
/**
* 房间id
*/
@ExcelProperty(value = "房间id")
private Long roomId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

112
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java
View File

@@ -1,112 +0,0 @@
package org.dromara.sis.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.sis.domain.TdMeter;
import java.io.Serial;
import java.io.Serializable;
/**
* 水电气视图对象 td_meter
*
* @author LionLi
* @date 2025-06-19
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TdMeter.class)
public class TdMeterVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 水表名称
*/
@ExcelProperty(value = "水表名称")
private String meterName;
/**
* 设备编码
*/
@ExcelProperty(value = "设备编码")
private String meterCode;
/**
* 设备厂商
*/
@ExcelProperty(value = "设备厂商")
private String factoryNo;
/**
* 设备类型(1-电表，2-水表，3-气表)
*/
@ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)")
private Integer meterType;
/**
* 表用途(1-分表，2-总表，3-公摊表)
*/
@ExcelProperty(value = "表用途(1-分表，2-总表，3-公摊表)")
private Integer meterPurpose;
/**
* 分摊类型
* 1-不公摊
* 2-按分表用量
* 3-按租客面积
* 4-按房源数量
* 5-按固定比例
*/
@ExcelProperty(value = "分摊类型 1-不公摊 2-按分表用量 3-按租客面积 4-按房源数量 5-按固定比例")
private Integer shareType;
/**
* 付费类型(1-先付费，2-后付费)
*/
@ExcelProperty(value = "付费类型(1-先付费，2-后付费)")
private Integer payType;
/**
* 当前表显示读数
*/
@ExcelProperty(value = "当前表显示读数")
private Long display;
/**
* 剩余量
*/
@ExcelProperty(value = "剩余量")
private Long surplus;
/**
* 通信状态
*/
@ExcelProperty(value = "通信状态")
private Integer communicationState;
/**
* 运行状态
*/
@ExcelProperty(value = "运行状态")
private Integer runningState;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdFactoryMapper.java
View File

@@ -1,15 +0,0 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.TdFactory;
import org.dromara.sis.domain.vo.TdFactoryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 厂商管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
*/
public interface TdFactoryMapper extends BaseMapperPlus<TdFactory, TdFactoryVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterConfigMapper.java
View File

@@ -1,15 +0,0 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.TdMeterConfig;
import org.dromara.sis.domain.vo.TdMeterConfigVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 水电气配置Mapper接口
*
* @author LionLi
* @date 2025-06-18
*/
public interface TdMeterConfigMapper extends BaseMapperPlus<TdMeterConfig, TdMeterConfigVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterMapper.java
View File

@@ -1,15 +0,0 @@
package org.dromara.sis.mapper;
import org.dromara.sis.domain.TdMeter;
import org.dromara.sis.domain.vo.TdMeterVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 水电气Mapper接口
*
* @author LionLi
* @date 2025-06-19
*/
public interface TdMeterMapper extends BaseMapperPlus<TdMeter, TdMeterVo> {
}

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/TdMeterRoomMapper.java
View File

@@ -1,15 +0,0 @@
package org.dromara.sis.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.sis.domain.TdMeterRoom;
import org.dromara.sis.domain.vo.TdMeterRoomVo;
/**
* 和房间的关联Mapper接口
*
* @author LionLi
* @date 2025-06-18
*/
public interface TdMeterRoomMapper extends BaseMapperPlus<TdMeterRoom, TdMeterRoomVo> {
}

68
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdFactoryService.java
View File

@@ -1,68 +0,0 @@
package org.dromara.sis.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.bo.TdFactoryBo;
import org.dromara.sis.domain.vo.TdFactoryVo;
import java.util.Collection;
import java.util.List;
/**
* 厂商管理Service接口
*
* @author mocheng
* @date 2025-06-17
*/
public interface ITdFactoryService {
/**
* 查询厂商管理
*
* @param id 主键
* @return 厂商管理
*/
TdFactoryVo queryById(Long id);
/**
* 分页查询厂商管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 厂商管理分页列表
*/
TableDataInfo<TdFactoryVo> queryPageList(TdFactoryBo bo, PageQuery pageQuery);
/**
* 查询符合条件的厂商管理列表
*
* @param bo 查询条件
* @return 厂商管理列表
*/
List<TdFactoryVo> queryList(TdFactoryBo bo);
/**
* 新增厂商管理
*
* @param bo 厂商管理
* @return 是否新增成功
*/
Boolean insertByBo(TdFactoryBo bo);
/**
* 修改厂商管理
*
* @param bo 厂商管理
* @return 是否修改成功
*/
Boolean updateByBo(TdFactoryBo bo);
/**
* 校验并批量删除厂商管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

68
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterConfigService.java
View File

@@ -1,68 +0,0 @@
package org.dromara.sis.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.bo.TdMeterConfigBo;
import org.dromara.sis.domain.vo.TdMeterConfigVo;
import java.util.Collection;
import java.util.List;
/**
* 水电气配置Service接口
*
* @author LionLi
* @date 2025-06-18
*/
public interface ITdMeterConfigService {
/**
* 查询水电气配置
*
* @param id 主键
* @return 水电气配置
*/
TdMeterConfigVo queryById(Long id);
/**
* 分页查询水电气配置列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 水电气配置分页列表
*/
TableDataInfo<TdMeterConfigVo> queryPageList(TdMeterConfigBo bo, PageQuery pageQuery);
/**
* 查询符合条件的水电气配置列表
*
* @param bo 查询条件
* @return 水电气配置列表
*/
List<TdMeterConfigVo> queryList(TdMeterConfigBo bo);
/**
* 新增水电气配置
*
* @param bo 水电气配置
* @return 是否新增成功
*/
Boolean insertByBo(TdMeterConfigBo bo);
/**
* 修改水电气配置
*
* @param bo 水电气配置
* @return 是否修改成功
*/
Boolean updateByBo(TdMeterConfigBo bo);
/**
* 校验并批量删除水电气配置信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

85
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterRoomService.java
View File

@@ -1,85 +0,0 @@
package org.dromara.sis.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.TdMeterRoom;
import org.dromara.sis.domain.bo.TdMeterRoomBo;
import org.dromara.sis.domain.vo.TdMeterRoomVo;
import java.util.Collection;
import java.util.List;
/**
* 和房间的关联Service接口
*
* @author LionLi
* @date 2025-06-18
*/
public interface ITdMeterRoomService {
/**
* 查询和房间的关联
*
* @param id 主键
* @return 和房间的关联
*/
TdMeterRoomVo queryById(Long id);
/**
* 分页查询和房间的关联列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 和房间的关联分页列表
*/
TableDataInfo<TdMeterRoomVo> queryPageList(TdMeterRoomBo bo, PageQuery pageQuery);
/**
* 查询符合条件的和房间的关联列表
*
* @param bo 查询条件
* @return 和房间的关联列表
*/
List<TdMeterRoomVo> queryList(TdMeterRoomBo bo);
/**
* 新增和房间的关联
*
* @param bo 和房间的关联
* @return 是否新增成功
*/
Boolean insertByBo(TdMeterRoomBo bo);
/**
* 修改和房间的关联
*
* @param bo 和房间的关联
* @return 是否修改成功
*/
Boolean updateByBo(TdMeterRoomBo bo);
/**
* 校验并批量删除和房间的关联信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 批量写入表和房间的关联关系
*
* @param rels 写入数据
* @return 是否写入成功
*/
Boolean insertBatch(List<TdMeterRoom> rels);
/**
* 根据表id删除关联数据
* @param meterId 表id
* @return 是否删除成功
*/
Integer deleteByMeterId(Long meterId);
}

77
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ITdMeterService.java
View File

@@ -1,77 +0,0 @@
package org.dromara.sis.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.bo.TdMeterBo;
import org.dromara.sis.domain.vo.TdMeterVo;
import java.util.Collection;
import java.util.List;
/**
* 水电气Service接口
*
* @author LionLi
* @date 2025-06-19
*/
public interface ITdMeterService {
/**
* 查询水电气
*
* @param id 主键
* @return 水电气
*/
TdMeterVo queryById(Long id);
/**
* 分页查询水电气列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 水电气分页列表
*/
TableDataInfo<TdMeterVo> queryPageList(TdMeterBo bo, PageQuery pageQuery);
/**
* 查询符合条件的水电气列表
*
* @param bo 查询条件
* @return 水电气列表
*/
List<TdMeterVo> queryList(TdMeterBo bo);
/**
* 新增水电气
*
* @param bo 水电气
* @return 是否新增成功
*/
Boolean insertByBo(TdMeterBo bo);
/**
* 修改水电气
*
* @param bo 水电气
* @return 是否修改成功
*/
Boolean updateByBo(TdMeterBo bo);
/**
* 校验并批量删除水电气信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 打开或关闭表
*
* @param meterId 智能表编码
* @param onOff 0: 打开，2：关闭
* @return 是否操作成功
*/
Boolean operate(Long meterId, Integer onOff);
}

133
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java
View File

@@ -1,133 +0,0 @@
package org.dromara.sis.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;
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.springframework.stereotype.Service;
import org.dromara.sis.domain.bo.TdFactoryBo;
import org.dromara.sis.domain.vo.TdFactoryVo;
import org.dromara.sis.domain.TdFactory;
import org.dromara.sis.mapper.TdFactoryMapper;
import org.dromara.sis.service.ITdFactoryService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 厂商管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TdFactoryServiceImpl implements ITdFactoryService {
private final TdFactoryMapper baseMapper;
/**
* 查询厂商管理
*
* @param id 主键
* @return 厂商管理
*/
@Override
public TdFactoryVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询厂商管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 厂商管理分页列表
*/
@Override
public TableDataInfo<TdFactoryVo> queryPageList(TdFactoryBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TdFactory> lqw = buildQueryWrapper(bo);
Page<TdFactoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的厂商管理列表
*
* @param bo 查询条件
* @return 厂商管理列表
*/
@Override
public List<TdFactoryVo> queryList(TdFactoryBo bo) {
LambdaQueryWrapper<TdFactory> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TdFactory> buildQueryWrapper(TdFactoryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TdFactory> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TdFactory::getId);
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdFactory::getFactoryNo, bo.getFactoryNo());
lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TdFactory::getFactoryName, bo.getFactoryName());
return lqw;
}
/**
* 新增厂商管理
*
* @param bo 厂商管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TdFactoryBo bo) {
TdFactory add = MapstructUtils.convert(bo, TdFactory.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改厂商管理
*
* @param bo 厂商管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TdFactoryBo bo) {
TdFactory update = MapstructUtils.convert(bo, TdFactory.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TdFactory entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除厂商管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

135
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterConfigServiceImpl.java
View File

@@ -1,135 +0,0 @@
package org.dromara.sis.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
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.springframework.stereotype.Service;
import org.dromara.sis.domain.bo.TdMeterConfigBo;
import org.dromara.sis.domain.vo.TdMeterConfigVo;
import org.dromara.sis.domain.TdMeterConfig;
import org.dromara.sis.mapper.TdMeterConfigMapper;
import org.dromara.sis.service.ITdMeterConfigService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 水电气配置Service业务层处理
*
* @author LionLi
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TdMeterConfigServiceImpl implements ITdMeterConfigService {
private final TdMeterConfigMapper baseMapper;
/**
* 查询水电气配置
*
* @param id 主键
* @return 水电气配置
*/
@Override
public TdMeterConfigVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询水电气配置列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 水电气配置分页列表
*/
@Override
public TableDataInfo<TdMeterConfigVo> queryPageList(TdMeterConfigBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TdMeterConfig> lqw = buildQueryWrapper(bo);
Page<TdMeterConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的水电气配置列表
*
* @param bo 查询条件
* @return 水电气配置列表
*/
@Override
public List<TdMeterConfigVo> queryList(TdMeterConfigBo bo) {
LambdaQueryWrapper<TdMeterConfig> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TdMeterConfig> buildQueryWrapper(TdMeterConfigBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TdMeterConfig> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TdMeterConfig::getId);
lqw.eq(bo.getMeterType() != null, TdMeterConfig::getMeterType, bo.getMeterType());
lqw.eq(bo.getPayType() != null, TdMeterConfig::getPayType, bo.getPayType());
lqw.eq(bo.getArrearsOutage() != null, TdMeterConfig::getArrearsOutage, bo.getArrearsOutage());
lqw.eq(bo.getAutoOutage() != null, TdMeterConfig::getAutoOutage, bo.getAutoOutage());
lqw.eq(bo.getOverdueDay() != null, TdMeterConfig::getOverdueDay, bo.getOverdueDay());
return lqw;
}
/**
* 新增水电气配置
*
* @param bo 水电气配置
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TdMeterConfigBo bo) {
TdMeterConfig add = MapstructUtils.convert(bo, TdMeterConfig.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改水电气配置
*
* @param bo 水电气配置
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TdMeterConfigBo bo) {
TdMeterConfig update = MapstructUtils.convert(bo, TdMeterConfig.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TdMeterConfig entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除水电气配置信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

147
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterRoomServiceImpl.java
View File

@@ -1,147 +0,0 @@
package org.dromara.sis.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.TdMeterRoom;
import org.dromara.sis.domain.bo.TdMeterRoomBo;
import org.dromara.sis.domain.vo.TdMeterRoomVo;
import org.dromara.sis.mapper.TdMeterRoomMapper;
import org.dromara.sis.service.ITdMeterRoomService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 和房间的关联Service业务层处理
*
* @author LionLi
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TdMeterRoomServiceImpl implements ITdMeterRoomService {
private final TdMeterRoomMapper baseMapper;
/**
* 查询和房间的关联
*
* @param id 主键
* @return 和房间的关联
*/
@Override
public TdMeterRoomVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询和房间的关联列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 和房间的关联分页列表
*/
@Override
public TableDataInfo<TdMeterRoomVo> queryPageList(TdMeterRoomBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TdMeterRoom> lqw = buildQueryWrapper(bo);
Page<TdMeterRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的和房间的关联列表
*
* @param bo 查询条件
* @return 和房间的关联列表
*/
@Override
public List<TdMeterRoomVo> queryList(TdMeterRoomBo bo) {
LambdaQueryWrapper<TdMeterRoom> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TdMeterRoom> buildQueryWrapper(TdMeterRoomBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TdMeterRoom> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TdMeterRoom::getId);
lqw.eq(bo.getMeterId() != null, TdMeterRoom::getMeterId, bo.getMeterId());
lqw.eq(bo.getRoomId() != null, TdMeterRoom::getRoomId, bo.getRoomId());
return lqw;
}
/**
* 新增和房间的关联
*
* @param bo 和房间的关联
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TdMeterRoomBo bo) {
TdMeterRoom add = MapstructUtils.convert(bo, TdMeterRoom.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改和房间的关联
*
* @param bo 和房间的关联
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TdMeterRoomBo bo) {
TdMeterRoom update = MapstructUtils.convert(bo, TdMeterRoom.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TdMeterRoom entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除和房间的关联信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public Boolean insertBatch(List<TdMeterRoom> rels) {
return baseMapper.insertBatch(rels);
}
@Override
public Integer deleteByMeterId(Long meterId) {
Assert.notNull(meterId, "表id不能为null");
LambdaUpdateWrapper<TdMeterRoom> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TdMeterRoom::getMeterId, meterId);
return baseMapper.delete(updateWrapper);
}
}

186
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdMeterServiceImpl.java
View File

@@ -1,186 +0,0 @@
package org.dromara.sis.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.TdMeter;
import org.dromara.sis.domain.TdMeterRoom;
import org.dromara.sis.domain.bo.TdMeterBo;
import org.dromara.sis.domain.vo.TdMeterVo;
import org.dromara.sis.mapper.TdMeterMapper;
import org.dromara.sis.service.ITdMeterRoomService;
import org.dromara.sis.service.ITdMeterService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 水电气Service业务层处理
*
* @author LionLi
* @date 2025-06-19
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TdMeterServiceImpl implements ITdMeterService {
private final TdMeterMapper baseMapper;
private final ITdMeterRoomService meterRoomService;
/**
* 查询水电气
*
* @param id 主键
* @return 水电气
*/
@Override
public TdMeterVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询水电气列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 水电气分页列表
*/
@Override
public TableDataInfo<TdMeterVo> queryPageList(TdMeterBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TdMeter> lqw = buildQueryWrapper(bo);
Page<TdMeterVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的水电气列表
*
* @param bo 查询条件
* @return 水电气列表
*/
@Override
public List<TdMeterVo> queryList(TdMeterBo bo) {
LambdaQueryWrapper<TdMeter> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TdMeter> buildQueryWrapper(TdMeterBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TdMeter> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TdMeter::getId);
lqw.like(StringUtils.isNotBlank(bo.getMeterName()), TdMeter::getMeterName, bo.getMeterName());
lqw.eq(StringUtils.isNotBlank(bo.getMeterCode()), TdMeter::getMeterCode, bo.getMeterCode());
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdMeter::getFactoryNo, bo.getFactoryNo());
lqw.eq(bo.getMeterType() != null, TdMeter::getMeterType, bo.getMeterType());
lqw.eq(bo.getMeterPurpose() != null, TdMeter::getMeterPurpose, bo.getMeterPurpose());
lqw.eq(bo.getShareType() != null, TdMeter::getShareType, bo.getShareType());
lqw.eq(bo.getPayType() != null, TdMeter::getPayType, bo.getPayType());
return lqw;
}
/**
* 新增水电气
*
* @param bo 水电气
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(TdMeterBo bo) {
TdMeter add = MapstructUtils.convert(bo, TdMeter.class);
validEntityBeforeSave(add);
// 写入表信息
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
// 写入表和房间的关联信息
List<TdMeterRoom> collect = bo.getRoomIds().stream().map(item -> {
TdMeterRoom rel = new TdMeterRoom();
rel.setMeterId(bo.getId());
rel.setRoomId(item);
return rel;
}).collect(Collectors.toList());
return meterRoomService.insertBatch(collect);
}
/**
* 修改水电气
*
* @param bo 水电气
* @return 是否修改成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(TdMeterBo bo) {
TdMeter update = MapstructUtils.convert(bo, TdMeter.class);
validEntityBeforeSave(update);
boolean b = baseMapper.updateById(update) > 0;
// 如果关联的房间列表没有发生变化，则不修改
if (b && CollUtil.isNotEmpty(bo.getRoomIds())) {
// 删除已有的关联关系
int num = meterRoomService.deleteByMeterId(bo.getId());
log.info("删除智能表和房间关联数据条数: {}", num);
// 建立新的关系
// 写入表和房间的关联信息
List<TdMeterRoom> collect = bo.getRoomIds().stream().map(item -> {
TdMeterRoom rel = new TdMeterRoom();
rel.setMeterId(bo.getId());
rel.setRoomId(item);
return rel;
}).collect(Collectors.toList());
Boolean b1 = meterRoomService.insertBatch(collect);
log.info("批量写入智能表和房间的关联关系，result={}", b1);
}
return b;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TdMeter entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除水电气信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public Boolean operate(Long meterId, Integer onOff) {
// 校验当前表是否存在
TdMeterVo tdMeterVo = queryById(meterId);
if (tdMeterVo == null) {
throw new ServiceException("只能表不存在");
}
// todo 下发表操作
// todo 如果同步的情况下还需要更新表信息
return true;
}
}