From afbfc9d7fe2c7767b24d87d925adf4691dc5be6b Mon Sep 17 00:00:00 2001 From: mocheng <3057647414@qq.com> Date: Tue, 24 Jun 2025 17:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E6=B4=81=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E8=B5=84=E4=BA=A7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- .../controller/AssetTypeController.java | 106 ++++++++++++++ .../CleanserverOrderController.java | 106 ++++++++++++++ .../dromara/property/domain/AssetType.java | 56 ++++++++ .../dromara/property/domain/CleanOrder.java | 5 + .../property/domain/CleanserverOrder.java | 41 ++++++ .../property/domain/TbAccessControl.java | 8 +- .../property/domain/bo/AssetTypeBo.java | 40 ++++++ .../dromara/property/domain/bo/CleanBo.java | 9 ++ .../property/domain/bo/CleanOrderBo.java | 9 +- .../domain/bo/CleanserverOrderBo.java | 40 ++++++ .../property/domain/bo/TbAccessControlBo.java | 8 +- .../property/domain/vo/AssetTypeVo.java | 62 ++++++++ .../property/domain/vo/CleanOrderVo.java | 13 +- .../domain/vo/CleanserverOrderVo.java | 50 +++++++ .../property/domain/vo/TbAccessControlVo.java | 8 +- .../property/mapper/AssetTypeMapper.java | 15 ++ .../mapper/CleanserverOrderMapper.java | 15 ++ .../property/service/IAssetTypeService.java | 69 +++++++++ .../service/ICleanserverOrderService.java | 69 +++++++++ .../service/impl/AssetTypeServiceImpl.java | 133 +++++++++++++++++ .../service/impl/CleanOrderServiceImpl.java | 31 +++- .../impl/CleanserverOrderServiceImpl.java | 134 ++++++++++++++++++ .../impl/TbAccessControlServiceImpl.java | 2 +- .../mapper/Property/AssetTypeMapper.xml | 7 + .../Property/CleanserverOrderMapper.xml | 7 + 26 files changed, 1025 insertions(+), 26 deletions(-) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AssetTypeController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AssetType.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanserverOrder.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AssetTypeBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetTypeVo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAssetTypeService.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml diff --git a/pom.xml b/pom.xml index d702f67f..1d8506ee 100644 --- a/pom.xml +++ b/pom.xml @@ -73,10 +73,10 @@ dev - 127.0.0.1:8848 - 127.0.0.1:4560 - - + + + 47.109.37.87:8848 + 47.109.37.87:4560 DEFAULT_GROUP DEFAULT_GROUP nacos diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AssetTypeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AssetTypeController.java new file mode 100644 index 00000000..3994cee1 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AssetTypeController.java @@ -0,0 +1,106 @@ +package org.dromara.property.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.property.domain.vo.AssetTypeVo; +import org.dromara.property.domain.bo.AssetTypeBo; +import org.dromara.property.service.IAssetTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 资产类型 + * 前端访问路由地址为:/property/assetType + * + * @author mocheng + * @date 2025-06-23 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/assetType") +public class AssetTypeController extends BaseController { + + private final IAssetTypeService assetTypeService; + + /** + * 查询资产类型列表 + */ + @SaCheckPermission("property:assetType:list") + @GetMapping("/list") + public TableDataInfo list(AssetTypeBo bo, PageQuery pageQuery) { + return assetTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出资产类型列表 + */ + @SaCheckPermission("property:assetType:export") + @Log(title = "资产类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(AssetTypeBo bo, HttpServletResponse response) { + List list = assetTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "资产类型", AssetTypeVo.class, response); + } + + /** + * 获取资产类型详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:assetType:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(assetTypeService.queryById(id)); + } + + /** + * 新增资产类型 + */ + @SaCheckPermission("property:assetType:add") + @Log(title = "资产类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody AssetTypeBo bo) { + return toAjax(assetTypeService.insertByBo(bo)); + } + + /** + * 修改资产类型 + */ + @SaCheckPermission("property:assetType:edit") + @Log(title = "资产类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody AssetTypeBo bo) { + return toAjax(assetTypeService.updateByBo(bo)); + } + + /** + * 删除资产类型 + * + * @param ids 主键串 + */ + @SaCheckPermission("property:assetType:remove") + @Log(title = "资产类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(assetTypeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java new file mode 100644 index 00000000..424fe27a --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java @@ -0,0 +1,106 @@ +package org.dromara.property.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.property.domain.vo.CleanserverOrderVo; +import org.dromara.property.domain.bo.CleanserverOrderBo; +import org.dromara.property.service.ICleanserverOrderService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 保洁服务订单 + * 前端访问路由地址为:/property/cleanServerOrder + * + * @author mocheng + * @date 2025-06-23 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cleanServerOrder") +public class CleanserverOrderController extends BaseController { + + private final ICleanserverOrderService cleanserverOrderService; + + /** + * 查询保洁服务订单列表 + */ + @SaCheckPermission("property:cleanServerOrder:list") + @GetMapping("/list") + public TableDataInfo list(CleanserverOrderBo bo, PageQuery pageQuery) { + return cleanserverOrderService.queryPageList(bo, pageQuery); + } + + /** + * 导出保洁服务订单列表 + */ + @SaCheckPermission("property:cleanServerOrder:export") + @Log(title = "保洁服务订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(CleanserverOrderBo bo, HttpServletResponse response) { + List list = cleanserverOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "保洁服务订单", CleanserverOrderVo.class, response); + } + + /** + * 获取保洁服务订单详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:cleanServerOrder:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(cleanserverOrderService.queryById(id)); + } + + /** + * 新增保洁服务订单 + */ + @SaCheckPermission("property:cleanServerOrder:add") + @Log(title = "保洁服务订单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody CleanserverOrderBo bo) { + return toAjax(cleanserverOrderService.insertByBo(bo)); + } + + /** + * 修改保洁服务订单 + */ + @SaCheckPermission("property:cleanServerOrder:edit") + @Log(title = "保洁服务订单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody CleanserverOrderBo bo) { + return toAjax(cleanserverOrderService.updateByBo(bo)); + } + + /** + * 删除保洁服务订单 + * + * @param ids 主键串 + */ + @SaCheckPermission("property:cleanServerOrder:remove") + @Log(title = "保洁服务订单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(cleanserverOrderService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AssetType.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AssetType.java new file mode 100644 index 00000000..27b90f83 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AssetType.java @@ -0,0 +1,56 @@ +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; + +/** + * 资产类型对象 asset_type + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("asset_type") +public class AssetType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 分类名称 + */ + private String assetTypeName; + + /** + * 排序 + */ + private Long sort; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java index 6e55e892..17be3cc2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java @@ -89,6 +89,11 @@ public class CleanOrder extends TenantEntity { */ private String persion; + /** + * 状态 + */ + private int state; + /** * 联系电话 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanserverOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanserverOrder.java new file mode 100644 index 00000000..7967c59f --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanserverOrder.java @@ -0,0 +1,41 @@ +package org.dromara.property.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 保洁服务订单对象 cleanserver_order + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("cleanserver_order") +public class CleanserverOrder extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 保洁服务id + */ + private Long cleanServerId; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java index f7b003f1..39370b60 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java @@ -22,7 +22,7 @@ public class TbAccessControl extends TenantEntity { private static final long serialVersionUID = 1L; /** - * + * */ @TableId(value = "id") private Long id; @@ -53,17 +53,17 @@ public class TbAccessControl extends TenantEntity { private String accessIp; /** - * + * */ private Long accessPort; /** * 门禁设备类型 */ - private Long accssType; + private Long accessType; /** - * + * */ private String factoryCode; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AssetTypeBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AssetTypeBo.java new file mode 100644 index 00000000..be8b16b1 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AssetTypeBo.java @@ -0,0 +1,40 @@ +package org.dromara.property.domain.bo; + +import org.dromara.property.domain.AssetType; +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.*; + +/** + * 资产类型业务对象 asset_type + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AssetType.class, reverseConvertGenerate = false) +public class AssetTypeBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分类名称 + */ + private String assetTypeName; + + /** + * 排序 + */ + private Long sort; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java index f2312d01..cbf39975 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java @@ -1,5 +1,6 @@ package org.dromara.property.domain.bo; +import org.dromara.common.core.validate.enumd.EnumPattern; import org.dromara.property.domain.Clean; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -9,6 +10,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.List; + /** * 保洁管理业务对象 clean * @@ -32,6 +35,12 @@ public class CleanBo extends BaseEntity { @NotBlank(message = "劳务名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String name; + /** + * 劳务id + */ + @NotBlank(message = "劳务id不能为空", groups = { AddGroup.class, EditGroup.class }) + private List ids; + /** * 计量单位 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java index a817e8e6..c2e11d0d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; /** @@ -43,7 +45,7 @@ public class CleanOrderBo extends BaseEntity { * 保洁id */ @NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long cleanId; + private List cleanIds; /** * 名称 @@ -104,5 +106,10 @@ public class CleanOrderBo extends BaseEntity { @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) private String phone; + /** + * 状态 + */ + private int state; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java new file mode 100644 index 00000000..70667e5a --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java @@ -0,0 +1,40 @@ +package org.dromara.property.domain.bo; + +import org.dromara.property.domain.CleanserverOrder; +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.*; + +/** + * 保洁服务订单业务对象 cleanserver_order + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = CleanserverOrder.class, reverseConvertGenerate = false) +public class CleanserverOrderBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 保洁服务id + */ + private Long cleanServerId; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java index 756934bc..6533608f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.*; public class TbAccessControlBo extends BaseEntity { /** - * + * */ @NotNull(message = "不能为空", groups = { EditGroup.class }) private Long id; @@ -56,7 +56,7 @@ public class TbAccessControlBo extends BaseEntity { private String accessIp; /** - * + * */ private Long accessPort; @@ -64,10 +64,10 @@ public class TbAccessControlBo extends BaseEntity { * 门禁设备类型 */ @NotNull(message = "门禁设备类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long accssType; + private Long accessType; /** - * + * */ @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) private String factoryCode; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetTypeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetTypeVo.java new file mode 100644 index 00000000..19c444bf --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AssetTypeVo.java @@ -0,0 +1,62 @@ +package org.dromara.property.domain.vo; + +import org.dromara.property.domain.AssetType; +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; + + + +/** + * 资产类型视图对象 asset_type + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AssetType.class) +public class AssetTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 分类名称 + */ + @ExcelProperty(value = "分类名称") + private String assetTypeName; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private String createBy; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java index 53805d68..584d5c15 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java @@ -2,6 +2,7 @@ package org.dromara.property.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import kotlin.text.UStringsKt; import org.dromara.property.domain.CleanOrder; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -13,7 +14,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -51,8 +52,8 @@ public class CleanOrderVo implements Serializable { /** * 保洁id */ - @ExcelProperty(value = "保洁id") - private Long cleanId; + @ExcelProperty(value = "保洁") + private List clean; /** * 名称 @@ -114,5 +115,11 @@ public class CleanOrderVo implements Serializable { @ExcelProperty(value = "联系电话") private String phone; + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private int state; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java new file mode 100644 index 00000000..55bcc360 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java @@ -0,0 +1,50 @@ +package org.dromara.property.domain.vo; + +import org.dromara.property.domain.CleanserverOrder; +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; + + + +/** + * 保洁服务订单视图对象 cleanserver_order + * + * @author mocheng + * @date 2025-06-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = CleanserverOrder.class) +public class CleanserverOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 订单id + */ + @ExcelProperty(value = "订单id") + private Long orderId; + + /** + * 保洁服务id + */ + @ExcelProperty(value = "保洁服务id") + private Long cleanServerId; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java index 563b0e90..b61c9162 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java @@ -29,7 +29,7 @@ public class TbAccessControlVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; @@ -65,7 +65,7 @@ public class TbAccessControlVo implements Serializable { private String accessIp; /** - * + * */ @ExcelProperty(value = "") private Long accessPort; @@ -74,10 +74,10 @@ public class TbAccessControlVo implements Serializable { * 门禁设备类型 */ @ExcelProperty(value = "门禁设备类型") - private Long accssType; + private Long accessType; /** - * + * */ @ExcelProperty(value = "") private String factoryCode; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java new file mode 100644 index 00000000..a22c4690 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.property.mapper; + +import org.dromara.property.domain.AssetType; +import org.dromara.property.domain.vo.AssetTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 资产类型Mapper接口 + * + * @author mocheng + * @date 2025-06-23 + */ +public interface AssetTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java new file mode 100644 index 00000000..5bdb2d52 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java @@ -0,0 +1,15 @@ +package org.dromara.property.mapper; + +import org.dromara.property.domain.CleanserverOrder; +import org.dromara.property.domain.vo.CleanserverOrderVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 保洁服务订单Mapper接口 + * + * @author mocheng + * @date 2025-06-23 + */ +public interface CleanserverOrderMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAssetTypeService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAssetTypeService.java new file mode 100644 index 00000000..edb5d093 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAssetTypeService.java @@ -0,0 +1,69 @@ +package org.dromara.property.service; + +import org.dromara.property.domain.AssetType; +import org.dromara.property.domain.vo.AssetTypeVo; +import org.dromara.property.domain.bo.AssetTypeBo; +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 mocheng + * @date 2025-06-23 + */ +public interface IAssetTypeService { + + /** + * 查询资产类型 + * + * @param id 主键 + * @return 资产类型 + */ + AssetTypeVo queryById(Long id); + + /** + * 分页查询资产类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 资产类型分页列表 + */ + TableDataInfo queryPageList(AssetTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的资产类型列表 + * + * @param bo 查询条件 + * @return 资产类型列表 + */ + List queryList(AssetTypeBo bo); + + /** + * 新增资产类型 + * + * @param bo 资产类型 + * @return 是否新增成功 + */ + Boolean insertByBo(AssetTypeBo bo); + + /** + * 修改资产类型 + * + * @param bo 资产类型 + * @return 是否修改成功 + */ + Boolean updateByBo(AssetTypeBo bo); + + /** + * 校验并批量删除资产类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java new file mode 100644 index 00000000..adc609a3 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java @@ -0,0 +1,69 @@ +package org.dromara.property.service; + +import org.dromara.property.domain.CleanserverOrder; +import org.dromara.property.domain.vo.CleanserverOrderVo; +import org.dromara.property.domain.bo.CleanserverOrderBo; +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 mocheng + * @date 2025-06-23 + */ +public interface ICleanserverOrderService { + + /** + * 查询保洁服务订单 + * + * @param id 主键 + * @return 保洁服务订单 + */ + CleanserverOrderVo queryById(Long id); + + /** + * 分页查询保洁服务订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保洁服务订单分页列表 + */ + TableDataInfo queryPageList(CleanserverOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的保洁服务订单列表 + * + * @param bo 查询条件 + * @return 保洁服务订单列表 + */ + List queryList(CleanserverOrderBo bo); + + /** + * 新增保洁服务订单 + * + * @param bo 保洁服务订单 + * @return 是否新增成功 + */ + Boolean insertByBo(CleanserverOrderBo bo); + + /** + * 修改保洁服务订单 + * + * @param bo 保洁服务订单 + * @return 是否修改成功 + */ + Boolean updateByBo(CleanserverOrderBo bo); + + /** + * 校验并批量删除保洁服务订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java new file mode 100644 index 00000000..13ef526d --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java @@ -0,0 +1,133 @@ +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; +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.property.domain.bo.AssetTypeBo; +import org.dromara.property.domain.vo.AssetTypeVo; +import org.dromara.property.domain.AssetType; +import org.dromara.property.mapper.AssetTypeMapper; +import org.dromara.property.service.IAssetTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 资产类型Service业务层处理 + * + * @author mocheng + * @date 2025-06-23 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AssetTypeServiceImpl implements IAssetTypeService { + + private final AssetTypeMapper baseMapper; + + /** + * 查询资产类型 + * + * @param id 主键 + * @return 资产类型 + */ + @Override + public AssetTypeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询资产类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 资产类型分页列表 + */ + @Override + public TableDataInfo queryPageList(AssetTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的资产类型列表 + * + * @param bo 查询条件 + * @return 资产类型列表 + */ + @Override + public List queryList(AssetTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(AssetTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(AssetType::getId); + lqw.like(StringUtils.isNotBlank(bo.getAssetTypeName()), AssetType::getAssetTypeName, bo.getAssetTypeName()); + lqw.eq(bo.getSort() != null, AssetType::getSort, bo.getSort()); + return lqw; + } + + /** + * 新增资产类型 + * + * @param bo 资产类型 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(AssetTypeBo bo) { + AssetType add = MapstructUtils.convert(bo, AssetType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改资产类型 + * + * @param bo 资产类型 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(AssetTypeBo bo) { + AssetType update = MapstructUtils.convert(bo, AssetType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(AssetType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除资产类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java index 039d625a..2b3999b6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java @@ -1,5 +1,8 @@ package org.dromara.property.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.Mapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -9,16 +12,20 @@ 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.CleanserverOrder; +import org.dromara.property.mapper.CleanserverOrderMapper; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CleanOrderBo; import org.dromara.property.domain.vo.CleanOrderVo; import org.dromara.property.domain.CleanOrder; import org.dromara.property.mapper.CleanOrderMapper; import org.dromara.property.service.ICleanOrderService; +import org.stringtemplate.v4.ST; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; +import java.util.stream.Collectors; + +import static kotlin.reflect.jvm.internal.impl.builtins.StandardNames.FqNames.list; /** * 保洁订单Service业务层处理 @@ -32,6 +39,7 @@ import java.util.Collection; public class CleanOrderServiceImpl implements ICleanOrderService { private final CleanOrderMapper baseMapper; + private final CleanserverOrderMapper cleanserverOrderMapper; /** * 查询保洁订单 @@ -69,14 +77,14 @@ public class CleanOrderServiceImpl implements ICleanOrderService { LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(CleanOrderBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(CleanOrder::getId); lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation()); lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea()); - lqw.eq(bo.getCleanId() != null, CleanOrder::getCleanId, bo.getCleanId()); + +// lqw.eq(bo.getCleanIds() != null, CleanOrder::getCleanId, bo.getCleanIds()); lqw.like(StringUtils.isNotBlank(bo.getName()), CleanOrder::getName, bo.getName()); lqw.eq(bo.getPrices() != null, CleanOrder::getPrices, bo.getPrices()); lqw.eq(bo.getSumPeices() != null, CleanOrder::getSumPeices, bo.getSumPeices()); @@ -84,9 +92,11 @@ public class CleanOrderServiceImpl implements ICleanOrderService { lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime()); lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime()); lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState()); lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit()); lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone()); + return lqw; } @@ -100,9 +110,20 @@ public class CleanOrderServiceImpl implements ICleanOrderService { public Boolean insertByBo(CleanOrderBo bo) { CleanOrder add = MapstructUtils.convert(bo, CleanOrder.class); validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); + ArrayList cleanserverOrders = new ArrayList<>(); + for (Long cleanId : bo.getCleanIds()) { + CleanserverOrder cleanserverOrder = new CleanserverOrder(); + cleanserverOrder.setCleanServerId(cleanId); + cleanserverOrder.setOrderId(add.getId()); + CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class); + cleanserverOrders.add(convert); + } + cleanserverOrderMapper.insert(cleanserverOrders); + } return flag; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java new file mode 100644 index 00000000..a0ebe9c0 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java @@ -0,0 +1,134 @@ +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; +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.property.domain.bo.CleanserverOrderBo; +import org.dromara.property.domain.vo.CleanserverOrderVo; +import org.dromara.property.domain.CleanserverOrder; +import org.dromara.property.mapper.CleanserverOrderMapper; +import org.dromara.property.service.ICleanserverOrderService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 保洁服务订单Service业务层处理 + * + * @author mocheng + * @date 2025-06-23 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class CleanserverOrderServiceImpl implements ICleanserverOrderService { + + private final CleanserverOrderMapper baseMapper; + + /** + * 查询保洁服务订单 + * + * @param id 主键 + * @return 保洁服务订单 + */ + @Override + public CleanserverOrderVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询保洁服务订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 保洁服务订单分页列表 + */ + @Override + public TableDataInfo queryPageList(CleanserverOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的保洁服务订单列表 + * + * @param bo 查询条件 + * @return 保洁服务订单列表 + */ + @Override + public List queryList(CleanserverOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List cleanserverOrderVos = baseMapper.selectVoList(lqw); + return cleanserverOrderVos; + } + + private LambdaQueryWrapper buildQueryWrapper(CleanserverOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(CleanserverOrder::getId); + lqw.eq(bo.getOrderId() != null, CleanserverOrder::getOrderId, bo.getOrderId()); + lqw.eq(bo.getCleanServerId() != null, CleanserverOrder::getCleanServerId, bo.getCleanServerId()); + return lqw; + } + + /** + * 新增保洁服务订单 + * + * @param bo 保洁服务订单 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(CleanserverOrderBo bo) { + CleanserverOrder add = MapstructUtils.convert(bo, CleanserverOrder.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改保洁服务订单 + * + * @param bo 保洁服务订单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(CleanserverOrderBo bo) { + CleanserverOrder update = MapstructUtils.convert(bo, CleanserverOrder.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(CleanserverOrder entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除保洁服务订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java index acb16672..d714401a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java @@ -80,7 +80,7 @@ public class TbAccessControlServiceImpl implements ITbAccessControlService { lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), TbAccessControl::getBuildingCode, bo.getBuildingCode()); lqw.eq(StringUtils.isNotBlank(bo.getAccessIp()), TbAccessControl::getAccessIp, bo.getAccessIp()); lqw.eq(bo.getAccessPort() != null, TbAccessControl::getAccessPort, bo.getAccessPort()); - lqw.eq(bo.getAccssType() != null, TbAccessControl::getAccssType, bo.getAccssType()); + lqw.eq(bo.getAccessType() != null, TbAccessControl::getAccessType, bo.getAccessType()); lqw.eq(StringUtils.isNotBlank(bo.getFactoryCode()), TbAccessControl::getFactoryCode, bo.getFactoryCode()); lqw.eq(bo.getControlType() != null, TbAccessControl::getControlType, bo.getControlType()); lqw.eq(StringUtils.isNotBlank(bo.getControlCode()), TbAccessControl::getControlCode, bo.getControlCode()); diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml new file mode 100644 index 00000000..ebe6a7c3 --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml new file mode 100644 index 00000000..75ad37fa --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml @@ -0,0 +1,7 @@ + + + + +