合并app登录权限分支

# Conflicts:
#	fys-modules/pom.xml
#	pom.xml

fys-admin/pom.xml

@@ -65,6 +65,12 @@
             <artifactId>fys-common-mail</artifactId>
         </dependency>
 
+        <!-- 设备管理模块 -->
+       <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-equipment</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fuyuanshen</groupId>
             <artifactId>fys-system</artifactId>
@@ -99,6 +105,7 @@
             <artifactId>fys-app</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java

@@ -54,7 +54,7 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppRoleService roleService;
+    private final IAppRoleService appRoleService;
 
 
     /**
@@ -119,7 +119,7 @@ public class AppLoginService {
         Set<String> perms = new HashSet<>();
         loginUser.setMenuPermission(perms);
         loginUser.setRolePermission(perms);
-        List<AppRoleVo> roles = roleService.selectRolesByUserId(userId);
+        List<AppRoleVo> roles = appRoleService.selectRolesByUserId(userId);
         loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
         return loginUser;
     }

fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java

@@ -144,6 +144,10 @@ public class CaptchaController {
             Expression exp = parser.parseExpression(StringUtils.remove(code, "="));
             code = exp.getValue(String.class);
         }
+
+        log.info("图片验证码：{}", code);
+        log.info("图片验证码uuid：{}", uuid);
+
         RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         CaptchaVo captchaVo = new CaptchaVo();
         captchaVo.setUuid(uuid);

fys-admin/src/main/resources/application-dev.yml

@@ -270,3 +270,26 @@ justauth:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitea
+
+
+# 文件存储路径
+file:
+  mac:
+    path: ~/file/
+    avatar: ~/avatar/
+  linux:
+    path: /home/eladmin/file/
+    avatar: /home/eladmin/avatar/
+  windows:
+    path: C:\eladmin\file\
+    avatar: C:\eladmin\avatar\
+  # 文件大小 /M
+  maxSize: 100
+  avatarMaxSize: 5
+  device:
+    pic: C:\eladmin\file\    #设备图片存储路径
+    ip: http://fuyuanshen.com:81/    #服务器地址
+  app_avatar:
+    pic: C:\eladmin\file\    #设备图片存储路径
+    #ip: http://fuyuanshen.com:81/    #服务器地址
+    ip: https://fuyuanshen.com/    #服务器地址

fys-admin/src/main/resources/application-test.yml

@@ -0,0 +1,272 @@
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: false
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+  enabled: false
+  # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+  group: "fys_group"
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  namespace: ${spring.profiles.active}
+  # 随主应用端口漂移
+  port: 2${server.port}
+  # 客户端ip指定
+  host:
+  # RPC类型: netty, grpc
+  rpc-type: grpc
+
+--- # 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: true
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
+      datasource:
+        # 主库数据源
+        master:
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+          url: jdbc:mysql://localhost:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: root
+          password: root
+#        # 从库数据源
+#        slave:
+#          lazy: true
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+#          username:
+#          password:
+#        oracle:
+#          type: ${spring.datasource.type}
+#          driverClassName: oracle.jdbc.OracleDriver
+#          url: jdbc:oracle:thin:@//localhost:1521/XE
+#          username: ROOT
+#          password: root
+#        postgres:
+#          type: ${spring.datasource.type}
+#          driverClassName: org.postgresql.Driver
+#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+#          username: root
+#          password: root
+#        sqlserver:
+#          type: ${spring.datasource.type}
+#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+#          username: SA
+#          password: root
+      hikari:
+        # 最大连接池数量
+        maxPoolSize: 20
+        # 最小空闲线程数量
+        minIdle: 10
+        # 配置获取连接等待超时的时间
+        connectionTimeout: 30000
+        # 校验超时时间
+        validationTimeout: 5000
+        # 空闲连接存活最大时间，默认10分钟
+        idleTimeout: 600000
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        maxLifetime: 1800000
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: 123.207.99.140
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 2
+    # redis 密码必须配置
+    password: ccxx11234
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl.enabled: false
+
+# redisson 配置
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称 不能用中文
+    clientName: fys-Vue-Plus
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+
+--- # mail 邮件发送
+mail:
+  enabled: false
+  host: smtp.163.com
+  port: 465
+  # 是否需要用户名密码验证
+  auth: true
+  # 发送方，遵循RFC-822标准
+  from: xxx@163.com
+  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
+  user: xxx@163.com
+  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
+  pass: xxxxxxxxxx
+  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
+  starttlsEnable: true
+  # 使用SSL安全连接
+  sslEnable: true
+  # SMTP超时时长，单位毫秒，缺省值不超时
+  timeout: 0
+  # Socket连接超时值，单位毫秒，缺省值不超时
+  connectionTimeout: 0
+
+--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: yaml
+  # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+  restricted: true
+  # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+  minute-max: 1
+  # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+  account-max: 30
+  # 以下配置来自于 com.fuyuanshen.sms4j.provider.config.BaseConfig类中
+  blends:
+    # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+    # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+    config1:
+      # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: alibaba
+      # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+      access-key-id: 您的accessKey
+      # 称为accessSecret有些称之为apiSecret
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+    config2:
+      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: tencent
+      access-key-id: 您的accessKey
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+
+
+--- # 三方授权
+justauth:
+  # 前端外网访问地址
+  address: http://localhost:80
+  type:
+    maxkey:
+      # maxkey 服务器地址
+      # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+      server-url: http://sso.maxkey.top
+      client-id: 876892492581044224
+      client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+      redirect-uri: ${justauth.address}/social-callback?source=maxkey
+    topiam:
+      # topiam 服务器地址
+      server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
+      client-id: 449c4*********937************759
+      client-secret: ac7***********1e0************28d
+      redirect-uri: ${justauth.address}/social-callback?source=topiam
+      scopes: [openid, email, phone, profile]
+    qq:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=qq
+      union-id: false
+    weibo:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=weibo
+    gitee:
+      client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+      client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+      redirect-uri: ${justauth.address}/social-callback?source=gitee
+    dingtalk:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+    baidu:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=baidu
+    csdn:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=csdn
+    coding:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=coding
+      coding-group-name: xx
+    oschina:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=oschina
+    alipay_wallet:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+      alipay-public-key: MIIB**************DAQAB
+    wechat_open:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+    wechat_mp:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+    wechat_enterprise:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+      agent-id: 1000002
+    gitlab:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitlab
+    gitea:
+      # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204
+      # gitea 服务器地址
+      server-url: https://demo.gitea.com
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitea

fys-admin/src/main/resources/application.yml

@@ -211,6 +211,8 @@ springdoc:
       packages-to-scan: com.fuyuanshen.generator
     - group: 5.工作流模块
       packages-to-scan: com.fuyuanshen.workflow
+    - group: 设备管理模块
+      packages-to-scan: com.fuyuanshen.equipment
 
 # 防止XSS攻击
 xss:

fys-common/fys-common-core/pom.xml

@@ -93,6 +93,12 @@
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.12</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/ResponseMessageConstants.java

@@ -0,0 +1,28 @@
+package com.fuyuanshen.common.core.constant;
+
+/**
+ * 响应消息常量类
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-2117:21
+ */
+public class ResponseMessageConstants {
+
+    /**
+     * 删除操作成功提示
+     */
+    public static final String DELETE_SUCCESS = "删除成功！";
+
+    /**
+     * 新增操作成功提示
+     */
+    public static final String SAVE_SUCCESS = "新增成功！";
+
+    /**
+     * 更新操作成功提示
+     */
+    public static final String UPDATE_SUCCESS = "更新成功！";
+
+    // 可根据业务需求继续扩展其他常用提示信息
+
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/PageResult.java

@@ -0,0 +1,24 @@
+package com.fuyuanshen.common.core.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页结果封装类
+ * @author Zheng Jie
+ * @date 2018-11-23
+ * @param <T>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageResult<T> implements Serializable {
+
+    private List<T> content;
+
+    private long totalElements;
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/ResponseVO.java

@@ -0,0 +1,64 @@
+package com.fuyuanshen.common.core.domain;
+
+import lombok.Data;
+
+/**
+ * @Description: 返回体
+ * @Author: WY
+ * @Date: 2025/6/2
+ **/
+@Data
+public class ResponseVO<T> {
+
+    private Integer code; // 成功:0  失败:-1
+    private String msg;
+    private T data;
+
+    public ResponseVO(Integer code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public ResponseVO(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    // 静态方法，用于创建成功的响应
+    public static <T> ResponseVO<T> success() {
+        return new ResponseVO<>(0, "操作成功", null);
+    }
+
+    public static <T> ResponseVO<T> success(T data) {
+        return new ResponseVO<>(0, "操作成功", data);
+    }
+
+    public static <T> ResponseVO<T> success(String msg, T data) {
+        return new ResponseVO<>(0, msg, data);
+    }
+
+    // 静态方法，用于创建失败的响应
+    public static <T> ResponseVO<T> fail(String msg) {
+        return new ResponseVO<>(-1, msg, null);
+    }
+
+    public static <T> ResponseVO<T> fail(String msg, T data) {
+        return new ResponseVO<>(-1, msg, data);
+    }
+
+    // 链式方法 - 添加泛型支持
+    public <R> ResponseVO<R> withData(R data) {
+        return new ResponseVO<>(this.code, this.msg, data);
+    }
+
+    public ResponseVO<T> withMsg(String msg) {
+        this.msg = msg;
+        return this;
+    }
+
+    public ResponseVO<T> withCode(Integer code) {
+        this.code = code;
+        return this;
+    }
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/PageUtil.java

@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2019-2025 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.fuyuanshen.common.core.utils;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fuyuanshen.common.core.domain.PageResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 分页工具
+ * @author Zheng Jie
+ * @date 2018-12-10
+ */
+public class PageUtil extends cn.hutool.core.util.PageUtil {
+
+    /**
+     * List 分页
+     */
+    public static <T> List<T> paging(int page, int size , List<T> list) {
+        int fromIndex = page * size;
+        int toIndex = page * size + size;
+        if(fromIndex > list.size()){
+            return Collections.emptyList();
+        } else if(toIndex >= list.size()) {
+            return list.subList(fromIndex,list.size());
+        } else {
+            return list.subList(fromIndex,toIndex);
+        }
+    }
+
+    /**
+     * Page 数据处理
+     */
+    public static <T> PageResult<T> toPage(IPage<T> page) {
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 自定义分页
+     */
+    public static <T> PageResult<T> toPage(List<T> list) {
+        return new PageResult<>(list, list.size());
+    }
+
+    /**
+     * 返回空数据
+     */
+    public static <T> PageResult<T> noData () {
+        return new PageResult<>(null, 0);
+    }
+
+    /**
+     * 自定义分页
+     */
+    public static <T> PageResult<T> toPage(List<T> list, long totalElements) {
+        return new PageResult<>(list, totalElements);
+    }
+}

fys-common/fys-common-doc/pom.xml

@@ -26,6 +26,11 @@
             <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.github.therapi</groupId>
             <artifactId>therapi-runtime-javadoc</artifactId>

fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java

@@ -0,0 +1,78 @@
+package com.fuyuanshen.common.encrypt.utils;
+
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
+
+/**
+ * 登录测试
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-3014:29
+ */
+public class EncryptUtilsTest {
+
+    public static void main(String[] args) {
+        // System.out.println(EncryptUtils.encryptByBase64("123456"));
+
+        System.out.println(EncryptUtils.encryptByBase64("1234567890abcdef"));
+
+        String g = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==";
+        String s = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=";
+
+
+        String s1 = EncryptUtils.encryptByRsa("MTIzNDU2Nzg5MGFiY2RlZg==", g);
+        System.out.println(s1);
+        String s2 = EncryptUtils.decryptByRsa("jJPaW7hgFXD/gjdkrfBOEUdXpPZnQg/LZUASoOJAOLU/XRVXO/5666CzyALjw7neK1ujvRuys4MdKCvr9cRARw==", s);
+        System.out.println(s2);
+
+        String s3 = EncryptUtils.decryptByBase64(s2);
+        System.out.println(s3);
+
+        String s4 = EncryptUtils.encryptByAes("123456", s3);
+        System.out.println(s4);
+
+        String s5 = EncryptUtils.decryptByAes(s4, s3);
+        System.out.println(s5);
+
+
+        // 1. 构造 LoginBody 对象
+        PasswordLoginBody loginBody = new PasswordLoginBody();
+        loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e");
+        loginBody.setGrantType("password");
+        loginBody.setTenantId("894078");
+        loginBody.setCode("21");
+        loginBody.setUuid("39785885a3ef42d59501502848cd1dcb");
+        // loginBody.setUsername("admin");
+        // loginBody.setPassword("admin123");
+        loginBody.setUsername("dyf");
+        loginBody.setPassword("123456");
+
+        // 2. 使用更清晰的方式拼接 JSON 字符串
+        String jsonLoginBody = String.format(
+                "{"
+                        + "\"clientId\":\"%s\","
+                        + "\"grantType\":\"%s\","
+                        + "\"tenantId\":\"%s\","
+                        + "\"code\":\"%s\","
+                        + "\"uuid\":\"%s\","
+                        + "\"username\":\"%s\","
+                        + "\"password\":\"%s\""
+                        + "}",
+                loginBody.getClientId(),
+                loginBody.getGrantType(),
+                loginBody.getTenantId(),
+                loginBody.getCode(),
+                loginBody.getUuid(),
+                loginBody.getUsername(),
+                loginBody.getPassword()
+        );
+
+
+        String S5 = EncryptUtils.encryptByAes(jsonLoginBody, s3);
+        System.out.println(S5);
+
+        String S6 = EncryptUtils.decryptByAes(S5, s3);
+        System.out.println(S6);
+
+    }
+
+}

fys-modules/fys-equipment/pom.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.fuyuanshen</groupId>
+        <artifactId>fys-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>fys-equipment</artifactId>
+
+    <description>
+        富源晟设备管理
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-translation</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-common-sse</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/constants/DeviceConstants.java

@@ -0,0 +1,30 @@
+package com.fuyuanshen.equipment.constants;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-0609:42
+ */
+public class DeviceConstants {
+
+    /**
+     * 文件访问路径前缀
+     */
+    public static final String FILE_ACCESS_PREFIX = "images";
+
+    /**
+     * 文件访问路径前缀
+     */
+    public static final String FILE_ACCESS_ISOLATION = "device";
+
+    /**
+     * 错误报告目录
+     */
+    public static final String ERROR_REPORT_DIR = "error_reports";
+
+    /**
+     * 文件访问IP地址
+     */
+    // public static final String FILE_ACCESS_IP = "http://fuyuanshen.com:81/";
+    public static final String FILE_ACCESS_IP = "https://fuyuanshen.com/";
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/constants/ExceptionMessages.java

@@ -0,0 +1,14 @@
+package com.fuyuanshen.equipment.constants;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1109:26
+ */
+public class ExceptionMessages {
+
+    /**
+     * 禁止管理员操作客户数据的提示
+     */
+    public static final String ADMIN_OPERATION_NOT_ALLOWED = "警告：请不要随意操作客户数据！";
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/constants/RedisConstants.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.equipment.constants;
+
+public class RedisConstants {
+
+    public static final String APP_FORGOT_PASSWORD_SMS_TOKEN = "app_sms_forgotPassword:";
+
+    public static final String APP_REGISTER_SMS_TOKEN = "app_sms_register:";
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/constants/RoleConstants.java

@@ -0,0 +1,14 @@
+package com.fuyuanshen.equipment.constants;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-0609:42
+ */
+public class RoleConstants {
+
+    /**
+     * 添加客户默认绑定角色
+     */
+    public static final String ROLE_CUSTOMER = "普通客户";
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java

@@ -0,0 +1,192 @@
+package com.fuyuanshen.equipment.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.core.constant.ResponseMessageConstants;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.ImportResult;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Tag(name = "设备管理", description = "设备：设备管理")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/device")
+public class DeviceController {
+
+    private final DeviceService deviceService;
+
+
+    @Operation(summary = "分页查询设备列表", security = {@SecurityRequirement(name = "bearer-key")})
+    @GetMapping
+    public ResponseVO<PageResult<Device>> queryDevice(DeviceQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        PageResult<Device> devices = null;
+        try {
+            devices = deviceService.queryAll(criteria, page);
+        } catch (IOException e) {
+            log.error("queryDevice error: " + e.getMessage());
+            return ResponseVO.fail("");
+        }
+        return ResponseVO.success(devices);
+    }
+
+
+    // @Log("新增设备")
+    @Operation(summary = "新增设备")
+    @PostMapping(value = "/add")
+    public ResponseVO<Object> addDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+        try {
+            deviceService.addDevice(deviceForm);
+        } catch (Exception e) {
+            log.error("addDevice error: " + e.getMessage());
+            return ResponseVO.fail(e.getMessage());
+        }
+        return ResponseVO.success(null);
+    }
+
+
+    // @Log("修改设备")
+    @Operation(summary = "修改设备")
+    @PutMapping(value = "/update")
+    public ResponseVO<Object> updateDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+        try {
+            deviceService.update(deviceForm);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("updateDevice error: " + e.getMessage());
+            return ResponseVO.fail("出错了");
+        }
+        return ResponseVO.success(null);
+    }
+
+
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/detail/{id}")
+    public ResponseVO<Object> getDevice(@PathVariable Long id) {
+        Device device = deviceService.getById(id);
+        return ResponseVO.success(device);
+    }
+
+
+    // @Log("删除设备")
+    @Operation(summary = "删除设备")
+    @DeleteMapping(value = "/delete")
+    public ResponseVO<Object> deleteDevice(@Parameter(name = "传ID数组[]") @RequestBody List<Long> ids) {
+        deviceService.deleteAll(ids);
+        // deviceService.deleteAssign(ids);
+        return ResponseVO.success(ResponseMessageConstants.DELETE_SUCCESS);
+    }
+
+
+    @Operation(summary = "设备定位")
+    @GetMapping(value = "/locateDevice")
+    public ResponseVO<Object> locateDevice(DeviceQueryCriteria criteria) throws IOException {
+        List<Device> devices = deviceService.queryAllDevices(criteria);
+        return ResponseVO.success(devices);
+    }
+
+
+    // @Log("分配客户")
+    @Operation(summary = "分配客户")
+    @PutMapping(value = "/assignCustomer")
+    public ResponseVO<Object> assignCustomer(@Validated @RequestBody CustomerVo customerVo) {
+        deviceService.assignCustomer(customerVo);
+        return ResponseVO.success(null);
+    }
+
+
+    // @Log("撤回设备")
+    @Operation(summary = "撤回设备")
+    @PostMapping(value = "/withdraw")
+    public ResponseVO<Object> withdrawDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+        try {
+            deviceService.withdrawDevice(deviceForm);
+        } catch (Exception e) {
+            log.error("updateDevice error: " + e.getMessage());
+            return ResponseVO.fail("出错了");
+        }
+        return ResponseVO.success(null);
+    }
+
+
+    /**
+     * @param deviceForm
+     * @return
+     * @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
+     * 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
+     */
+    // @Log("解绑设备")
+    @Operation(summary = "解绑设备")
+    @PostMapping(value = "/unbind")
+    public ResponseVO<Object> unbindDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+        deviceService.unbindDevice(deviceForm);
+        return ResponseVO.success("解绑成功！！！");
+    }
+
+
+    @Operation(summary = "导出数据设备")
+    @GetMapping(value = "/download")
+    public void exportDevice(HttpServletResponse response, DeviceQueryCriteria criteria) throws IOException {
+
+    }
+
+
+    @Operation(summary = "导入设备数据")
+    @PostMapping(value = "/import", consumes = "multipart/form-data")
+    public ResponseVO<ImportResult> importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) {
+
+        // String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
+        // if (!("xlsx".equalsIgnoreCase(suffix))) {
+        //     throw new BadRequestException("只能上传Excel——xlsx格式文件");
+        // }
+        //
+        // ImportResult result = new ImportResult();
+        // try {
+        //     User currentUser = userMapper.findByUsername(SecurityUtils.getCurrentUsername());
+        //     DeviceImportParams params = DeviceImportParams.builder().ip(ip).deviceService(deviceService).tenantId(currentUser.getTenantId()).file(file).filePath(filePath).deviceMapper(deviceMapper).deviceAssignmentsService(deviceAssignmentsService).deviceTypeMapper(deviceTypeMapper).userId(currentUser.getId()).userMapper(userMapper).build();
+        //     // 创建监听器
+        //     UploadDeviceDataListener listener = new UploadDeviceDataListener(params);
+        //     // 读取Excel
+        //     EasyExcel.read(file.getInputStream(), DeviceExcelImportDTO.class, listener).sheet().doRead();
+        //     // 获取导入结果
+        //     result = listener.getImportResult();
+        //     // 设置响应消息
+        //     String message = String.format("成功导入 %d 条数据，失败 %d 条", result.getSuccessCount(), result.getFailureCount());
+        //     // 返回带有正确泛型的响应
+        //     return ResponseVO.<ImportResult>success(message, result);
+        // } catch (Exception e) {
+        //     log.error("导入设备数据出错: {}", e.getMessage(), e);
+        //     // 在异常情况下，设置默认结果
+        //     String errorMessage = String.format("导入失败: %s。成功 %d 条，失败 %d 条", e.getMessage(), result.getSuccessCount(), result.getFailureCount());
+        //     // 使用新方法确保类型正确
+        //     return ResponseVO.<ImportResult>fail(errorMessage, result);
+        return null;
+    }
+
+}
+
+

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java

@@ -0,0 +1,84 @@
+package com.fuyuanshen.equipment.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
+import com.fuyuanshen.equipment.service.DeviceTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/13
+ **/
+@Tag(name = "设备类型管理", description = "设备类型管理")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/deviceType")
+public class DeviceTypeController {
+
+    private final DeviceTypeService deviceTypeService;
+
+
+    @GetMapping
+    @Operation(summary = "分页查询设备类型")
+    public ResponseVO<PageResult<DeviceType>> queryDeviceType(DeviceTypeQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return ResponseVO.success(deviceTypeService.queryAll(criteria, page));
+    }
+
+
+    @GetMapping(value = "/all")
+    @Operation(summary = "查询所有设备类型")
+    public ResponseVO<Object> queryDeviceTypes() {
+        List<DeviceType> deviceTypes = deviceTypeService.queryDeviceTypes();
+        return ResponseVO.success(deviceTypes);
+    }
+
+
+    // @Log("新增设备类型")
+    @Operation(summary = "新增设备类型")
+    @PostMapping(value = "/add")
+    public ResponseVO<Object> createDeviceType(@Validated @RequestBody DeviceType resources) {
+        deviceTypeService.create(resources);
+        return ResponseVO.success(null);
+    }
+
+
+    // @Log("修改设备类型")
+    @Operation(summary = "修改设备类型")
+    @PutMapping(value = "/update")
+    public ResponseVO<Object> updateDeviceType(@Validated @RequestBody DeviceType resources) {
+        deviceTypeService.update(resources);
+        return ResponseVO.success(null);
+    }
+
+
+    // @Log("删除设备类型")
+    @Operation(summary = "删除设备类型")
+    @DeleteMapping(value = "/delete")
+    public ResponseEntity<Object> deleteDeviceType(@Parameter(name = "传ID数组[]") @RequestBody List<Long> ids) {
+        deviceTypeService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+    @GetMapping(value = "/communicationMode")
+    @Operation(summary = "获取设备类型通讯方式")
+    public ResponseVO<DeviceType> getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) {
+        return ResponseVO.success(deviceTypeService.getById(id));
+    }
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/CustomerDevice.java

@@ -0,0 +1,42 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.update.Update;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1308:57
+ */
+@Getter
+@Setter
+@TableName("customer_device")
+public class CustomerDevice extends TenantEntity {
+
+    @NotNull(groups = Update.class)
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField(value = "customer_id")
+    private Long customerId;
+
+    @TableField(value = "device_id")
+    private Long deviceId;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    @TableField(value = "assign_status")
+    private Byte assignStatus;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -0,0 +1,112 @@
+package com.fuyuanshen.equipment.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import lombok.Data;
+
+/**
+ * @Description: 设备表
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Data
+@TableName("device")
+@JsonInclude(JsonInclude.Include.ALWAYS) // 关键注解
+public class Device extends TenantEntity {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    // @Schema(value = "ID")
+    private Long id;
+
+    // @Schema(value = "设备记录ID")
+    @TableField(exist = false)
+    private Long assignId;
+
+    // @Schema(value = "设备类型")
+    private Long deviceType;
+
+    // @Schema(value = "设备类型名称")
+    private String typeName;
+
+    // @Schema(value = "客户号")
+    private Long customerId;
+
+    /**
+     * 当前所有者
+     * current_owner_id
+     */
+    // @Schema(value = "当前所有者")
+    private Long currentOwnerId;
+
+    /**
+     * 原始所有者（创建者）
+     * original_owner_id
+     */
+    // @Schema(value = "原始所有者（创建者）")
+    private Long originalOwnerId;
+
+    // @Schema(value = "所属客户")
+    private String customerName;
+
+    /*@Schema(value = "设备编号")
+    private String deviceNo;*/
+
+    // @Schema(value = "设备名称")
+    private String deviceName;
+
+    // @Schema(value = "设备图片")
+    private String devicePic;
+
+    // @Schema(value = "设备MAC")
+    private String deviceMac;
+
+    // @Schema(value = "设备IMEI")
+    private String deviceImei;
+
+    // @Schema(value = "设备SN")
+    private String deviceSn;
+
+    // @Schema(value = "经度")
+    private String longitude;
+
+    // @Schema(value = "纬度")
+    private String latitude;
+
+    // @Schema(value = "备注")
+    private String remark;
+
+    /**
+     * 租户ID
+     */
+    // @TableField(value = "tenant_id")
+    // // @Schema(hidden = true)
+    // private Long tenantId;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    // @Schema(value = "设备状态")
+    private Integer deviceStatus;
+
+    /**
+     * 绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    // @Schema(value = "绑定状态")
+    private Integer bindingStatus;
+
+
+    public void copy(Device source) {
+        BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAssignments.java

@@ -0,0 +1,86 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备分配记录表
+ *
+ * @TableName device_assignments
+ */
+@TableName(value = "device_assignments")
+@Data
+public class DeviceAssignments extends TenantEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 分配方
+     */
+    private Long fromCustomerId;
+
+    /**
+     * 接收方
+     */
+    private Long toCustomerId;
+
+    /**
+     * 分配者
+     * assigner_name
+     */
+    private Long assignerId;
+    private String assignerName;
+
+    /**
+     * 接收者
+     * assignee_name
+     */
+    private Long assigneeId;
+    private String assigneeName;
+
+    /**
+     * 分配时间
+     */
+    private LocalDateTime assignedAt;
+
+    /**
+     * 0 未授权
+     * 1 已授权
+     * 是否同步授权了设备类型
+     */
+    private Integer deviceTypeGranted;
+
+    /**
+     * 0 否
+     * 1 是
+     * 是否直接分配（用于父级显示）
+     */
+    private Integer direct;
+
+    /**
+     * 0 否
+     * 1 是
+     * 设备是否有效
+     */
+    private Integer active;
+
+    /**
+     * 分配等级(用于失效)
+     */
+    private String lever;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java

@@ -0,0 +1,40 @@
+package com.fuyuanshen.equipment.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/24
+ **/
+@Data
+@TableName("device_log")
+public class DeviceLog extends TenantEntity {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    // @Schema(value = "ID")
+    private Long id;
+
+    // @Schema(value = "设备行为")
+    private String deviceAction;
+
+    // @Schema(value = "设备名称")
+    private String deviceName;
+
+    // @Schema(value = "数据来源")
+    private String dataSource;
+
+    // @Schema(value = "内容")
+    private String content;
+
+    public void copy(DeviceLog source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java

@@ -0,0 +1,53 @@
+package com.fuyuanshen.equipment.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * @Description: 设备类型
+ * @Author: WY
+ * @Date: 2025/5/14
+ **/
+@Data
+@TableName("device_type")
+public class DeviceType extends TenantEntity {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @Schema(name = "ID", hidden = true)
+    private Long id;
+
+    @Schema(name = "客户号")
+    private Long customerId;
+
+    @Schema(name = "创建该类型的客户")
+    private Long ownerCustomerId;
+
+    @NotBlank(message = "设备类型名称不能为空")
+    @Schema(name = "类型名称", required = true)
+    private String typeName;
+
+    @Schema(name = "是否支持蓝牙")
+    private Boolean isSupportBle;
+
+    @Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
+    private String locateMode;
+
+    @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI")
+    private String networkWay;
+
+    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    private String communicationMode;
+
+
+    public void copy(DeviceType source) {
+        BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceTypeGrants.java

@@ -0,0 +1,95 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备分配权限表 (解决跨客户共享)
+ *
+ * @TableName device_type_grants
+ */
+@TableName(value = "device_type_grants")
+@Data
+public class DeviceTypeGrants extends TenantEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备类型
+     */
+    private Long deviceTypeId;
+
+    /**
+     * 被授权的客户
+     */
+    private Long customerId;
+
+    /**
+     * 授权方客户
+     */
+    private Long grantorCustomerId;
+
+    /**
+     * 生成日期
+     */
+    private Date grantedAt;
+
+    /**
+     * 关联分配记录
+     */
+    private Long assignmentId;
+
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        DeviceTypeGrants other = (DeviceTypeGrants) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getDeviceTypeId() == null ? other.getDeviceTypeId() == null : this.getDeviceTypeId().equals(other.getDeviceTypeId())) && (this.getCustomerId() == null ? other.getCustomerId() == null : this.getCustomerId().equals(other.getCustomerId())) && (this.getGrantorCustomerId() == null ? other.getGrantorCustomerId() == null : this.getGrantorCustomerId().equals(other.getGrantorCustomerId())) && (this.getGrantedAt() == null ? other.getGrantedAt() == null : this.getGrantedAt().equals(other.getGrantedAt())) && (this.getAssignmentId() == null ? other.getAssignmentId() == null : this.getAssignmentId().equals(other.getAssignmentId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getDeviceTypeId() == null) ? 0 : getDeviceTypeId().hashCode());
+        result = prime * result + ((getCustomerId() == null) ? 0 : getCustomerId().hashCode());
+        result = prime * result + ((getGrantorCustomerId() == null) ? 0 : getGrantorCustomerId().hashCode());
+        result = prime * result + ((getGrantedAt() == null) ? 0 : getGrantedAt().hashCode());
+        result = prime * result + ((getAssignmentId() == null) ? 0 : getAssignmentId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", deviceTypeId=").append(deviceTypeId);
+        sb.append(", customerId=").append(customerId);
+        sb.append(", grantorCustomerId=").append(grantorCustomerId);
+        sb.append(", grantedAt=").append(grantedAt);
+        sb.append(", assignmentId=").append(assignmentId);
+        sb.append("]");
+        return sb.toString();
+    }
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelImportDTO.java

@@ -0,0 +1,65 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.converters.bytearray.ByteArrayImageConverter;
+import lombok.Data;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-0710:00
+ */
+@Data
+@HeadRowHeight(20)  // 表头行高
+@ContentRowHeight(100)  // 内容行高
+public class DeviceExcelImportDTO {
+
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+
+    @ExcelProperty("客户号")
+    private Long customerId;
+
+    @ExcelProperty("设备名称")
+    @ColumnWidth(20)
+    private String deviceName;
+
+
+    @ExcelProperty(value = "设备图片", converter = ByteArrayImageConverter.class)
+    @ColumnWidth(15)
+    private byte[] devicePic;
+
+    // 添加图片写入方法
+    public void setDevicePicFromBytes(byte[] bytes) {
+        this.devicePic = bytes;
+    }
+
+    @ExcelProperty("设备MAC")
+    @ColumnWidth(20)
+    private String deviceMac;
+
+    @ExcelProperty("设备IMEI")
+    @ColumnWidth(20)
+    private String deviceImei;
+
+    @ExcelProperty("设备SN")
+    @ColumnWidth(20)
+    private String deviceSn;
+
+    @ExcelProperty("经度")
+    private String longitude;
+
+    @ExcelProperty("纬度")
+    private String latitude;
+
+    @ExcelProperty("备注")
+    @ColumnWidth(30)
+    private String remark;
+
+    @ExcelProperty("设备类型名称")
+    @ColumnWidth(20)
+    private String typeName;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/ImportResult.java

@@ -0,0 +1,25 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-0717:01
+ */
+@Data
+public class ImportResult {
+    private int successCount;
+    private int failureCount;
+    private List<DeviceExcelImportDTO> failedRecords;
+    // private byte[] errorExcelData; // 存储失败数据的Excel字节流
+
+    private String errorExcelUrl; // 改为存储错误报告的URL
+
+    // 添加成功/失败统计信息
+    public String getSummary() {
+        return String.format("成功导入 %d 条数据，失败 %d 条", successCount, failureCount);
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java

@@ -0,0 +1,56 @@
+package com.fuyuanshen.equipment.domain.form;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * @Description: 设备表单
+ * @Author: WY
+ * @Date: 2025/5/17
+ **/
+@Data
+public class DeviceForm {
+
+    @Schema(title = "ID", hidden = true)
+    private Long id;
+
+    @Schema(title = "设备记录ID")
+    private Long assignId;
+
+    @Schema(title = "设备类型")
+    private Long deviceType;
+
+    @Schema(title = "客户号")
+    private Long customerId;
+
+    /*@Schema(value = "设备编号")
+    private String deviceNo;*/
+
+    @NotBlank(message = "设备名称不能为空")
+    @Schema(title = "设备名称", required = true)
+    private String deviceName;
+
+    @Schema(title = "设备图片存储路径", hidden = true)
+    private String devicePic;
+
+    // @NotBlank(message = "设备MAC不能为空")
+    @Schema(title = "设备MAC")
+    private String deviceMac;
+
+    @Schema(title = "设备IMEI")
+    private String deviceImei;
+
+    // @NotBlank(message = "设备SN不能为空")
+    @Schema(title = "设备SN", required = true)
+    private String deviceSn;
+
+    @Schema(title = "设备图片")
+    private MultipartFile file;
+
+    @Schema(title = "备注")
+    private String remark;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -0,0 +1,64 @@
+package com.fuyuanshen.equipment.domain.query;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 设备查询参数
+ *
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Data
+public class DeviceQueryCriteria {
+
+    // @Schema(value = "设备名称")
+    private String deviceName;
+
+    // @Schema(value = "设备类型")
+    private Long deviceType;
+
+    // @Schema(value = "设备MAC")
+    private String deviceMac;
+
+    // @Schema(value = "设备IMEI")
+    private String deviceImei;
+
+    // @Schema(value = "设备SN")
+    private String deviceSn;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    // @Schema(value = "设备状态  0 失效 1 正常  ")
+    private Integer deviceStatus;
+
+    // @Schema(value = "创建时间")
+    private List<Timestamp> createTime;
+
+    // @Schema(value = "页码", example = "1")
+    private Integer page = 1;
+
+    // @Schema(value = "每页数据量", example = "10")
+    private Integer size = 10;
+
+    // @Schema(value = "客户id")
+    private Long customerId;
+    private Set<Long> customerIds;
+
+    // @Schema(value = "当前所有者")
+    private Long currentOwnerId;
+
+    // @Schema(value = "租户ID")
+    private Long tenantId;
+
+    // @Schema(value = "通讯方式", example = "0:4G;1:蓝牙")
+    private Integer communicationMode;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java

@@ -0,0 +1,36 @@
+package com.fuyuanshen.equipment.domain.query;
+
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/14
+ **/
+@Data
+public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable {
+
+    @Schema(name = "型号名称")
+    private String typeName;
+
+    @Schema(name = "所属客户")
+    private Set<Long> customerIds;
+
+    @Schema(name = "所属客户")
+    private Long customerId;
+
+    @Schema(name = "com.fuyuanshen")
+    private Long tenantId;
+
+    @Schema(name = "页码", example = "1")
+    private Integer page = 1;
+
+    @Schema(name = "每页数据量", example = "10")
+    private Integer size = 10;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java

@@ -0,0 +1,27 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+/**
+ * @Description: 分配客户的Vo类
+ * @Author: WY
+ * @Date: 2025/5/28
+ **/
+@Data
+@Validated
+public class CustomerVo {
+
+    @Schema(name = "客户ID")
+    @NotNull(message = "客户ID不能为空")
+    private Long customerId;
+
+    @Schema(name = "设备ID")
+    @NotNull(message = "设备ID不能为空")
+    private List<Long> deviceIds;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/BindingStatusEnum.java

@@ -0,0 +1,35 @@
+package com.fuyuanshen.equipment.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1818:17
+ */
+public enum BindingStatusEnum {
+    UNBOUND(0, "未绑定"), BOUND(1, "已绑定");
+
+    private final int code;
+    private final String description;
+
+    BindingStatusEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static BindingStatusEnum fromCode(int code) {
+        for (BindingStatusEnum status : values()) {
+            if (status.getCode() == code) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("Invalid binding status code: " + code);
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/CommunicationModeEnum.java

@@ -0,0 +1,45 @@
+package com.fuyuanshen.equipment.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * 通讯方式枚举
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-2414:11
+ */
+public enum CommunicationModeEnum {
+
+    FOUR_G(0, "4G"),
+    BLUETOOTH(1, "蓝牙");
+
+    private final int value;
+    private final String label;
+
+    CommunicationModeEnum(int value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @JsonValue
+    public int getValue() {
+        return value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * 根据值获取标签
+     */
+    public static String getLabelByValue(int value) {
+        for (CommunicationModeEnum mode : values()) {
+            if (mode.getValue() == value) {
+                return mode.getLabel();
+            }
+        }
+        return null;
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/DeviceActiveStatusEnum.java

@@ -0,0 +1,44 @@
+package com.fuyuanshen.equipment.enums;
+
+/**
+ * 设备有效性状态枚举
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-2113:26
+ */
+public enum DeviceActiveStatusEnum {
+
+    INACTIVE(0, "无效"), ACTIVE(1, "有效");
+
+    private final Integer code;
+    private final String description;
+
+    DeviceActiveStatusEnum(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 根据 code 获取描述
+     *
+     * @param code 状态码
+     * @return 描述信息
+     */
+    public static String getDescriptionByCode(Integer code) {
+        for (DeviceActiveStatusEnum status : values()) {
+            if (status.getCode().equals(code)) {
+                return status.getDescription();
+            }
+        }
+        return null;
+    }
+}
+

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/DeviceAuthorizationStatus.java

@@ -0,0 +1,45 @@
+package com.fuyuanshen.equipment.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1918:50
+ */
+public enum DeviceAuthorizationStatus {
+    /**
+     * 未授权
+     */
+    UNAUTHORIZED(0),
+
+    /**
+     * 已授权
+     */
+    AUTHORIZED(1);
+
+    private final int value;
+
+    DeviceAuthorizationStatus(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    /**
+     * 根据整数值获取对应的枚举值
+     *
+     * @param value 整数值（0 或 1）
+     * @return 对应的 DeviceAuthorizationStatus 枚举
+     * @throws IllegalArgumentException 如果值不是 0 或 1
+     */
+    public static DeviceAuthorizationStatus fromValue(int value) {
+        for (DeviceAuthorizationStatus status : values()) {
+            if (status.getValue() == value) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("Invalid device authorization status value: " + value);
+    }
+
+}
+

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/DeviceStatusEnum.java

@@ -0,0 +1,51 @@
+package com.fuyuanshen.equipment.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备状态枚举
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-1916:02
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceStatusEnum {
+
+    /**
+     * 失效
+     */
+    INVALID(0, "失效"),
+
+    /**
+     * 正常
+     */
+    NORMAL(1, "正常");
+
+    /**
+     * 状态码
+     */
+    private final Integer code;
+
+    /**
+     * 描述
+     */
+    private final String description;
+
+    /**
+     * 根据状态码获取描述
+     *
+     * @param code 状态码
+     * @return 描述
+     */
+    public static String getDescriptionByCode(Integer code) {
+        for (DeviceStatusEnum status : DeviceStatusEnum.values()) {
+            if (status.getCode().equals(code)) {
+                return status.getDescription();
+            }
+        }
+        return null;
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java

@@ -0,0 +1,34 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Mapper
+public interface DeviceMapper extends BaseMapper<Device> {
+
+    /**
+     * 分页查询设备
+     *
+     * @param criteria
+     * @param page
+     * @return
+     */
+    IPage<Device> findAll(@Param("criteria") DeviceQueryCriteria criteria, Page<Object> page);
+
+    List<Device> findAll(@Param("criteria") DeviceQueryCriteria criteria);
+
+    List<Device> findAllDevices(@Param("criteria") DeviceQueryCriteria criteria);
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java

@@ -0,0 +1,39 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/14
+ **/
+@Mapper
+public interface DeviceTypeMapper extends BaseMapper<DeviceType> {
+
+    /**
+     * 分页查询设备类型
+     *
+     * @param criteria
+     * @param page
+     * @return
+     */
+    IPage<DeviceType> findAll(@Param("criteria") DeviceTypeQueryCriteria criteria, Page<Object> page);
+
+
+    /**
+     * 查询所有设备类型
+     *
+     * @param criteria
+     * @return
+     */
+    List<DeviceType> findAll(@Param("criteria") DeviceTypeQueryCriteria criteria);
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java

@@ -0,0 +1,75 @@
+package com.fuyuanshen.equipment.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+public interface DeviceService extends IService<Device> {
+
+    /**
+     * 查询设备数据分页
+     *
+     * @param criteria 条件
+     * @param page     分页参数
+     * @return PageResult
+     */
+    PageResult<Device> queryAll(DeviceQueryCriteria criteria, Page<Object> page) throws IOException;
+
+    /**
+     * 查询所有设备信息
+     *
+     * @param criteria
+     * @return
+     */
+    List<Device> queryAllDevices(DeviceQueryCriteria criteria);
+
+    /**
+     * 新增设备
+     *
+     * @param resources
+     */
+    void addDevice(DeviceForm resources) throws Exception;
+
+    /**
+     * 修改设备
+     *
+     * @param resources /
+     */
+    void update(DeviceForm resources) throws Exception;
+
+    /**
+     * 批量删除
+     *
+     * @param ids /
+     */
+    void deleteAll(List<Long> ids);
+
+    /**
+     * 分配客户
+     */
+    void assignCustomer(CustomerVo customerVo);
+
+    /**
+     * 撤回设备
+     */
+    void withdrawDevice(DeviceForm deviceForm);
+
+    /**
+     * 解绑设备
+     *
+     * @param deviceForm
+     */
+    void unbindDevice(DeviceForm deviceForm);
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java

@@ -0,0 +1,63 @@
+package com.fuyuanshen.equipment.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/14
+ **/
+public interface DeviceTypeService extends IService<DeviceType> {
+
+    /**
+     * 查询数据分页
+     *
+     * @param criteria 条件
+     * @param page     分页参数
+     * @return PageResult
+     */
+    PageResult<DeviceType> queryAll(DeviceTypeQueryCriteria criteria, Page<Object> page);
+
+    /**
+     * 查询所有数据不分页
+     *
+     * @param criteria 条件参数
+     * @return List<DeviceTypeDto>
+     */
+    List<DeviceType> queryAll(DeviceTypeQueryCriteria criteria);
+
+    /**
+     * 查询所有设备类型
+     *
+     * @return
+     */
+    List<DeviceType> queryDeviceTypes();
+
+    /**
+     * 新增设备类型
+     *
+     * @param resources /
+     */
+    void create(DeviceType resources);
+
+    /**
+     * 修改设备类型
+     *
+     * @param resources /
+     */
+    void update(DeviceType resources);
+
+    /**
+     * 多选删除
+     *
+     * @param ids /
+     */
+    void deleteAll(List<Long> ids);
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -0,0 +1,217 @@
+package com.fuyuanshen.equipment.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.utils.PageUtil;
+import com.fuyuanshen.equipment.constants.DeviceConstants;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
+
+    @Value("${file.device.pic}")
+    private String filePath;
+    @Value("${file.device.ip}")
+    private String ip;
+
+
+    private final DeviceMapper deviceMapper;
+
+
+    /**
+     * 分页查询设备
+     *
+     * @param criteria 条件
+     * @param page     分页参数
+     * @return
+     * @throws IOException
+     */
+    @Override
+    public PageResult<Device> queryAll(DeviceQueryCriteria criteria, Page<Object> page) throws IOException {
+
+        IPage<Device> devices = deviceMapper.findAll(criteria, page);
+
+        List<Device> records = devices.getRecords();
+        for (Device record : records) {
+            if (record.getDevicePic() == null) {
+                record.setDevicePic("");
+            }
+        }
+
+        return PageUtil.toPage(devices);
+    }
+
+
+    /**
+     * 查询所有设备
+     *
+     * @param criteria 筛选条件
+     * @return
+     */
+    @Override
+    public List<Device> queryAllDevices(DeviceQueryCriteria criteria) {
+        return deviceMapper.findAllDevices(criteria);
+    }
+
+
+    /**
+     * 新增设备
+     *
+     * @param deviceForm
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addDevice(DeviceForm deviceForm) throws Exception {
+
+        // 获取当前登录用户信息
+        // LoginUser user = LoginHelper.getLoginUser();
+
+        // 保存图片并获取URL
+        String imageUrl = saveDeviceImage(deviceForm.getFile(), deviceForm.getDeviceName());
+        // 设置图片路径
+        deviceForm.setDevicePic(imageUrl);
+
+        // 转换对象并插入数据库
+        Device device = new Device();
+        BeanUtil.copyProperties(deviceForm, device, true);
+
+        deviceMapper.insert(device);
+
+    }
+
+
+    /**
+     * 更新设备信息
+     *
+     * @param deviceForm /
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DeviceForm deviceForm) throws Exception {
+
+        Device device = getById(deviceForm.getId());
+        if (device == null) {
+            throw new Exception("设备不存在!!!");
+        }
+
+        // 处理上传的图片
+        String imageUrl = saveDeviceImage(deviceForm.getFile(), device.getDeviceName());
+        deviceForm.setDevicePic(imageUrl);
+
+        // 更新字段
+        BeanUtil.copyProperties(deviceForm, device, true);
+        device.setUpdateTime(new Timestamp(System.currentTimeMillis()));
+        deviceMapper.updateById(device);
+    }
+
+
+    /**
+     * 保存设备图片并返回访问路径
+     *
+     * @param file      MultipartFile
+     * @param deviceMac 设备MAC用于生成唯一文件名
+     * @return 文件存储路径 URL 形式
+     */
+    private String saveDeviceImage(MultipartFile file, String deviceMac) throws IOException {
+        if (file == null || file.isEmpty()) {
+            return null;
+        }
+
+        String originalFileName = file.getOriginalFilename();
+        String fileExtension = originalFileName.substring(originalFileName.lastIndexOf(".") + 1);
+        String newFileName = "PS_" + deviceMac + "." + fileExtension;
+
+        File newFile = new File(filePath + DeviceConstants.FILE_ACCESS_ISOLATION + File.separator + newFileName);
+
+        if (!newFile.getParentFile().exists()) {
+            newFile.getParentFile().mkdirs();
+        }
+
+        log.info("图片保存路径: {}", newFile.getAbsolutePath());
+        file.transferTo(newFile);
+
+        return ip + DeviceConstants.FILE_ACCESS_PREFIX + "/" + DeviceConstants.FILE_ACCESS_ISOLATION + "/" + newFileName;
+    }
+
+
+    /**
+     * 删除设备
+     *
+     * @param ids /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(List<Long> ids) {
+        deviceMapper.deleteByIds(ids);
+    }
+
+
+    /**
+     * 分配客户
+     *
+     * @param customerVo
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void assignCustomer(CustomerVo customerVo) {
+
+
+    }
+
+
+    /**
+     * 撤回设备
+     *
+     * @param deviceForm
+     */
+    @Override
+    public void withdrawDevice(DeviceForm deviceForm) {
+
+
+    }
+
+
+    /**
+     * 解绑设备
+     *
+     * @param deviceForm
+     */
+    @Override
+    @Transactional
+    public void unbindDevice(DeviceForm deviceForm) {
+
+    }
+
+
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java

@@ -0,0 +1,104 @@
+package com.fuyuanshen.equipment.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.utils.PageUtil;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.equipment.service.DeviceTypeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/14
+ **/
+@Service
+@RequiredArgsConstructor
+public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements DeviceTypeService {
+
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final DeviceMapper deviceMapper;
+
+
+    /**
+     * 分页查询设备类型
+     *
+     * @param criteria 条件
+     * @param page     分页参数
+     * @return
+     */
+    @Override
+    public PageResult<DeviceType> queryAll(DeviceTypeQueryCriteria criteria, Page<Object> page) {
+        return PageUtil.toPage(deviceTypeMapper.findAll(criteria, page));
+    }
+
+
+    @Override
+    public List<DeviceType> queryAll(DeviceTypeQueryCriteria criteria) {
+        return deviceTypeMapper.findAll(criteria);
+    }
+
+
+    /**
+     * 查询所有设备类型
+     *
+     * @return
+     */
+    @Override
+    public List<DeviceType> queryDeviceTypes() {
+        DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria();
+        Long userId = LoginHelper.getUserId();
+        criteria.setCustomerId(userId);
+        return deviceTypeMapper.findAll(criteria);
+    }
+
+
+    /**
+     * 新增设备类型
+     *
+     * @param resources /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(DeviceType resources) {
+        Long userId = LoginHelper.getUserId();
+        resources.setCustomerId(userId);
+        resources.setOwnerCustomerId(userId);
+        deviceTypeMapper.insert(resources);
+    }
+
+
+    /**
+     * 修改设备类型
+     *
+     * @param resources /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DeviceType resources) {
+        deviceTypeMapper.updateById(resources);
+    }
+
+
+    /**
+     * 删除设备类型
+     *
+     * @param ids /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(List<Long> ids) {
+        deviceTypeMapper.deleteByIds(ids);
+    }
+
+
+}

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceMapper">
+    <resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.Device">
+        <id column="id" property="id"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="customer_id" property="customerId"/>
+        <!--<result column="device_no" property="deviceNo"/>-->
+        <result column="device_name" property="deviceName"/>
+        <result column="device_pic" property="devicePic"/>
+        <result column="device_mac" property="deviceMac"/>
+        <result column="device_sn" property="deviceSn"/>
+        <result column="device_status" property="deviceStatus"/>
+        <result column="remark" property="remark"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="binding_status" property="bindingStatus"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        , device_type, customer_id, device_name, device_pic, device_mac, device_sn,
+        remark, create_by, update_by, create_time, update_time
+    </sql>
+
+    <sql id="device_Column_List">
+        d
+        .
+        id
+        ,d.device_type,
+    d.customer_id, d.device_name, d.device_pic, d.device_mac,
+    d.device_sn, d.remark, d.create_by, d.update_by, d.create_time, d.update_time,
+    d.binding_status, d.device_status, d.current_owner_id, d.original_owner_id, d.customer_name,
+    d.device_imei, d.longitude, d.latitude, d.tenant_id
+    </sql>
+
+    <!-- 分页查询设备 -->
+    <select id="findAll" resultType="com.fuyuanshen.equipment.domain.Device">
+        select
+        d.id,d.device_name,
+        d.device_pic, d.device_mac, d.device_sn, d.update_by,d.device_imei,
+        d.update_time, d.device_type, d.remark, d.binding_status,t.type_name
+--         da.assignee_id AS customerId, da.assignee_name AS customerName, da.active AS deviceStatus,
+--         da.assigned_at AS create_time , da.assigner_name AS create_by , da.id AS assignId
+        from device d
+        LEFT JOIN device_type t ON d.device_type = t.id
+--         LEFT JOIN device_assignments da ON da.device_id = d.id
+        <where>
+            <!-- 时间范围等其他条件保持原样 -->
+            <if test="criteria.deviceName != null and criteria.deviceName.trim() != ''">
+                and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%')
+            </if>
+            <if test="criteria.deviceMac != null">
+                and d.device_mac = #{criteria.deviceMac}
+            </if>
+            <if test="criteria.deviceImei != null">
+                and d.device_imei = #{criteria.deviceImei}
+            </if>
+            <if test="criteria.deviceType != null">
+                and d.device_type = #{criteria.deviceType}
+            </if>
+            <if test="criteria.deviceStatus != null">
+--                 and da.active = #{criteria.deviceStatus}
+            </if>
+            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
+                and d.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            </if>
+
+            <if test="criteria.tenantId != null">
+                AND tenant_id = #{criteria.tenantId}
+            </if>
+
+            <!-- 下面这两个条件只需满足一个 -->
+            <!-- <if test="criteria.customerId != null"> -->
+            <!--     AND ( -->
+            <!--     tenant_id = #{criteria.tenantId} -->
+            <!--     OR d.customer_id = #{criteria.customerId} -->
+            <!--     ) -->
+            <!-- </if> -->
+            <!-- <if test="criteria.customerId == null"> -->
+            <!--     AND tenant_id = #{criteria.tenantId} -->
+            <!-- </if> -->
+        </where>
+--         ORDER BY create_time DESC
+    </select>
+
+    <select id="findAll1" resultType="com.fuyuanshen.equipment.domain.Device">
+        SELECT
+        d.id, d.customer_id, d.customer_name, d.device_name,
+        d.device_pic, d.device_mac, d.device_sn, d.create_by, d.update_by,
+        d.create_time, d.update_time, d.device_type, d.remark, d.device_status, t.type_name
+        from device d
+        left join device_type t
+        on d.device_type = t.id
+        <where>
+            <!-- 时间范围等其他条件保持原样 -->
+            <if test="criteria.deviceName != null and criteria.deviceName.trim() != ''">
+                and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%')
+            </if>
+            <if test="criteria.deviceMac != null">
+                and d.device_mac = #{criteria.deviceMac}
+            </if>
+            <if test="criteria.deviceSn != null">
+                and d.device_sn = #{criteria.deviceSn}
+            </if>
+            <if test="criteria.deviceType != null">
+                and d.device_type = #{criteria.deviceType}
+            </if>
+            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
+                and d.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            </if>
+
+            <!-- 将两个客户相关条件合并成一个逻辑组 -->
+            <if test="criteria.customerId != null or (criteria.customerIds != null and !criteria.customerIds.isEmpty())">
+                AND (
+                <!-- 条件1: 用户或其下属创建，且 customer_id 为空 -->
+                <if test="criteria.customerId != null">
+                    d.create_by IN (
+                    SELECT username FROM sys_user
+                    WHERE user_id = #{criteria.customerId} OR pid = #{criteria.customerId}
+                    ) AND d.customer_id IS NULL
+                </if>
+
+                <!-- 如果前面的条件不存在，则只保留第二个条件 -->
+                <choose>
+                    <when test="criteria.customerId != null and (criteria.customerIds != null and !criteria.customerIds.isEmpty())">
+                        OR
+                    </when>
+                    <when test="criteria.customerId == null and (criteria.customerIds != null and !criteria.customerIds.isEmpty())">
+                        <!-- 仅当第一个条件不存在时才开始括号 -->
+                    </when>
+                </choose>
+
+                <!-- 条件2: 客户ID在列表中 -->
+                <if test="criteria.customerIds != null and !criteria.customerIds.isEmpty()">
+                    (d.customer_id IN
+                    <foreach item="customerId" collection="criteria.customerIds" open="(" separator="," close=")">
+                        #{customerId}
+                    </foreach>
+                    )
+                </if>
+                )
+            </if>
+        </where>
+
+        order by d.id desc
+    </select>
+
+    <select id="findAllDevices" resultType="com.fuyuanshen.equipment.domain.Device">
+        select
+        d.id, d.customer_id, d.device_name,
+        d.device_pic, d.device_mac, d.device_sn, d.create_by, d.update_by,
+        d.create_time, d.update_time, d.longitude, d.latitude, d.remark
+        from device d
+        <where>
+            <if test="criteria.deviceName != null and criteria.deviceName.trim() != ''">
+                and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%')
+            </if>
+            <if test="criteria.deviceMac != null">
+                and d.device_mac = #{criteria.deviceMac}
+            </if>
+            <if test="criteria.deviceType != null">
+                and d.device_type = #{criteria.deviceType}
+            </if>
+            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
+                and d.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            </if>
+        </where>
+        order by d.id desc
+    </select>
+
+</mapper>

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceTypeMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceTypeMapper">
+    <resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.DeviceType">
+        <id column="id" property="id"/>
+        <result column="type_name" property="typeName"/>
+        <result column="is_support_ble" property="isSupportBle"/>
+        <result column="locate_mode" property="locateMode"/>
+        <result column="network_way" property="networkWay"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="communication_mode" property="communicationMode"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        , type_name, is_support_ble, locate_mode, network_way, create_by, update_by, create_time, update_time,communication_mode
+    </sql>
+
+
+    <!-- 查询所有设备类型 -->
+    <select id="findAll" resultMap="BaseResultMap">
+        SELECT DISTINCT dt.*
+        FROM device_type dt
+        <where>
+            <if test="criteria.typeName != null and criteria.typeName.trim() != ''">
+                and dt.type_name like concat('%', TRIM(#{criteria.typeName}), '%')
+            </if>
+            <if test="criteria.tenantId != null">
+                and dt.tenant_id = #{criteria.tenantId}
+            </if>
+            <if test="criteria.createBy != null">
+                and dt.create_by = #{criteria.createBy}
+            </if>
+        </where>
+        ORDER BY dt.create_time DESC
+    </select>
+</mapper>

fys-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>fys-job</module>
         <module>fys-system</module>
         <module>fys-workflow</module>
+        <module>fys-equipment</module>
         <module>fys-app</module>
     </modules>
 

pom.xml

@@ -152,6 +152,17 @@
                 <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
                 <version>${springdoc.version}</version>
             </dependency>
+            <!-- <dependency> -->
+            <!--     <groupId>org.springdoc</groupId> -->
+            <!--     <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> -->
+            <!--     <version>${springdoc.version}</version> -->
+            <!-- </dependency> -->
+            <!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui -->
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <version>2.8.8</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.github.therapi</groupId>
@@ -344,18 +355,21 @@
                 <artifactId>fys-generator</artifactId>
                 <version>${revision}</version>
             </dependency>
-
-            <dependency>
-                <groupId>com.fuyuanshen</groupId>
-                <artifactId>fys-demo</artifactId>
-                <version>${revision}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.fuyuanshen</groupId>
                 <artifactId>fys-app</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fuyuanshen</groupId>
+                <artifactId>fys-equipment</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fuyuanshen</groupId>
+                <artifactId>fys-demo</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!--  工作流模块  -->
             <dependency>