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

.gitea/workflows/dev.yml

@@ -1,6 +1,8 @@
 name: Gitea Actions Demo
 run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
+on:
+  push:
+    branches: [ master ]  # 当main分支有推送时触发
 jobs:
   Explore-Gitea-Actions:
     runs-on: ubuntu-latest
@@ -13,7 +15,7 @@ jobs:
       # - name: Checkout code
       #   uses: actions/checkout@v4  # 拉取代码到工作目录
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: http://47.109.37.87:3000/bichangxiong/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -23,12 +25,8 @@ jobs:
         with:
           maven-version: 3.8.2
 
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-
       - name: Install dependencies
-        run: mvn clean package -DskipTests
+        run: mvn clean package -DskipTests -Dmaven.repo.local=/home/runner/maven-repo
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7
         with:

lib/hik/linux64/HCNetSDK_Log_Switch.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="GB2312"?>
+<SdkLocal>
+	<SdkLog>
+        <logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
+        <logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
+        <autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
+    </SdkLog>
+	<HeartbeatCfg>
+		<Interval>120</Interval> <!-- 心跳时间间隔，单位秒，等于0，使用默认值120s，取值范围为[30, 120] 小于30s，间隔为30s，大于120s，间隔为120s-->
+		<Count>1</Count> 	<!-- 触发异常回调需要心跳交互异常的次数，等于0，使用默认值1次-->
+	</HeartbeatCfg>
+</SdkLocal>

lib/hik/win64/ClientDemoDll/ReadMe.txt

@@ -0,0 +1 @@
+The dll in this directory£¨iconv.dll,libxml2.dll,zlib1.dll,calib.dll£©only used in ClientDemo.

lib/hik/win64/DeviceCfg.json

@@ -0,0 +1,25 @@
+{
+	"Devices":	[{
+			"ID":	0,
+			"SerialNumber":	"DS-K221020240130V010006CHGB5685986",
+			"ChannelNumber":	0,
+			"StartChannel":	1,
+			"AlarmInNum":	0,
+			"AlarmOutNum":	2,
+			"IPChanNum":	0,
+			"MirrorChanNum":	0,
+			"StartMirrorChanNo":	0,
+			"LocalNodeName":	"192.168.110.196",
+			"DeviceType":	864,
+			"DiskNum":	0,
+			"LoginUserName":	"admin",
+			"LoginUserPwd":	"qweasd123",
+			"DeviceIP":	"192.168.110.196",
+			"DeviceMultiIP":	"0.0.0.0",
+			"DevicePort":	8000,
+			"DeviceName":	"",
+			"LoginMode":	0,
+			"Https":	0,
+			"Channels":	[]
+		}]
+}

pom.xml

@@ -58,7 +58,8 @@
         <warm-flow.version>1.7.3</warm-flow.version>
         <!-- mq配置 -->
         <rocketmq.version>2.3.0</rocketmq.version>
-
+        <!--  hik sdk 配置  -->
+        <hik-sdk.version>1.0</hik-sdk.version>
         <!-- 插件版本 -->
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
@@ -73,10 +74,8 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-<!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
-<!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
-                <nacos.server>47.109.37.87:8848</nacos.server>
-                <logstash.address>47.109.37.87:4560</logstash.address>
+                <nacos.server>127.0.0.1:8848</nacos.server>
+                <logstash.address>127.0.0.1:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
@@ -92,8 +91,8 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-<!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
-<!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
+                <!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
+                <!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
                 <nacos.server>47.109.37.87:8848</nacos.server>
                 <logstash.address>47.109.37.87:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
@@ -108,15 +107,15 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-<!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
-<!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
+                <!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
+                <!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
                 <nacos.server>47.109.37.87:8848</nacos.server>
                 <logstash.address>47.109.37.87:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
-<!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
+                <!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
 
 
             </properties>
@@ -376,6 +375,18 @@
                 <version>${mapstruct-plus.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.hik</groupId>
+                <artifactId>examples</artifactId>
+                <version>${hik-sdk.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.hik</groupId>
+                <artifactId>jna</artifactId>
+                <version>${hik-sdk.version}</version>
+            </dependency>
+
             <!--消息队列-->
             <dependency>
                 <groupId>org.apache.rocketmq</groupId>

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteUnitService.java

@@ -0,0 +1,13 @@
+package org.dromara.property.api;
+
+import org.dromara.property.api.domain.vo.RemoteUnitVo;
+
+/**
+ * 物业楼层远程服务
+ * @author lxj
+ */
+public interface RemoteUnitService {
+
+    RemoteUnitVo queryUnitById(Long id);
+
+}

ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteUnitVo.java

@@ -0,0 +1,51 @@
+package org.dromara.property.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 单元信息
+ *
+ * @author lxj
+ */
+@Data
+public class RemoteUnitVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -11L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    private Long buildingId;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 单元层数
+     */
+    private Integer floorCount;
+
+    /**
+     * 单元户数
+     */
+    private Integer householdCount;
+
+    /**
+     * 楼梯数量
+     */
+    private Integer stairCount;
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java

@@ -15,4 +15,8 @@ public interface CodePrefixConstants {
      * 人像编码前缀
      */
     String PERSON_LIB_IMAGE_CODE_PREFIX = "102";
+
+    String ELEVATOR_CONTROL_CODE_PREFIX = "E01";
+
+
 }

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

@@ -16,6 +16,7 @@ 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.property.domain.bo.ServiceWorkOrdersBo;
+import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
 import org.dromara.property.service.IServiceWorkOrdersService;
 import org.springframework.validation.annotation.Validated;
@@ -41,40 +42,40 @@ public class ServiceWorkOrdersController extends BaseController {
     /**
      * 查询【工单处理】列表
      */
-    @SaCheckPermission("system:workOrders:list")
+    //@SaCheckPermission("system:workOrders:list")
     @GetMapping("/list")
     public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
         return serviceWorkOrdersService.queryPageList(bo, pageQuery);
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出【工单处理】列表
      */
-    @SaCheckPermission("system:workOrders:export")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+   // @SaCheckPermission("system:workOrders:export")
+    @Log(title = "【工单处理】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ServiceWorkOrdersBo bo, HttpServletResponse response) {
         List<ServiceWorkOrdersVo> list = serviceWorkOrdersService.queryList(bo);
-        ExcelUtil.exportExcel(list, "【请填写功能名称】", ServiceWorkOrdersVo.class, response);
+        ExcelUtil.exportExcel(list, "【工单处理】", ServiceWorkOrdersVo.class, response);
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【工单处理】详细信息
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:workOrders:query")
+   // @SaCheckPermission("system:workOrders:query")
     @GetMapping("/{id}")
-    public R<ServiceWorkOrdersVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<ServiceWorkOrdersInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable("id") Long id) {
         return R.ok(serviceWorkOrdersService.queryById(id));
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增【工单处理】
      */
-    @SaCheckPermission("system:workOrders:add")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+   // @SaCheckPermission("system:workOrders:add")
+    @Log(title = "【工单处理】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
@@ -82,10 +83,10 @@ public class ServiceWorkOrdersController extends BaseController {
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改【工单处理】
      */
-    @SaCheckPermission("system:workOrders:edit")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    //@SaCheckPermission("system:workOrders:edit")
+    @Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
@@ -93,12 +94,12 @@ public class ServiceWorkOrdersController extends BaseController {
     }
 
     /**
-     * 删除【请填写功能名称】
+     * 删除【工单处理】
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:workOrders:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+   // @SaCheckPermission("system:workOrders:remove")
+    @Log(title = "【工单处理】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable("ids") Long[] ids) {

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.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.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
+import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
+import org.dromara.property.service.IServiceWorkOrdersTypeService;
+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.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 【工单类型】
+ * 前端访问路由地址为:/system/workOrdersType
+ *
+ * @author mocheng
+ * @date 2025-07-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workOrdersType")
+public class ServiceWorkOrdersTypeController extends BaseController {
+
+    private final IServiceWorkOrdersTypeService serviceWorkOrdersTypeService;
+
+    /**
+     * 查询【工单类型】列表
+     */
+    @SaCheckPermission("system:workOrdersType:list")
+    @GetMapping("/list")
+    public TableDataInfo<ServiceWorkOrdersTypeVo> list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) {
+        return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出【工单类型】列表
+     */
+    @SaCheckPermission("system:workOrdersType:export")
+    @Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) {
+        List<ServiceWorkOrdersTypeVo> list = serviceWorkOrdersTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【工单类型】", ServiceWorkOrdersTypeVo.class, response);
+    }
+
+    /**
+     * 获取【工单类型】详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:workOrdersType:query")
+    @GetMapping("/{id}")
+    public R<ServiceWorkOrdersTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(serviceWorkOrdersTypeService.queryById(id));
+    }
+
+    /**
+     * 新增【工单类型】
+     */
+    @SaCheckPermission("system:workOrdersType:add")
+    @Log(title = "【新增工单类型】", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) {
+        return toAjax(serviceWorkOrdersTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改【工单类型】
+     */
+    @SaCheckPermission("system:workOrdersType:edit")
+    @Log(title = "【工单类型】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) {
+        return toAjax(serviceWorkOrdersTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除【工单类型】
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:workOrdersType:remove")
+    @Log(title = "【工单类型】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(serviceWorkOrdersTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -37,7 +39,7 @@ public class ServerBooking extends TenantEntity {
     /**
      * 预约数量
      */
-    private Long serverNum;
+    private Integer serverNum;
 
     /**
      * 预约类型
@@ -67,17 +69,17 @@ public class ServerBooking extends TenantEntity {
     /**
      * 预约价格
      */
-    private Long bookingPrice;
+    private BigDecimal bookingPrice;
 
     /**
      * 实付价格
      */
-    private Long payPrice;
+    private BigDecimal payPrice;
 
     /**
      * 支付方式
      */
-    private Long payType;
+    private Integer payType;
 
     /**
      * 备注
@@ -87,7 +89,7 @@ public class ServerBooking extends TenantEntity {
     /**
      * 状态
      */
-    private Long state;
+    private Integer state;
 
     /**
      * 创建人id

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

@@ -42,12 +42,12 @@ public class ServiceWorkOrders extends TenantEntity {
     /**
      * 工单类型
      */
-    private Long type;
+    private Long  type;
 
     /**
      * 状态
      */
-    private Long status;
+    private Integer  status;
 
     /**
      * 派单时间
@@ -59,10 +59,6 @@ public class ServiceWorkOrders extends TenantEntity {
      */
     private String initiatorName;
 
-    /**
-     * 发起人手机号
-     */
-    private String initiatorPhone;
 
     /**
      * 处理人姓名
@@ -87,12 +83,12 @@ public class ServiceWorkOrders extends TenantEntity {
     /**
      * 评价
      */
-    private String serviceEvalua;
+    private Integer  serviceEvalua;
 
     /**
      * 是否超时
      */
-    private Long isTimeOut;
+    private Integer isTimeOut;
 
     /**
      * 创建人id
@@ -104,10 +100,5 @@ public class ServiceWorkOrders extends TenantEntity {
      */
     private Long updateById;
 
-    /**
-     * 搜索值
-     */
-    private String searchValue;
-
 
 }

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

@@ -0,0 +1,75 @@
+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;
+
+/**
+ * 【工单类型】对象 service_work_orders_type
+ *
+ * @author mocheng
+ * @date 2025-07-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("service_work_orders_type")
+public class ServiceWorkOrdersType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 工单类型编号
+     */
+    private String orderTypeNo;
+
+    /**
+     * 工单类型名称
+     */
+    private String orderTypeName;
+
+    /**
+     * 运作模式
+     */
+    private String operationMode;
+
+    /**
+     * 排序值
+     */
+    private Integer  sort;
+
+    /**
+     * 累计工单数量
+     */
+    private Integer  completionNumber;
+
+    /**
+     * 是否支持转单(0支持,1不支持)
+     */
+    private Integer  isTransfers;
+
+    /**
+     * 创建人id
+     */
+    private Long createById;
+
+    /**
+     * 更新人id
+     */
+    private Long updateById;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+}

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

@@ -46,7 +46,7 @@ public class MeetBo extends BaseEntity {
      * 容纳人数
      */
     @NotBlank(message = "容纳人数不能为空")
-    private Long personNumber;
+    private Integer personNumber;
 
     /**
      * 基础服务
@@ -61,11 +61,12 @@ public class MeetBo extends BaseEntity {
     /**
      * 增值服务是否启用
      */
-    private Long attach;
+    private Integer attach;
 
     /**
      * 负责人
      */
+    @NotBlank(message = "负责人不能为空")
     private String principals;
 
     /**

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

@@ -39,11 +39,6 @@ public class MeetBookingBo extends BaseEntity {
      */
     private Long meetId;
 
-    /**
-     * 会议室地址
-     */
-    private String meetLocation;
-
     /**
      * 所属单位
      */
@@ -54,10 +49,6 @@ public class MeetBookingBo extends BaseEntity {
      */
     private String person;
 
-    /**
-     * 联系方式
-     */
-    private String phone;
 
     /**
      * 预定开始时间

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

@@ -12,7 +12,7 @@ import org.dromara.property.domain.ServiceWorkOrders;
 import java.util.Date;
 
 /**
- * 【请填写功能名称】业务对象 service_work_orders
+ * 【工单处理】业务对象 service_work_orders
  *
  * @author mocheng
  * @date 2025-07-07
@@ -41,12 +41,12 @@ public class ServiceWorkOrdersBo extends BaseEntity {
     /**
      * 工单类型
      */
-    private Long type;
+    private Long  type;
 
     /**
      * 状态
      */
-    private Long status;
+    private Integer  status;
 
     /**
      * 派单时间
@@ -58,10 +58,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
      */
     private String initiatorName;
 
-    /**
-     * 发起人手机号
-     */
-    private String initiatorPhone;
 
     /**
      * 处理人姓名
@@ -86,12 +82,12 @@ public class ServiceWorkOrdersBo extends BaseEntity {
     /**
      * 评价
      */
-    private String serviceEvalua;
+    private Integer  serviceEvalua;
 
     /**
      * 是否超时
      */
-    private Long isTimeOut;
+    private Integer  isTimeOut;
 
     /**
      * 创建人id
@@ -103,10 +99,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
      */
     private Long updateById;
 
-    /**
-     * 搜索值
-     */
-    private String searchValue;
 
 
 }

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

@@ -0,0 +1,78 @@
+package org.dromara.property.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+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.property.domain.ServiceWorkOrdersType;
+
+/**
+ * 【工单类型】业务对象 service_work_orders_type
+ *
+ * @author mocheng
+ * @date 2025-07-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ServiceWorkOrdersType.class, reverseConvertGenerate = false)
+public class ServiceWorkOrdersTypeBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 工单类型编号
+     */
+    private String orderTypeNo;
+
+    /**
+     * 工单类型名称
+     */
+    @NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderTypeName;
+
+    /**
+     * 运作模式
+     */
+    @NotNull(message = "运作模式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String operationMode;
+
+    /**
+     * 排序值
+     */
+    @NotNull(message = "排序值不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer  sort;
+
+    /**
+     * 完成时效
+     */
+    @NotNull(message = "完成时效不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer  completionNumber;
+
+    /**
+     * 是否支持转单(0支持,1不支持)
+     */
+    private Integer  isTransfers;
+
+    /**
+     * 创建人id
+     */
+    private Long createById;
+
+    /**
+     * 更新人id
+     */
+    private Long updateById;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+}

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

@@ -59,6 +59,12 @@ public class MeetBookingAppointmentVo implements Serializable {
      */
     @ExcelProperty(value = "预定人名称")
     private String personName;
+    /**
+     * 联系方式
+     */
+    @ExcelProperty(value = "联系方式")
+    private String phone;
+
     /**
      * 会议室主题
      */

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

@@ -64,11 +64,21 @@ public class MeetBookingVo implements Serializable {
     @ExcelProperty(value = "所属单位")
     private String unit;
 
+    /**
+     * 所属单位名称
+     */
+    @ExcelProperty(value = "所属单位名称")
+    private String unitName;
     /**
      * 预定人
      */
     @ExcelProperty(value = "预定人")
     private String person;
+    /**
+     * 预定人名称
+     */
+    @ExcelProperty(value = "预定人名称")
+    private String personName;
 
     /**
      * 联系方式

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

@@ -0,0 +1,134 @@
+package org.dromara.property.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.property.domain.ServiceWorkOrders;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/9 17:25
+ * @Description:工单处理详情
+ **/
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ServiceWorkOrders.class)
+public class ServiceWorkOrdersInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 工单编号
+     */
+    @ExcelProperty(value = "工单编号")
+    private String orderNo;
+
+    /**
+     * 工单名称
+     */
+    @ExcelProperty(value = "工单名称")
+    private String orderName;
+
+    /**
+     * 工单类型
+     */
+    @ExcelProperty(value = "工单类型")
+    private Long type;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 派单时间
+     */
+    @ExcelProperty(value = "派单时间")
+    private Date dispatchTime;
+
+    /**
+     * 发起人姓名
+     */
+    @ExcelProperty(value = "发起人姓名")
+    private String initiatorName;
+    /**
+     * 发起人姓名文本
+     */
+    @ExcelProperty(value = "发起人姓名文本")
+    private String initiatorNameText;
+
+    /**
+     * 发起人手机号
+     */
+    @ExcelProperty(value = "发起人手机号")
+    private String initiatorPhone;
+
+    /**
+     * 处理人姓名
+     */
+    @ExcelProperty(value = "处理人姓名")
+    private String handler;
+    /**
+     * 处理人姓名文本
+     */
+    @ExcelProperty(value = "处理人姓名文本")
+    private String handlerText;
+
+    /**
+     * 处理人姓名电话
+     */
+    @ExcelProperty(value = "处理人电话")
+    private String handlerPhone;
+    /**
+     * 地址
+     */
+    @ExcelProperty(value = "地址")
+    private String location;
+
+    /**
+     * 计划完成时间
+     */
+    @ExcelProperty(value = "计划完成时间")
+    private Date planCompleTime;
+
+    /**
+     * 完成时间
+     */
+    @ExcelProperty(value = "完成时间")
+    private Date compleTime;
+
+    /**
+     * 评价
+     */
+    @ExcelProperty(value = "评价")
+    private String serviceEvalua;
+
+    /**
+     * 是否超时
+     */
+    @ExcelProperty(value = "是否超时")
+    private Integer isTimeOut;
+    /**
+     * 类型名称
+     */
+    @ExcelProperty(value = "类型名称")
+    private String typeName;
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+}

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

@@ -0,0 +1,89 @@
+package org.dromara.property.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.property.domain.ServiceWorkOrdersType;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 【工单类型】视图对象 service_work_orders_type
+ *
+ * @author mocheng
+ * @date 2025-07-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ServiceWorkOrdersType.class)
+public class ServiceWorkOrdersTypeVo implements Serializable {
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 工单类型编号
+     */
+    @ExcelProperty(value = "工单类型编号")
+    private String orderTypeNo;
+
+    /**
+     * 工单类型名称
+     */
+    @ExcelProperty(value = "工单类型名称")
+    private String orderTypeName;
+
+    /**
+     * 运作模式
+     */
+    @ExcelProperty(value = "运作模式")
+    private String operationMode;
+
+    /**
+     * 排序值
+     */
+    @ExcelProperty(value = "排序值")
+    private Integer sort;
+
+    /**
+     * 完成时效
+     */
+    @ExcelProperty(value = "完成时效")
+    private Integer completionNumber;
+
+    /**
+     * 是否支持转单(0支持,1不支持)
+     */
+    @ExcelProperty(value = "是否支持转单(0支持,1不支持)")
+    private Integer isTransfers;
+
+    /**
+     * 创建人id
+     */
+    @ExcelProperty(value = "创建人id")
+    private Long createById;
+
+    /**
+     * 更新人id
+     */
+    @ExcelProperty(value = "更新人id")
+    private Long updateById;
+
+    /**
+     * 搜索值
+     */
+    @ExcelProperty(value = "搜索值")
+    private String searchValue;
+
+}

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

@@ -13,7 +13,7 @@ import java.util.Date;
 
 
 /**
- * 【请填写功能名称】视图对象 service_work_orders
+ * 【工单处理】视图对象 service_work_orders
  *
  * @author mocheng
  * @date 2025-07-07
@@ -49,12 +49,17 @@ public class ServiceWorkOrdersVo implements Serializable {
      */
     @ExcelProperty(value = "工单类型")
     private Long type;
+    /**
+     * 工单类型名称
+     */
+    @ExcelProperty(value = "工单类型名称")
+    private String typeName;
 
     /**
      * 状态
      */
     @ExcelProperty(value = "状态")
-    private Long status;
+    private int status;
 
     /**
      * 派单时间
@@ -67,6 +72,11 @@ public class ServiceWorkOrdersVo implements Serializable {
      */
     @ExcelProperty(value = "发起人姓名")
     private String initiatorName;
+    /**
+     * 发起人姓名文本
+     */
+    @ExcelProperty(value = "发起人姓名文本")
+    private String initiatorNameText;
 
     /**
      * 发起人手机号
@@ -79,6 +89,12 @@ public class ServiceWorkOrdersVo implements Serializable {
      */
     @ExcelProperty(value = "处理人姓名")
     private String handler;
+    /**
+     * 处理人姓名文本
+     */
+    @ExcelProperty(value = "处理人姓名文本")
+    private String handlerText;
+
 
     /**
      * 地址
@@ -102,13 +118,13 @@ public class ServiceWorkOrdersVo implements Serializable {
      * 评价
      */
     @ExcelProperty(value = "评价")
-    private String serviceEvalua;
+    private Integer serviceEvalua;
 
     /**
      * 是否超时
      */
     @ExcelProperty(value = "是否超时")
-    private Long isTimeOut;
+    private int isTimeOut;
 
     /**
      * 创建人id
@@ -128,5 +144,9 @@ public class ServiceWorkOrdersVo implements Serializable {
     @ExcelProperty(value = "搜索值")
     private String searchValue;
 
-
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
 }

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

@@ -26,7 +26,7 @@ import java.util.Date;
 public class TbFloorVo implements Serializable {
 
     @Serial
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1L;
 
     /**
      *

ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteUnitServiceImpl.java

@@ -0,0 +1,39 @@
+package org.dromara.property.dubbo;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.property.api.RemoteUnitService;
+import org.dromara.property.api.domain.vo.RemoteUnitVo;
+import org.dromara.property.domain.vo.TbUnitVo;
+import org.dromara.property.service.ITbUnitService;
+
+/**
+ * 对外提供的远程服务调用
+ *
+ * @author lxj
+ */
+@DubboService
+@RequiredArgsConstructor
+public class RemoteUnitServiceImpl implements RemoteUnitService {
+
+    private final ITbUnitService tbUnitService;
+
+
+    @Override
+    public RemoteUnitVo queryUnitById(Long id) {
+        TbUnitVo tbUnitVo = tbUnitService.queryById(id);
+        if(tbUnitVo == null) {
+            return null;
+        }
+        RemoteUnitVo remoteUnitVo = new RemoteUnitVo();
+        remoteUnitVo.setId(tbUnitVo.getId());
+        remoteUnitVo.setCommunityId(tbUnitVo.getCommunityId());
+        remoteUnitVo.setBuildingId(tbUnitVo.getBuildingId());
+        remoteUnitVo.setUnitName(tbUnitVo.getUnitName());
+        remoteUnitVo.setFloorCount(tbUnitVo.getFloorCount());
+        remoteUnitVo.setHouseholdCount(tbUnitVo.getHouseholdCount());
+        remoteUnitVo.setStairCount(tbUnitVo.getStairCount());
+        return remoteUnitVo;
+    }
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.property.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.Application;
 import org.dromara.property.domain.vo.ApplicationVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author mocheng
  * @date 2025-06-21
  */
+@Mapper
 public interface ApplicationMapper extends BaseMapperPlus<Application, ApplicationVo> {
 
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.property.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.Asset;
 import org.dromara.property.domain.vo.AssetVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author mocheng
  * @date 2025-06-21
  */
+@Mapper
 public interface AssetMapper extends BaseMapperPlus<Asset, AssetVo> {
 
 }