APP客户设备绑定-绑定时间

Reviewed-on: #5

fys-admin/src/main/java/com/fuyuanshen/DromaraApplication.java

@@ -9,7 +9,6 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  *
  * @author Lion Li
  */
-
 @SpringBootApplication
 public class DromaraApplication {
 

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java

@@ -29,6 +29,9 @@ import com.fuyuanshen.web.service.SysRegisterService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -63,7 +66,6 @@ public class AppAuthController {
     @PostMapping("/login")
     public R<LoginVo> login(@RequestBody AppSmsLoginBody appSmsLoginBody) {
 //        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
-        LoginHelper.getLoginUser();
         ValidatorUtils.validate(appSmsLoginBody);
         SmsLoginBody loginBody = new SmsLoginBody();
         loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());
@@ -158,4 +160,14 @@ public class AppAuthController {
         return R.ok(result);
     }
 
+
+    @GetMapping("/test")
+    public void testSend() {
+        // 在创建完SmsBlend实例后，再未手动调用注销的情况下框架会持有该实例，可以直接通过指定configId来获取想要的配置，如果你想使用
+        // 负载均衡形式获取实例，只要使用getSmsBlend的无参重载方法即可，如果你仅有一个配置，也可以使用该方法
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+
+        SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "123");
+    }
+
 }

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java

@@ -1,24 +1,16 @@
 package com.fuyuanshen.app.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.app.domain.vo.AppUserVo;
-import com.fuyuanshen.app.domain.vo.DeviceVo;
-import com.fuyuanshen.app.service.DeviceService;
-import com.fuyuanshen.app.service.IAppUserService;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.app.service.equipment.APPDeviceService;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.validate.AddGroup;
-import com.fuyuanshen.common.core.validate.EditGroup;
-import com.fuyuanshen.common.excel.utils.ExcelUtil;
-import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
-import com.fuyuanshen.common.log.annotation.Log;
-import com.fuyuanshen.common.log.enums.BusinessType;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.service.DeviceService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +19,6 @@ import java.util.List;
 
 /**
  * APP 设备信息管理
- * @date 2025-06-27
  */
 @Validated
 @RequiredArgsConstructor
@@ -37,13 +28,52 @@ public class AppDeviceController extends BaseController {
 
     private final DeviceService deviceService;
 
+
+    private final APPDeviceService appDeviceService;
+
     /**
-     * 查询设备信息列表
+     * 查询设备列表
      */
     @GetMapping("/list")
-    public TableDataInfo<DeviceVo> list(AppUserBo bo, PageQuery pageQuery) {
-        return deviceService.queryPageList(bo, pageQuery);
+    public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+
+        return deviceService.queryAppDeviceList(bo,pageQuery);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @PostMapping("/bind")
+    public R<Void> bind(@RequestBody AppDeviceBo bo) {
+        return toAjax(deviceService.bindDevice(bo));
     }
 
 
+    /**
+     * 解绑设备
+     */
+    @DeleteMapping("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(deviceService.unBindDevice(id));
+    }
+
+    /**
+     * 查询设备类型列表
+     */
+    @GetMapping(value = "/typeList")
+    public R<List<APPDeviceTypeVo>> getTypeList() {
+        List<APPDeviceTypeVo> typeList = appDeviceService.getTypeList();
+        return R.ok(typeList);
+    }
+
+    /**
+     * 重命名设备
+     * @param reNameDTO
+     * @return
+     */
+    @PostMapping(value = "/reName")
+    public R<String> reName(@Validated @RequestBody APPReNameDTO reNameDTO) {
+        appDeviceService.reName(reNameDTO);
+        return R.ok("重命名成功！！！");
+    }
 }

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java

@@ -0,0 +1,55 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.app.service.AppFileService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP 文件管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/file")
+public class AppFileController extends BaseController {
+
+    private final AppFileService appFileService;
+
+    /**
+     * 查询文件列表
+     */
+    @GetMapping("/list")
+    public R<List<AppFileVo>> list(AppBusinessFileBo bo) {
+        return R.ok(appFileService.list(bo));
+    }
+
+    /**
+     * 上传文件
+     */
+    @PostMapping("/upload")
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
+        return toAjax(appFileService.add(bo));
+    }
+
+
+    /**
+     * 文件删除
+     */
+    @DeleteMapping("/delete/{ids}")
+    public R<Void> delete(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        if(ids == null || ids.length == 0){
+            return R.fail("请选择要删除的文件");
+        }
+        return toAjax(appFileService.delete(ids));
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java

@@ -0,0 +1,71 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.web.core.BaseController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP 操作视频管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/operationVideo")
+public class AppOperationVideoController extends BaseController {
+
+    private final IAppOperationVideoService appOperationVideoService;
+
+    /**
+     * 查询操作视频列表
+     */
+    @GetMapping("/listOperationVideos")
+    public R<List<AppOperationVideoVo>> listOperationVideos(AppOperationVideoBo bo) {
+        return R.ok(appOperationVideoService.queryList(bo));
+    }
+
+    /**
+     * 查询操作视频详情信息
+     */
+    @GetMapping("/getOperationVideoInfo")
+    public R<AppOperationVideoVo> getOperationVideoInfo(AppOperationVideoBo bo) {
+        return R.ok(appOperationVideoService.queryById(bo.getId()));
+    }
+
+    /**
+     * 操作视频添加
+     */
+    @PostMapping("/addOperationVideo")
+    public R<Void> addOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+        if (loginUser != null) {
+            bo.setCreateBy(loginUser.getUserId());
+        }
+        return toAjax(appOperationVideoService.insertByBo(bo));
+    }
+
+    /**
+     * 操作视频编辑
+     */
+    @PostMapping("/editOperationVideo")
+    public R<Void> editOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        return toAjax(appOperationVideoService.updateByBo(bo));
+    }
+
+    /**
+     * 操作视频删除
+     */
+    @DeleteMapping("/deleteOperationVideo/{id}")
+    public R<Void> deleteOperationVideo(@PathVariable Long id) {
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(id), true));
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java

@@ -0,0 +1,21 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class AppFileDto {
+
+    private Long deviceId;
+
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    private Long fileType;
+
+    /**
+     *  文件
+     */
+    private MultipartFile[] files;
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppVideoDto.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AppVideoDto {
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/model/AppSmsLoginBody.java

@@ -22,4 +22,5 @@ public class AppSmsLoginBody {
      */
     @NotBlank(message = "租户ID不能为空")
     private String tenantId;
+
 }

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

@@ -0,0 +1,82 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.oss.core.OssClient;
+import com.fuyuanshen.common.oss.factory.OssFactory;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class AppFileService {
+
+    private final ISysOssService sysOssService;
+
+    private final IAppBusinessFileService appBusinessFileService;
+
+    public List<AppFileVo> list(AppBusinessFileBo bo) {
+        bo.setCreateBy(AppLoginHelper.getUserId());
+        return appBusinessFileService.queryAppFileList(bo);
+    }
+
+    public Boolean add(AppFileDto bo) {
+
+        MultipartFile[] files = bo.getFiles();
+        if(files == null || files.length == 0){
+            throw new ServiceException("请选择要上传的文件");
+        }
+        if(files.length > 5){
+            throw new ServiceException("最多只能上传5个文件");
+        }
+        for (int i = 0; i < files.length; i++) {
+            MultipartFile file = files[i];
+            // 上传文件
+            SysOssVo upload = sysOssService.upload(file);
+
+            if (upload == null) {
+                return false;
+            }
+
+            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
+            appBusinessFileBo.setFileId(upload.getOssId());
+            appBusinessFileBo.setBusinessId(bo.getDeviceId());
+            appBusinessFileBo.setFileType(bo.getFileType());
+            appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
+            appBusinessFileService.insertByBo(appBusinessFileBo);
+        }
+
+
+        return true;
+    }
+
+    public Boolean delete(Long[] ids) {
+        AppBusinessFileBo bo = new AppBusinessFileBo();
+        bo.setCreateBy(AppLoginHelper.getUserId());
+        bo.setIds(List.of(ids));
+        List<AppBusinessFileVo> appBusinessFileVos = appBusinessFileService.queryList(bo);
+        List<Long> fileIds = appBusinessFileVos.stream().map(AppBusinessFileVo::getFileId).toList();
+        List<SysOssVo> list = sysOssService.listByIds(fileIds);
+        for (SysOssVo sysOss : list) {
+            OssClient storage = OssFactory.instance(sysOss.getService());
+            storage.delete(sysOss.getUrl());
+        }
+        return appBusinessFileService.deleteWithValidByIds(List.of(ids), true);
+    }
+}

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

@@ -63,7 +63,7 @@ public class AppLoginService {
     /**
      * 退出登录
      */
-    /*public void logout() {
+    public void logout() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();
             if (ObjectUtil.isNull(loginUser)) {
@@ -81,7 +81,7 @@ public class AppLoginService {
             } catch (NotLoginException ignored) {
             }
         }
-    }*/
+    }
 
     /**
      * 记录登录信息

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

@@ -1,58 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.app.domain.vo.AppRoleVo;
-import com.fuyuanshen.app.domain.vo.AppUserVo;
-import com.fuyuanshen.app.domain.vo.DeviceVo;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.SystemConstants;
-import com.fuyuanshen.common.core.constant.TenantConstants;
-import com.fuyuanshen.common.core.domain.dto.RoleDTO;
-import com.fuyuanshen.common.core.domain.model.AppLoginUser;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
-import com.fuyuanshen.common.core.enums.LoginType;
-import com.fuyuanshen.common.core.exception.user.UserException;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.ServletUtils;
-import com.fuyuanshen.common.core.utils.SpringUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.log.event.LogininforEvent;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
-import com.fuyuanshen.common.tenant.exception.TenantException;
-import com.fuyuanshen.common.tenant.helper.TenantHelper;
-import com.fuyuanshen.system.domain.vo.SysTenantVo;
-import com.fuyuanshen.system.service.ISysTenantService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.time.Duration;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Supplier;
-
-/**
- * 登录校验方法
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class DeviceService {
-
-
-    public TableDataInfo<DeviceVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
-        return null;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPAuthController.java

@@ -0,0 +1,102 @@
+package com.fuyuanshen.mp.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.fuyuanshen.app.model.AppSmsLoginBody;
+import com.fuyuanshen.app.service.AppLoginService;
+import com.fuyuanshen.common.core.constant.SystemConstants;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
+import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.enums.AppUserTypeEnum;
+import com.fuyuanshen.mp.domian.dto.AuthUserDto;
+import com.fuyuanshen.mp.service.MPAuthService;
+import com.fuyuanshen.mp.service.MPService;
+import com.fuyuanshen.system.domain.bo.SysTenantBo;
+import com.fuyuanshen.system.domain.vo.SysClientVo;
+import com.fuyuanshen.system.domain.vo.SysTenantVo;
+import com.fuyuanshen.system.domain.vo.SysUserVo;
+import com.fuyuanshen.system.service.ISysClientService;
+import com.fuyuanshen.system.service.ISysConfigService;
+import com.fuyuanshen.system.service.ISysTenantService;
+import com.fuyuanshen.web.domain.vo.LoginTenantVo;
+import com.fuyuanshen.web.domain.vo.LoginVo;
+import com.fuyuanshen.web.domain.vo.TenantListVo;
+import com.fuyuanshen.web.service.IAuthStrategy;
+import com.fuyuanshen.web.service.SysRegisterService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP认证
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mp")
+public class MPAuthController {
+
+    private final AppLoginService loginService;
+    private final SysRegisterService registerService;
+    private final ISysConfigService configService;
+    private final ISysTenantService tenantService;
+    private final ISysClientService clientService;
+    private final MPAuthService mpAuthService;
+    private final MPService mpService;
+
+
+    @Operation(summary = "小程序登录授权")
+    @PostMapping(value = "/login")
+    public ResponseEntity<Object> login(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+
+        Long phoneNumber = authUser.getPhoneNumber();
+        // 判断小程序用户是否存在，不存在创建
+        UserApp mpUser = mpService.getMpUser(phoneNumber);
+        if (mpUser == null) {
+            RegisterBody registerBody = new RegisterBody();
+            registerBody.setUsername(phoneNumber.toString());
+            registerBody.setUserType(AppUserTypeEnum.XCX_USER.getCode());
+            registerBody.setTenantId("894078");
+            registerBody.setPassword("123456");
+            mpAuthService.register(registerBody);
+        }
+
+        // 去登录
+        SysClientVo client = clientService.queryByClientId("ca839698e245d60aa2f0e59bd52b34f8");
+        UserApp user = mpService.loadUserByUsername(phoneNumber.toString());
+        LoginUser loginUser = mpAuthService.buildLoginUser(user);
+        LoginVo login = mpAuthService.login(loginUser, client);
+
+        // 返回登录信息
+        return ResponseEntity.ok(login);
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPController.java

@@ -0,0 +1,37 @@
+package com.fuyuanshen.mp.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fuyuanshen.common.core.domain.ResponseVO;
+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.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-1208:36
+ */
+@Slf4j
+@RestController
+@RequestMapping("/mp")
+@RequiredArgsConstructor
+@Tag(name = "小程序：相关接口")
+@SaIgnore
+public class MPController {
+
+    private final DeviceService deviceService;
+
+
+    @GetMapping("/queryDevice")
+    @Operation(summary = "检查是否存在设备MAC号")
+    public ResponseVO<Boolean> queryDevice(@Parameter(name = "设备mac值") String mac) {
+        return ResponseVO.success(deviceService.queryDevice(mac));
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/domian/dto/AuthUserDto.java

@@ -0,0 +1,46 @@
+/*
+ *  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.mp.domian.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-30
+ */
+@Getter
+@Setter
+public class AuthUserDto {
+
+    @Schema(name = "用户名")
+    private String username;
+
+    @Schema(name = "手机号（APP/小程序 登录）")
+    private Long phoneNumber;
+
+    @Schema(name = "密码")
+    private String password;
+
+    @Schema(name = "验证码")
+    private String code;
+
+    @Schema(name = "验证码的key")
+    private String uuid = "";
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/mapper/MPMapper.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.mp.mapper;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-1210:16
+ */
+public interface MPMapper {
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/MPAuthService.java

@@ -0,0 +1,164 @@
+package com.fuyuanshen.mp.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Opt;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.service.IAppRoleService;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.SystemConstants;
+import com.fuyuanshen.common.core.constant.TenantConstants;
+import com.fuyuanshen.common.core.domain.dto.PostDTO;
+import com.fuyuanshen.common.core.domain.dto.RoleDTO;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.enums.UserType;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.log.event.LogininforEvent;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.exception.TenantException;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.service.AppUserService;
+import com.fuyuanshen.system.domain.SysUser;
+import com.fuyuanshen.system.domain.bo.SysUserBo;
+import com.fuyuanshen.system.domain.vo.*;
+import com.fuyuanshen.system.service.ISysTenantService;
+import com.fuyuanshen.system.service.ISysUserService;
+import com.fuyuanshen.web.domain.vo.LoginVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class MPAuthService {
+
+    private final ISysUserService userService;
+    private final AppUserService appUserService;
+
+    /**
+     * 小程序注册
+     */
+    public void register(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getUsername();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        UserApp sysUser = new UserApp();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPhonenumber(username);
+        sysUser.setTenantId(tenantId);
+        sysUser.setUserType(registerBody.getUserType());
+        sysUser.setPassword(BCrypt.hashpw(password));
+        sysUser.setUserType(userType);
+
+        appUserService.saveMpUser(sysUser);
+
+    }
+
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        // com.fuyuanshen.web.listener.UserActionListener
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+
+    public LoginVo login(LoginUser loginUser, SysClientVo client) {
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 构建登录用户
+     */
+    public LoginUser buildLoginUser(UserApp user) {
+        LoginUser loginUser = new LoginUser();
+        Long userId = user.getUserId();
+        loginUser.setTenantId(user.getTenantId());
+        loginUser.setUserId(userId);
+        loginUser.setDeptId(user.getDeptId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType(user.getUserType());
+        // 用户级别
+        // loginUser.setUserLevel(user.getUserLevel());
+        // pid
+        // loginUser.setPid(user.getPid());
+
+        // loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
+        // loginUser.setRolePermission(permissionService.getRolePermission(userId));
+        // if (ObjectUtil.isNotNull(user.getDeptId())) {
+        //     Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
+        //     loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
+        //     loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
+        // }
+        // List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        // // List<SysPostVo> posts = postService.selectPostsByUserId(userId);
+        // loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        // loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
+        return loginUser;
+    }
+
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/MPService.java

@@ -0,0 +1,26 @@
+package com.fuyuanshen.mp.service;
+
+import com.fuyuanshen.equipment.domain.UserApp;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+
+public interface MPService {
+
+
+    /**
+     * 获取小程序用户信息
+     *
+     * @param phoneNumber 手机号
+     */
+    UserApp getMpUser(Long phoneNumber);
+
+    UserApp loadUserByUsername(String username);
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPAuthServiceImpl.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.mp.service.impl;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+public class MPAuthServiceImpl {
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPServiceImpl.java

@@ -0,0 +1,43 @@
+package com.fuyuanshen.mp.service.impl;
+
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.mapper.UserAppMapper;
+import com.fuyuanshen.equipment.service.AppUserService;
+import com.fuyuanshen.mp.service.MPService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MPServiceImpl implements MPService {
+
+
+    private final AppUserService appUserService;
+
+
+
+    /**
+     * 获取小程序用户信息
+     *
+     * @param phoneNumber 手机号
+     */
+    @Override
+    public UserApp getMpUser(Long phoneNumber) {
+        return appUserService.getMpUser(phoneNumber);
+    }
+
+    @Override
+    public UserApp loadUserByUsername(String username) {
+       return appUserService.loadUserByUsername(username);
+    }
+
+
+}

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

@@ -111,6 +111,7 @@ public class AuthController {
         return R.ok(loginVo);
     }
 
+
     /**
      * 获取跳转URL
      *
@@ -133,6 +134,7 @@ public class AuthController {
         return R.ok("操作成功", authorizeUrl);
     }
 
+
     /**
      * 前端回调绑定授权(需要token)
      *

fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java

@@ -157,6 +157,11 @@ public class SysLoginService {
         loginUser.setUsername(user.getUserName());
         loginUser.setNickname(user.getNickName());
         loginUser.setUserType(user.getUserType());
+        // 用户级别
+        loginUser.setUserLevel(user.getUserLevel());
+        // pid
+        loginUser.setPid(user.getPid());
+
         loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
         loginUser.setRolePermission(permissionService.getRolePermission(userId));
         if (ObjectUtil.isNotNull(user.getDeptId())) {
@@ -242,7 +247,7 @@ public class SysLoginService {
             log.info("登录租户：{} 已被停用.", tenantId);
             throw new TenantException("tenant.blocked");
         } else if (ObjectUtil.isNotNull(tenant.getExpireTime())
-            && new Date().after(tenant.getExpireTime())) {
+                && new Date().after(tenant.getExpireTime())) {
             log.info("登录租户：{} 已超过有效期.", tenantId);
             throw new TenantException("tenant.expired");
         }

fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java

@@ -14,12 +14,10 @@ import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
 import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.enums.UserType;
 import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
 import com.fuyuanshen.common.core.exception.user.UserException;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.ServletUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.core.utils.ValidatorUtils;
+import com.fuyuanshen.common.core.utils.*;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
@@ -60,9 +58,9 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
             AppUserVo user = loadUserByPhonenumber(phonenumber);
             if (ObjectUtil.isNull(user)) {
                 //新增Appuser
-                addAppUser(tenantId, phonenumber);
-
-                user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
+                AppUser appUser = addAppUser(tenantId, phonenumber);
+                MapstructUtils.convert(appUser, user);
+//                user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
 //                loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists", phonenumber));
 //                throw new UserException("user.not.exists", phonenumber);
             }
@@ -89,7 +87,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         return loginVo;
     }
 
-    private void addAppUser(String tenantId, String phonenumber) {
+    private AppUser addAppUser(String tenantId, String phonenumber) {
         AppUser appUser = new AppUser();
         appUser.setPhonenumber(phonenumber);
         appUser.setUserName(phonenumber);
@@ -98,6 +96,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         appUser.setLoginIp(ServletUtils.getClientIP());
         appUser.setTenantId(tenantId);
         appUserMapper.insert(appUser);
+        return appUser;
     }
 
 
@@ -114,7 +113,9 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
     }
 
     private AppUserVo loadUserByPhonenumber(String phonenumber) {
-        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
+        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getPhonenumber, phonenumber)
+                .eq(AppUser::getUserType, UserType.APP_USER.getUserType()));
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", phonenumber);
 //            throw new UserException("user.not.exists", phonenumber);
@@ -126,5 +127,4 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         }
         return user;
     }
-
 }

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

@@ -49,9 +49,9 @@ spring:
           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
+          url: jdbc:mysql://47.120.79.150: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
+          password: Jq_123456#
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -98,13 +98,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 123.207.99.140
+    host: 47.120.79.150
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 2
     # redis 密码必须配置
-    password: ccxx11234
+    password: xhYc_djkl382^#780!
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -174,11 +174,15 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: 您的accessKey
+      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
-      sdk-app-id: 您的sdkAppId
+      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+        #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
+      template-id: SMS_322180518
+        #模板变量 上述模板的变量
+      templateName: code
+      signature:  湖北星汉研创科技
+#      sdk-app-id: 您的sdkAppId
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -293,3 +297,12 @@ file:
     pic: C:\eladmin\file\    #设备图片存储路径
     #ip: http://fuyuanshen.com:81/    #服务器地址
     ip: https://fuyuanshen.com/    #服务器地址
+# MQTT配置
+mqtt:
+  username: admin
+  password: #YtvpSfCNG
+  url: tcp://47.120.79.150:2883
+  subClientId: fys_subClient
+  subTopic: worker/alert/#,worker/location/#
+  pubTopic: worker/location
+  pubClientId: fys_pubClient

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

@@ -0,0 +1,304 @@
+--- # 监控中心配置
+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://47.120.79.150: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: Jq_123456#
+#        # 从库数据源
+#        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: 47.120.79.150
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 2
+    # redis 密码必须配置
+    password: xhYc_djkl382^#780!
+    # 连接超时时间
+    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
+
+
+# 文件存储路径
+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/    #服务器地址
+# MQTT配置
+mqtt:
+  username: admin
+  password: fys123456
+  url: tcp://47.107.152.87:1883
+  subClientId: fys_subClient_01
+  subTopic: worker/alert/#,worker/location/#
+  pubTopic: worker/location
+  pubClientId: fys_pubClient_01

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

@@ -52,9 +52,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          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
+          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
+          password: Jz_5623_cl1
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -105,9 +105,9 @@ spring.data:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # redis 密码必须配置
-    password: fys123
+    password: re_fs_11520631
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -272,3 +272,37 @@ justauth:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitea
+
+
+# MQTT配置
+mqtt:
+  username: admin
+  password: #YtvpSfCNG
+  url: tcp://47.120.79.150:2883
+  subClientId: fys_subClient
+  subTopic: worker/alert/#,worker/location/#
+  pubTopic: worker/location
+  pubClientId: fys_pubClient
+
+
+# 文件存储路径
+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.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8001
+  port: 8000
   servlet:
     # 应用的访问路径
     context-path: /
@@ -39,6 +39,7 @@ logging:
     org.springframework: warn
     org.mybatis.spring.mapper: error
     org.apache.fury: warn
+    com.fuyuanshen.web.service.impl.ClientServiceImpl: debug
   config: classpath:logback-plus.xml
 
 # 用户配置
@@ -135,7 +136,7 @@ tenant:
 # https://baomidou.com/config/
 mybatis-plus:
   # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
-  enableLogicDelete: true
+  enableLogicDelete: false
   # 多包名使用 例如 com.fuyuanshen.**.mapper,org.xxx.**.mapper
   mapperPackage: com.fuyuanshen.**.mapper
   # 对应的 XML 文件位置
@@ -213,6 +214,10 @@ springdoc:
       packages-to-scan: com.fuyuanshen.workflow
     - group: 设备管理模块
       packages-to-scan: com.fuyuanshen.equipment
+    - group: 客户管理模块
+      packages-to-scan: com.fuyuanshen.customer
+    - group: APP模块
+      packages-to-scan: com.fuyuanshen.app
 
 # 防止XSS攻击
 xss:

fys-admin/src/main/resources/logback-plus.xml

@@ -16,12 +16,12 @@
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-console.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大 1天 -->
-            <maxHistory>1</maxHistory>
-        </rollingPolicy>
+        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
+        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
+        <!--     <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern> -->
+        <!--     &lt;!&ndash; 日志最大 1天 &ndash;&gt; -->
+        <!--     <maxHistory>1</maxHistory> -->
+        <!-- </rollingPolicy> -->
         <encoder>
             <pattern>${log.pattern}</pattern>
             <charset>utf-8</charset>
@@ -36,12 +36,12 @@
     <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
+        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
+        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
+        <!--     <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern> -->
+        <!--     &lt;!&ndash; 日志最大的历史 60天 &ndash;&gt; -->
+        <!--     <maxHistory>60</maxHistory> -->
+        <!-- </rollingPolicy> -->
         <encoder>
             <pattern>${log.pattern}</pattern>
         </encoder>
@@ -58,12 +58,12 @@
     <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
+        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
+        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
+        <!--     <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern> -->
+        <!--     &lt;!&ndash; 日志最大的历史 60天 &ndash;&gt; -->
+        <!--     <maxHistory>60</maxHistory> -->
+        <!-- </rollingPolicy> -->
         <encoder>
             <pattern>${log.pattern}</pattern>
         </encoder>

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

@@ -15,6 +15,10 @@
         fys-common-core 核心模块
     </description>
 
+    <properties>
+        <hutool.version>5.8.35</hutool.version>
+    </properties>
+
     <dependencies>
         <!-- Spring框架基本的核心工具 -->
         <dependency>
@@ -56,6 +60,13 @@
             <artifactId>hutool-core</artifactId>
         </dependency>
 
+        <!--工具包-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
@@ -66,6 +77,33 @@
             <artifactId>hutool-extra</artifactId>
         </dependency>
 
+        <!-- excel工具 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.12.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>5.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-full</artifactId>
+            <version>5.4.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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

@@ -22,6 +22,11 @@ public interface TenantConstants {
      */
     String TENANT_ADMIN_ROLE_KEY = "admin";
 
+    /**
+     * 富源晟内部员工 roleKey
+     */
+    String FYS_ROLE_KEY = "fel";
+
     /**
      * 租户管理员角色名称
      */

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

@@ -18,7 +18,7 @@ import java.util.List;
 @AllArgsConstructor
 public class PageResult<T> implements Serializable {
 
-    private List<T> content;
+    private List<T> rows;
 
-    private long totalElements;
+    private long total;
 }

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

@@ -1,5 +1,6 @@
 package com.fuyuanshen.common.core.domain.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import com.fuyuanshen.common.core.domain.dto.PostDTO;
@@ -31,6 +32,7 @@ public class LoginUser implements Serializable {
      * 用户ID
      */
     private Long userId;
+    private Long pid;
 
     /**
      * 部门ID
@@ -132,6 +134,11 @@ public class LoginUser implements Serializable {
      */
     private String deviceType;
 
+    /**
+     * 用户等级
+     */
+    private Byte userLevel;
+
     /**
      * 获取登录id
      */

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserType.java

@@ -21,7 +21,13 @@ public enum UserType {
     /**
      * 移动客户端用户
      */
-    APP_USER("app_user");
+    APP_USER("app_user"),
+
+    /**
+     * 小程序 用户
+     */
+    XCX_USER("xcx_user");
+
 
     /**
      * 用户类型标识（用于 token、权限识别等）

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/BadRequestException.java

@@ -0,0 +1,41 @@
+/*
+ *  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.exception;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-23
+ * 统一异常处理
+ */
+@Getter
+public class BadRequestException extends RuntimeException{
+
+    private Integer status = BAD_REQUEST.value();
+
+    public BadRequestException(String msg){
+        super(msg);
+    }
+
+    public BadRequestException(HttpStatus status,String msg){
+        super(msg);
+        this.status = status.value();
+    }
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/EntityExistException.java

@@ -0,0 +1,38 @@
+/*
+ *  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.exception;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-23
+ */
+public class EntityExistException extends RuntimeException {
+
+    public EntityExistException(Class clazz, String field, String val) {
+        super(EntityExistException.generateMessage(clazz.getSimpleName(), field, val));
+    }
+
+    private static String generateMessage1(String entity, String field, String val) {
+        return StringUtils.capitalize(entity) + " with " + field + " " + val + " existed";
+    }
+
+    private static String generateMessage(String entity, String field, String val) {
+        return field + " ：" + val + " 已存在";
+    }
+
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/EntityNotFoundException.java

@@ -0,0 +1,34 @@
+/*
+ *  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.exception;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-23
+ */
+public class EntityNotFoundException extends RuntimeException {
+
+    public EntityNotFoundException(Class clazz, String field, String val) {
+        super(EntityNotFoundException.generateMessage(clazz.getSimpleName(), field, val));
+    }
+
+    private static String generateMessage(String entity, String field, String val) {
+        return StringUtils.capitalize(entity)
+                + " with " + field + " "+ val + " does not exist";
+    }
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/handler/ApiError.java

@@ -0,0 +1,49 @@
+/*
+ *  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.exception.handler;
+
+import lombok.Data;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-23
+ */
+@Data
+public class ApiError {
+
+    private Integer status = 400;
+    private Long timestamp;
+    private String message;
+
+    private ApiError() {
+        timestamp = System.currentTimeMillis();
+    }
+
+    public static ApiError error(String message){
+        ApiError apiError = new ApiError();
+        apiError.setMessage(message);
+        return apiError;
+    }
+
+    public static ApiError error(Integer status, String message){
+        ApiError apiError = new ApiError();
+        apiError.setStatus(status);
+        apiError.setMessage(message);
+        return apiError;
+    }
+}
+
+

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

@@ -0,0 +1,46 @@
+/*
+ *  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 java.io.Closeable;
+
+/**
+ * @author Zheng Jie
+ * @description 用于关闭各种连接，缺啥补啥
+ * @date 2021-03-05
+ **/
+public class CloseUtil {
+
+    public static void close(Closeable closeable) {
+        if (null != closeable) {
+            try {
+                closeable.close();
+            } catch (Exception e) {
+                // 静默关闭
+            }
+        }
+    }
+
+    public static void close(AutoCloseable closeable) {
+        if (null != closeable) {
+            try {
+                closeable.close();
+            } catch (Exception e) {
+                // 静默关闭
+            }
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.fuyuanshen.common.core.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ImageToCArrayConverterUtils {
+
+    public static void main(String[] args) {
+        try {
+            convertImageToCArray("E:\\workspace\\6170_强光_160_80_2.jpg", "E:\\workspace\\output.c", 160, 80);
+            System.out.println("转换成功！");
+        } catch (IOException e) {
+            System.err.println("转换失败: " + e.getMessage());
+        }
+    }
+
+    public static void convertImageToCArray(String inputPath, String outputPath,
+                                            int width, int height) throws IOException {
+        // 读取原始图片
+        BufferedImage originalImage = ImageIO.read(new File(inputPath));
+
+        // 调整图片尺寸
+        BufferedImage resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        resizedImage.getGraphics().drawImage(
+                originalImage, 0, 0, width, height, null);
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = resizedImage.getRGB(x, y);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+
+        byte[] imageData = byteStream.toByteArray();
+
+        // 生成C语言数组文件
+        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
+            // 写入注释行（包含尺寸信息）
+            String header = String.format("/* 0X10,0X10,0X00,0X%02X,0X00,0X%02X,0X01,0X1B, */\n",
+                    width, height);
+            fos.write(header.getBytes());
+
+            // 写入数组声明
+            fos.write("const unsigned char gImage_data[] = {\n".getBytes());
+
+            // 写入数据（每行16个字节）
+            for (int i = 0; i < imageData.length; i++) {
+                // 写入0X前缀
+                fos.write(("0X" + String.format("%02X", imageData[i] & 0xFF)).getBytes());
+
+                // 添加逗号（最后一个除外）
+                if (i < imageData.length - 1) {
+                    fos.write(',');
+                }
+
+                // 换行和缩进
+                if ((i + 1) % 16 == 0) {
+                    fos.write('\n');
+                } else {
+                    fos.write(' ');
+                }
+            }
+
+            // 写入数组结尾
+            fos.write("\n};\n".getBytes());
+        }
+    }
+}

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

@@ -0,0 +1,413 @@
+/*
+ *  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.file;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.poi.excel.BigExcelWriter;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.fuyuanshen.common.core.exception.BadRequestException;
+import com.fuyuanshen.common.core.utils.CloseUtil;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.*;
+import java.nio.file.Files;
+import java.security.MessageDigest;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * File工具类，扩展 hutool 工具包
+ *
+ * @author Zheng Jie
+ * @date 2018-12-27
+ */
+@Slf4j
+public class FileUtil extends cn.hutool.core.io.FileUtil {
+
+    /**
+     * 系统临时目录
+     * <br>
+     * windows 包含路径分割符，但Linux 不包含,
+     * 在windows \\==\ 前提下，
+     * 为安全起见 同意拼装 路径分割符，
+     * <pre>
+     *       java.io.tmpdir
+     *       windows : C:\Users/xxx\AppData\Local\Temp\
+     *       linux: /temp
+     * </pre>
+     */
+    public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
+    /**
+     * 定义GB的计算常量
+     */
+    private static final int GB = 1024 * 1024 * 1024;
+    /**
+     * 定义MB的计算常量
+     */
+    private static final int MB = 1024 * 1024;
+    /**
+     * 定义KB的计算常量
+     */
+    private static final int KB = 1024;
+
+    /**
+     * 格式化小数
+     */
+    private static final DecimalFormat DF = new DecimalFormat("0.00");
+
+    public static final String IMAGE = "图片";
+    public static final String TXT = "文档";
+    public static final String MUSIC = "音乐";
+    public static final String VIDEO = "视频";
+    public static final String OTHER = "其他";
+
+
+    /**
+     * MultipartFile转File
+     */
+    public static File toFile(MultipartFile multipartFile) {
+        // 获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        // 获取文件后缀
+        String prefix = "." + getExtensionName(fileName);
+        File file = null;
+        try {
+            // 用uuid作为文件名，防止生成的临时文件重复
+            file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
+            // MultipartFile to File
+            multipartFile.transferTo(file);
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+        }
+        return file;
+    }
+
+    /**
+     * 获取文件扩展名，不带 .
+     */
+    public static String getExtensionName(String filename) {
+        if ((filename != null) && (!filename.isEmpty())) {
+            int dot = filename.lastIndexOf('.');
+            if ((dot > -1) && (dot < (filename.length() - 1))) {
+                return filename.substring(dot + 1);
+            }
+        }
+        return filename;
+    }
+
+    /**
+     * Java文件操作 获取不带扩展名的文件名
+     */
+    public static String getFileNameNoEx(String filename) {
+        if ((filename != null) && (!filename.isEmpty())) {
+            int dot = filename.lastIndexOf('.');
+            if (dot > -1) {
+                return filename.substring(0, dot);
+            }
+        }
+        return filename;
+    }
+
+    /**
+     * 文件大小转换
+     */
+    public static String getSize(long size) {
+        String resultSize;
+        if (size / GB >= 1) {
+            //如果当前Byte的值大于等于1GB
+            resultSize = DF.format(size / (float) GB) + "GB   ";
+        } else if (size / MB >= 1) {
+            //如果当前Byte的值大于等于1MB
+            resultSize = DF.format(size / (float) MB) + "MB   ";
+        } else if (size / KB >= 1) {
+            //如果当前Byte的值大于等于1KB
+            resultSize = DF.format(size / (float) KB) + "KB   ";
+        } else {
+            resultSize = size + "B   ";
+        }
+        return resultSize;
+    }
+
+    /**
+     * inputStream 转 File
+     */
+    static File inputStreamToFile(InputStream ins, String name){
+        File file = new File(SYS_TEM_DIR + name);
+        if (file.exists()) {
+            return file;
+        }
+        OutputStream os = null;
+        try {
+            os = Files.newOutputStream(file.toPath());
+            int bytesRead;
+            int len = 8192;
+            byte[] buffer = new byte[len];
+            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            CloseUtil.close(os);
+            CloseUtil.close(ins);
+        }
+        return file;
+    }
+
+    /**
+     * 将文件名解析成文件的上传路径
+     */
+    public static File upload(MultipartFile file, String filePath) {
+        Date date = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
+        // 过滤非法文件名
+        String name = getFileNameNoEx(verifyFilename(file.getOriginalFilename()));
+        String suffix = getExtensionName(file.getOriginalFilename());
+        String nowStr = "-" + format.format(date);
+        try {
+            String fileName = name + nowStr + "." + suffix;
+            String path = filePath + fileName;
+            // getCanonicalFile 可解析正确各种路径
+            File dest = new File(path).getCanonicalFile();
+            // 检测是否存在目录
+            if (!dest.getParentFile().exists()) {
+                if (!dest.getParentFile().mkdirs()) {
+                    System.out.println("was not successful.");
+                }
+            }
+            // 文件写入
+            file.transferTo(dest);
+            return dest;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 导出excel
+     */
+    public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) throws IOException {
+        String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
+        File file = new File(tempPath);
+        BigExcelWriter writer = ExcelUtil.getBigWriter(file);
+        // 处理数据以防止CSV注入
+        List<Map<String, Object>> sanitizedList = list.parallelStream().map(map -> {
+            Map<String, Object> sanitizedMap = new LinkedHashMap<>();
+            map.forEach((key, value) -> {
+                if (value instanceof String) {
+                    String strValue = (String) value;
+                    // 检查并处理以特殊字符开头的值
+                    if (strValue.startsWith("=") || strValue.startsWith("+") || strValue.startsWith("-") || strValue.startsWith("@")) {
+                        strValue = "'" + strValue; // 添加单引号前缀
+                    }
+                    sanitizedMap.put(key, strValue);
+                } else {
+                    sanitizedMap.put(key, value);
+                }
+            });
+            return sanitizedMap;
+        }).collect(Collectors.toList());
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(sanitizedList, true);
+        SXSSFSheet sheet = (SXSSFSheet)writer.getSheet();
+        //上面需要强转SXSSFSheet  不然没有trackAllColumnsForAutoSizing方法
+        sheet.trackAllColumnsForAutoSizing();
+        //列宽自适应
+        writer.autoSizeColumnAll();
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
+        ServletOutputStream out = response.getOutputStream();
+        // 终止后删除临时文件
+        file.deleteOnExit();
+        writer.flush(out, true);
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+    }
+
+    public static String getFileType(String type) {
+        String documents = "txt doc pdf ppt pps xlsx xls docx";
+        String music = "mp3 wav wma mpa ram ra aac aif m4a";
+        String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
+        String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
+        if (image.contains(type)) {
+            return IMAGE;
+        } else if (documents.contains(type)) {
+            return TXT;
+        } else if (music.contains(type)) {
+            return MUSIC;
+        } else if (video.contains(type)) {
+            return VIDEO;
+        } else {
+            return OTHER;
+        }
+    }
+
+    public static void checkSize(long maxSize, long size) {
+        // 1M
+        int len = 1024 * 1024;
+        if (size > (maxSize * len)) {
+            throw new BadRequestException("文件超出规定大小:" + maxSize + "MB");
+        }
+    }
+
+    /**
+     * 判断两个文件是否相同
+     */
+    public static boolean check(File file1, File file2) {
+        String img1Md5 = getMd5(file1);
+        String img2Md5 = getMd5(file2);
+        if(img1Md5 != null){
+            return img1Md5.equals(img2Md5);
+        }
+        return false;
+    }
+
+    /**
+     * 判断两个文件是否相同
+     */
+    public static boolean check(String file1Md5, String file2Md5) {
+        return file1Md5.equals(file2Md5);
+    }
+
+    private static byte[] getByte(File file) {
+        // 得到文件长度
+        byte[] b = new byte[(int) file.length()];
+        InputStream in = null;
+        try {
+            in = Files.newInputStream(file.toPath());
+            try {
+                System.out.println(in.read(b));
+            } catch (IOException e) {
+                log.error(e.getMessage(), e);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return null;
+        } finally {
+            CloseUtil.close(in);
+        }
+        return b;
+    }
+
+    private static String getMd5(byte[] bytes) {
+        // 16进制字符
+        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(bytes);
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char[] str = new char[j * 2];
+            int k = 0;
+            // 移位 输出字符串
+            for (byte byte0 : md) {
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param request  /
+     * @param response /
+     * @param file     /
+     */
+    public static void downloadFile(HttpServletRequest request, HttpServletResponse response, File file, boolean deleteOnExit) {
+        response.setCharacterEncoding(request.getCharacterEncoding());
+        response.setContentType("application/octet-stream");
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(file);
+            response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+            IOUtils.copy(fis, response.getOutputStream());
+            response.flushBuffer();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                    if (deleteOnExit) {
+                        file.deleteOnExit();
+                    }
+                } catch (IOException e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 验证并过滤非法的文件名
+     * @param fileName 文件名
+     * @return 文件名
+     */
+    public static String verifyFilename(String fileName) {
+        // 过滤掉特殊字符
+        fileName = fileName.replaceAll("[\\\\/:*?\"<>|~\\s]", "");
+
+        // 去掉文件名开头和结尾的空格和点
+        fileName = fileName.trim().replaceAll("^[. ]+|[. ]+$", "");
+
+        // 不允许文件名超过255（在Mac和Linux中）或260（在Windows中）个字符
+        int maxFileNameLength = 255;
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            maxFileNameLength = 260;
+        }
+        if (fileName.length() > maxFileNameLength) {
+            fileName = fileName.substring(0, maxFileNameLength);
+        }
+
+        // 过滤掉控制字符
+        fileName = fileName.replaceAll("[\\p{Cntrl}]", "");
+
+        // 过滤掉 ".." 路径
+        fileName = fileName.replaceAll("\\.{2,}", "");
+
+        // 去掉文件名开头的 ".."
+        fileName = fileName.replaceAll("^\\.+/", "");
+
+        // 保留文件名中最后一个 "." 字符，过滤掉其他 "."
+        fileName = fileName.replaceAll("^(.*)(\\.[^.]*)$", "$1").replaceAll("\\.", "") +
+                fileName.replaceAll("^(.*)(\\.[^.]*)$", "$2");
+
+        return fileName;
+    }
+
+    public static String getMd5(File file) {
+        return getMd5(getByte(file));
+    }
+}

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

@@ -39,8 +39,8 @@ public class EncryptUtilsTest {
         loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e");
         loginBody.setGrantType("password");
         loginBody.setTenantId("894078");
-        loginBody.setCode("10");
-        loginBody.setUuid("390942eb87174dcc9c2c074b066b1b79");
+        loginBody.setCode("0");
+        loginBody.setUuid("1c285b27f516486f9535face77023aeb");
         // loginBody.setUsername("admin");
         // loginBody.setPassword("admin123");
         loginBody.setUsername("dyf");

fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessType.java

@@ -37,7 +37,7 @@ public enum BusinessType {
     EXPORT,
 
     /**
-     * 导入
+     *
      */
     IMPORT,
 

fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java

@@ -0,0 +1,24 @@
+package com.fuyuanshen.common.sms.controller;
+
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-0714:02
+ */
+@RestController
+public class TestSMSController {
+
+    @GetMapping("/test")
+    public void testSend() {
+        // 在创建完SmsBlend实例后，再未手动调用注销的情况下框架会持有该实例，可以直接通过指定configId来获取想要的配置，如果你想使用
+        // 负载均衡形式获取实例，只要使用getSmsBlend的无参重载方法即可，如果你仅有一个配置，也可以使用该方法
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "1234");
+    }
+
+}

fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java

@@ -58,4 +58,5 @@ public class ResourcesConfig implements WebMvcConfigurer {
     public GlobalExceptionHandler globalExceptionHandler() {
         return new GlobalExceptionHandler();
     }
+
 }

fys-modules/fys-app/pom.xml

@@ -15,6 +15,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-equipment</artifactId>
+        </dependency>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.fuyuanshen</groupId>

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java

@@ -0,0 +1,105 @@
+package com.fuyuanshen.app.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * app业务文件
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/businessFile")
+public class AppBusinessFileController extends BaseController {
+
+    private final IAppBusinessFileService appBusinessFileService;
+
+    /**
+     * 查询app业务文件列表
+     */
+    @SaCheckPermission("app:businessFile:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppBusinessFileVo> list(AppBusinessFileBo bo, PageQuery pageQuery) {
+        return appBusinessFileService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出app业务文件列表
+     */
+    @SaCheckPermission("app:businessFile:export")
+    @Log(title = "app业务文件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppBusinessFileBo bo, HttpServletResponse response) {
+        List<AppBusinessFileVo> list = appBusinessFileService.queryList(bo);
+        ExcelUtil.exportExcel(list, "app业务文件", AppBusinessFileVo.class, response);
+    }
+
+    /**
+     * 获取app业务文件详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("app:businessFile:query")
+    @GetMapping("/{id}")
+    public R<AppBusinessFileVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appBusinessFileService.queryById(id));
+    }
+
+    /**
+     * 新增app业务文件
+     */
+    @SaCheckPermission("app:businessFile:add")
+    @Log(title = "app业务文件", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppBusinessFileBo bo) {
+        return toAjax(appBusinessFileService.insertByBo(bo));
+    }
+
+    /**
+     * 修改app业务文件
+     */
+    @SaCheckPermission("app:businessFile:edit")
+    @Log(title = "app业务文件", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppBusinessFileBo bo) {
+        return toAjax(appBusinessFileService.updateByBo(bo));
+    }
+
+    /**
+     * 删除app业务文件
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("app:businessFile:remove")
+    @Log(title = "app业务文件", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appBusinessFileService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java

@@ -0,0 +1,105 @@
+package com.fuyuanshen.app.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 操作视频
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/operationVideo")
+public class AppOperationVideoController extends BaseController {
+
+    private final IAppOperationVideoService appOperationVideoService;
+
+    /**
+     * 查询操作视频列表
+     */
+    @SaCheckPermission("app:operationVideo:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppOperationVideoVo> list(AppOperationVideoBo bo, PageQuery pageQuery) {
+        return appOperationVideoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出操作视频列表
+     */
+    @SaCheckPermission("app:operationVideo:export")
+    @Log(title = "操作视频", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppOperationVideoBo bo, HttpServletResponse response) {
+        List<AppOperationVideoVo> list = appOperationVideoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "操作视频", AppOperationVideoVo.class, response);
+    }
+
+    /**
+     * 获取操作视频详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("app:operationVideo:query")
+    @GetMapping("/{id}")
+    public R<AppOperationVideoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appOperationVideoService.queryById(id));
+    }
+
+    /**
+     * 新增操作视频
+     */
+    @SaCheckPermission("app:operationVideo:add")
+    @Log(title = "操作视频", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppOperationVideoBo bo) {
+        return toAjax(appOperationVideoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改操作视频
+     */
+    @SaCheckPermission("app:operationVideo:edit")
+    @Log(title = "操作视频", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppOperationVideoBo bo) {
+        return toAjax(appOperationVideoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除操作视频
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("app:operationVideo:remove")
+    @Log(title = "操作视频", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppPersonnelInfoController.java

@@ -0,0 +1,105 @@
+package com.fuyuanshen.app.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.service.IAppPersonnelInfoService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 人员信息登记
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/personnelInfo")
+public class AppPersonnelInfoController extends BaseController {
+
+    private final IAppPersonnelInfoService appPersonnelInfoService;
+
+    /**
+     * 查询人员信息登记列表
+     */
+    @SaCheckPermission("app:personnelInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppPersonnelInfoVo> list(AppPersonnelInfoBo bo, PageQuery pageQuery) {
+        return appPersonnelInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出人员信息登记列表
+     */
+    @SaCheckPermission("app:personnelInfo:export")
+    @Log(title = "人员信息登记", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppPersonnelInfoBo bo, HttpServletResponse response) {
+        List<AppPersonnelInfoVo> list = appPersonnelInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "人员信息登记", AppPersonnelInfoVo.class, response);
+    }
+
+    /**
+     * 获取人员信息登记详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("app:personnelInfo:query")
+    @GetMapping("/{id}")
+    public R<AppPersonnelInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appPersonnelInfoService.queryById(id));
+    }
+
+    /**
+     * 新增人员信息登记
+     */
+    @SaCheckPermission("app:personnelInfo:add")
+    @Log(title = "人员信息登记", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appPersonnelInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改人员信息登记
+     */
+    @SaCheckPermission("app:personnelInfo:edit")
+    @Log(title = "人员信息登记", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appPersonnelInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除人员信息登记
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("app:personnelInfo:remove")
+    @Log(title = "人员信息登记", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appPersonnelInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppUserController.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.app.controller;
 
 import java.util.List;
 
+import com.fuyuanshen.common.core.enums.UserType;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -36,12 +37,14 @@ public class AppUserController extends BaseController {
 
     private final IAppUserService appUserService;
 
+
     /**
      * 查询APP用户信息列表
      */
 //    @SaCheckPermission("app:user:list")
     @GetMapping("/list")
     public TableDataInfo<AppUserVo> list(AppUserBo bo, PageQuery pageQuery) {
+        bo.setUserType(UserType.APP_USER.getUserType());
         return appUserService.queryPageList(bo, pageQuery);
     }
 

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

@@ -6,8 +6,20 @@ import com.fuyuanshen.app.domain.APPDeviceType;
 import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
 import com.fuyuanshen.app.service.equipment.APPDeviceService;
-import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.UserAppBo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.service.AppUserService;
+import com.fuyuanshen.equipment.service.DeviceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -27,23 +39,19 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/app/device")
-public class APPDeviceController {
+public class APPDeviceController extends BaseController {
 
     private final APPDeviceService appDeviceService;
+    private final AppUserService appUserService;
+    private final DeviceService deviceService;
 
 
     @PostMapping(value = "/list")
     @Operation(summary = "APP客户设备列表")
-    public ResponseVO<PageResult<APPDevice>> appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) {
         Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
-        PageResult<APPDevice> devices = null;
-        try {
-            devices = appDeviceService.appDeviceList(page, criteria);
-        } catch (Exception e) {
-            log.error("queryDevice error: " + e.getMessage());
-            return ResponseVO.fail("");
-        }
-        return ResponseVO.success(devices);
+
+        return appDeviceService.appDeviceList(page, criteria);
     }
 
 
@@ -65,24 +73,40 @@ public class APPDeviceController {
 
     @GetMapping
     @Operation(summary = "WEB端查看APP客户设备绑定")
-    public ResponseVO<PageResult<APPDevice>> queryAPPDevice(APPDeviceQueryCriteria criteria) {
-        Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
-        PageResult<APPDevice> devices = null;
-        try {
-            devices = appDeviceService.queryAll(page, criteria);
-        } catch (Exception e) {
-            log.error("queryDevice error: " + e.getMessage());
-            return ResponseVO.fail("");
-        }
-        return ResponseVO.success(devices);
+    public TableDataInfo<AppDeviceVo> queryAPPDevice(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return deviceService.queryAppDeviceList(bo, pageQuery);
     }
 
 
-    @PostMapping(value = "/unbind")
-    @Operation(summary = "WEB端APP客户设备解绑")
-    public ResponseVO<String> unbindAPPDevice(@Validated @ModelAttribute APPUnbindDTO deviceForm) {
-        appDeviceService.unbindAPPDevice(deviceForm);
-        return ResponseVO.success("解绑成功！！！");
+    // @PostMapping(value = "/unbind")
+    // @Operation(summary = "设备解绑")
+    // public ResponseVO<String> unbindAPPDevice(@Validated @ModelAttribute APPUnbindDTO deviceForm) {
+    //     appDeviceService.unbindAPPDevice(deviceForm);
+    //     return ResponseVO.success("解绑成功！！！");
+    // }
+
+    /**
+     * app设备解绑
+     *
+     * @param id
+     * @return
+     */
+    @Operation(summary = "设备解绑")
+    @DeleteMapping("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(deviceService.unBindDevice(id));
+    }
+
+
+    /**
+     * 修改APP用户信息
+     */
+    // @SaCheckPermission("app:user:edit")
+    @Log(title = "APP用户信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAppBo bo) {
+        return toAjax(appUserService.updateByBo(bo));
     }
 
 

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/mp/MPController.java

@@ -0,0 +1,75 @@
+// package com.fuyuanshen.app.controller.mp;
+//
+// import io.swagger.v3.oas.annotations.tags.Tag;
+// import lombok.RequiredArgsConstructor;
+// import lombok.extern.slf4j.Slf4j;
+// import org.springframework.http.ResponseEntity;
+// import org.springframework.web.bind.annotation.GetMapping;
+// import org.springframework.web.bind.annotation.RequestBody;
+// import org.springframework.web.bind.annotation.RequestMapping;
+// import org.springframework.web.bind.annotation.RestController;
+//
+// import java.util.ArrayList;
+// import java.util.HashMap;
+// import java.util.List;
+// import java.util.Map;
+//
+// /**
+//  * @author: 默苍璃
+//  * @date: 2025-06-2313:56
+//  */
+// @Slf4j
+// @RestController
+// @RequestMapping("/mp")
+// @RequiredArgsConstructor
+// @Tag(name = "小程序：相关接口")
+// public class MPController {
+//     //
+//     // private final TokenProvider tokenProvider;
+//     // private final SecurityProperties properties;
+//     // private final OnlineUserService onlineUserService;
+//     // private final DeviceService deviceService;
+//     // private final MPService mpService;
+//     //
+//     // @Log("小程序用户登录")
+//     // @ApiOperation("小程序登录授权")
+//     // @AnonymousPostMapping(value = "/login")
+//     // public ResponseEntity<Object> login(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+//     //
+//     //     // 获取用户信息
+//     //     User user = new User();
+//     //     user.setUsername("MP");
+//     //     user.setPassword("MP");
+//     //     AuthorityDto authorityDto = new AuthorityDto();
+//     //     authorityDto.setAuthority("MP");
+//     //     List<AuthorityDto> authorityDtos = new ArrayList<>();
+//     //     authorityDtos.add(authorityDto);
+//     //     user.setPhone(authUser.getPhoneNumber());
+//     //     JwtUserDto jwtUser = new JwtUserDto(null, user, null, authorityDtos);
+//     //
+//     //     Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, authorityDtos);
+//     //     SecurityContextHolder.getContext().setAuthentication(authentication);
+//     //     // 生成令牌
+//     //     String token = tokenProvider.createToken(jwtUser);
+//     //     // 返回 token 与 用户信息
+//     //     Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
+//     //         put("token", properties.getTokenStartWith() + token);
+//     //         put("user", jwtUser);
+//     //     }};
+//     //
+//     //     // 保存在线信息
+//     //     onlineUserService.save(jwtUser, token, request);
+//     //
+//     //     // 返回登录信息
+//     //     return ResponseEntity.ok(authInfo);
+//     // }
+//     //
+//     //
+//     // @GetMapping("/queryDevice")
+//     // @ApiOperation("是否存在设备MAC号")
+//     // public ResponseVO<Boolean> queryDevice(@ApiParam("设备mac值") String mac) {
+//     //     return ResponseVO.success(mpService.queryDevice(mac));
+//     // }
+//
+//
+// }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java

@@ -0,0 +1,51 @@
+package com.fuyuanshen.app.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * app业务文件对象 app_business_file
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_business_file")
+public class AppBusinessFile extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 文件id
+     */
+    private Long fileId;
+
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    private Long fileType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppOperationVideo.java

@@ -0,0 +1,51 @@
+package com.fuyuanshen.app.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 操作视频对象 app_operation_video
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_operation_video")
+public class AppOperationVideo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 视频名称
+     */
+    private String videoName;
+
+    /**
+     * 视频链接
+     */
+    private String videoUrl;
+
+    /**
+     * 设备di
+     */
+    private Long deviceId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppPersonnelInfo.java

@@ -0,0 +1,55 @@
+package com.fuyuanshen.app.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 人员信息登记对象 app_personnel_info
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_personnel_info")
+public class AppPersonnelInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 发送信息
+     */
+    private String sendMsg;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java

@@ -0,0 +1,52 @@
+package com.fuyuanshen.app.domain.bo;
+
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+import java.util.List;
+
+/**
+ * app业务文件业务对象 app_business_file
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppBusinessFile.class, reverseConvertGenerate = false)
+public class AppBusinessFileBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 文件id
+     */
+    private Long fileId;
+
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    private Long fileType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    private List<Long> ids;
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppOperationVideoBo.java

@@ -0,0 +1,49 @@
+package com.fuyuanshen.app.domain.bo;
+
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 操作视频业务对象 app_operation_video
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppOperationVideo.class, reverseConvertGenerate = false)
+public class AppOperationVideoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 视频名称
+     */
+    private String videoName;
+
+    /**
+     * 视频链接
+     */
+    private String videoUrl;
+
+    /**
+     * 设备di
+     */
+    private Long deviceId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java

@@ -0,0 +1,56 @@
+package com.fuyuanshen.app.domain.bo;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 人员信息登记业务对象 app_personnel_info
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppPersonnelInfo.class, reverseConvertGenerate = false)
+public class AppPersonnelInfoBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long deviceId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 发送信息
+     */
+    private String sendMsg;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/dto/APPReNameDTO.java

@@ -0,0 +1,21 @@
+package com.fuyuanshen.app.domain.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1818:36
+ */
+@Data
+public class APPReNameDTO {
+
+    private Long id;
+
+    @NotBlank(message = "设备名称不能为空")
+    private String deviceName;
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/APPDeviceTypeVo.java

@@ -0,0 +1,15 @@
+package com.fuyuanshen.app.domain.vo;
+
+import lombok.Data;
+
+
+@Data
+public class APPDeviceTypeVo {
+
+    private Long id;
+
+    private String typeName;
+
+    private String communicationMode;
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.app.domain.vo;
+
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * app业务文件视图对象 app_business_file
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppBusinessFile.class)
+public class AppBusinessFileVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 文件id
+     */
+    @ExcelProperty(value = "文件id")
+    private Long fileId;
+
+    /**
+     * 业务id
+     */
+    @ExcelProperty(value = "业务id")
+    private Long businessId;
+
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    @ExcelProperty(value = "文件类型(1:操作说明，2:产品参数)")
+    private Long fileType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -0,0 +1,26 @@
+package com.fuyuanshen.app.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class AppFileVo {
+
+    private Long id;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+    /**
+     * 文件id
+     */
+    private Long fileId;
+    /**
+     * 文件名称
+     */
+    private String fileName;
+    /**
+     * 文件url
+     */
+    private String fileUrl;
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppOperationVideoVo.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.app.domain.vo;
+
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 操作视频视图对象 app_operation_video
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppOperationVideo.class)
+public class AppOperationVideoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 视频名称
+     */
+    @ExcelProperty(value = "视频名称")
+    private String videoName;
+
+    /**
+     * 视频链接
+     */
+    @ExcelProperty(value = "视频链接")
+    private String videoUrl;
+
+    /**
+     * 设备di
+     */
+    @ExcelProperty(value = "设备di")
+    private Long deviceId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppPersonnelInfoVo.java

@@ -0,0 +1,68 @@
+package com.fuyuanshen.app.domain.vo;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 人员信息登记视图对象 app_personnel_info
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppPersonnelInfo.class)
+public class AppPersonnelInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ExcelProperty(value = "设备id")
+    private Long deviceId;
+
+    /**
+     * 人员姓名
+     */
+    @ExcelProperty(value = "人员姓名")
+    private String name;
+
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 单位名称
+     */
+    @ExcelProperty(value = "单位名称")
+    private String unitName;
+
+    /**
+     * 发送信息
+     */
+    @ExcelProperty(value = "发送信息")
+    private String sendMsg;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppUserVo.java

@@ -1,6 +1,9 @@
 package com.fuyuanshen.app.domain.vo;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuyuanshen.app.domain.AppUser;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -120,4 +123,10 @@ public class AppUserVo implements Serializable {
      * 部门ID
      */
     private Long deptId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/enums/UserType.java

@@ -0,0 +1,48 @@
+package com.fuyuanshen.app.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * 用户类型枚举
+ *
+ * @author: 默苍璃
+ * @date: 2025-06-1811:14
+ */
+public enum UserType {
+
+    APP(0, "APP"), MINI_PROGRAM(1, "小程序");
+
+    private final int value;
+    private final String description;
+
+    UserType(int value, String description) {
+        this.value = value;
+        this.description = description;
+    }
+
+    @JsonValue
+    public int getValue() {
+        return value;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 根据值获取对应的枚举
+     *
+     * @param value 枚举值
+     * @return 对应的枚举对象
+     */
+    public static UserType fromValue(int value) {
+        for (UserType userType : values()) {
+            if (userType.getValue() == value) {
+                return userType;
+            }
+        }
+        throw new IllegalArgumentException("Invalid user type value: " + value);
+    }
+
+}
+

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java

@@ -0,0 +1,20 @@
+package com.fuyuanshen.app.mapper;
+
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.List;
+
+/**
+ * app业务文件Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+public interface AppBusinessFileMapper extends BaseMapperPlus<AppBusinessFile, AppBusinessFileVo> {
+
+    List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppOperationVideoMapper.java

@@ -0,0 +1,17 @@
+package com.fuyuanshen.app.mapper;
+
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 操作视频Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Mapper
+public interface AppOperationVideoMapper extends BaseMapperPlus<AppOperationVideo, AppOperationVideoVo> {
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppPersonnelInfoMapper.java

@@ -0,0 +1,17 @@
+package com.fuyuanshen.app.mapper;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 人员信息登记Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Mapper
+public interface AppPersonnelInfoMapper extends BaseMapperPlus<AppPersonnelInfo, AppPersonnelInfoVo> {
+
+}

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

@@ -4,10 +4,14 @@ 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.app.domain.APPDevice;
+import com.fuyuanshen.app.domain.APPDeviceType;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: WY
@@ -36,4 +40,5 @@ public interface APPDeviceMapper extends BaseMapper<APPDevice> {
     IPage<APPDevice> queryAll(Page<APPDevice> page, @Param("criteria") APPDeviceQueryCriteria criteria);
 
 
+    List<APPDeviceTypeVo> getTypeList(@Param("userId") Long userId);
 }

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

@@ -0,0 +1,29 @@
+package com.fuyuanshen.app.mapper.equipment;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuyuanshen.app.domain.APPDeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author 97433
+ * @description 针对表【app_device_type(设备类型表)】的数据库操作Mapper
+ * @createDate 2025-06-24 11:16:18
+ * @Entity system.domain.AppDeviceType
+ */
+@Mapper
+public interface AppDeviceTypeMapper extends BaseMapper<APPDeviceType> {
+
+    /**
+     * 查询设备类型列表
+     *
+     * @param criteria 查询条件
+     * @return 设备类型列表
+     */
+    List<APPDeviceType> appTypeList(@Param("criteria") DeviceQueryCriteria criteria);
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java

@@ -0,0 +1,72 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * app业务文件Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+public interface IAppBusinessFileService {
+
+    /**
+     * 查询app业务文件
+     *
+     * @param id 主键
+     * @return app业务文件
+     */
+    AppBusinessFileVo queryById(Long id);
+
+    /**
+     * 分页查询app业务文件列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return app业务文件分页列表
+     */
+    TableDataInfo<AppBusinessFileVo> queryPageList(AppBusinessFileBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的app业务文件列表
+     *
+     * @param bo 查询条件
+     * @return app业务文件列表
+     */
+    List<AppBusinessFileVo> queryList(AppBusinessFileBo bo);
+
+    /**
+     * 新增app业务文件
+     *
+     * @param bo app业务文件
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppBusinessFileBo bo);
+
+    /**
+     * 修改app业务文件
+     *
+     * @param bo app业务文件
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppBusinessFileBo bo);
+
+    /**
+     * 校验并批量删除app业务文件信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java

@@ -0,0 +1,68 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 操作视频Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+public interface IAppOperationVideoService {
+
+    /**
+     * 查询操作视频
+     *
+     * @param id 主键
+     * @return 操作视频
+     */
+    AppOperationVideoVo queryById(Long id);
+
+    /**
+     * 分页查询操作视频列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 操作视频分页列表
+     */
+    TableDataInfo<AppOperationVideoVo> queryPageList(AppOperationVideoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的操作视频列表
+     *
+     * @param bo 查询条件
+     * @return 操作视频列表
+     */
+    List<AppOperationVideoVo> queryList(AppOperationVideoBo bo);
+
+    /**
+     * 新增操作视频
+     *
+     * @param bo 操作视频
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppOperationVideoBo bo);
+
+    /**
+     * 修改操作视频
+     *
+     * @param bo 操作视频
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppOperationVideoBo bo);
+
+    /**
+     * 校验并批量删除操作视频信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoService.java

@@ -0,0 +1,68 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 人员信息登记Service接口
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+public interface IAppPersonnelInfoService {
+
+    /**
+     * 查询人员信息登记
+     *
+     * @param id 主键
+     * @return 人员信息登记
+     */
+    AppPersonnelInfoVo queryById(Long id);
+
+    /**
+     * 分页查询人员信息登记列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 人员信息登记分页列表
+     */
+    TableDataInfo<AppPersonnelInfoVo> queryPageList(AppPersonnelInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的人员信息登记列表
+     *
+     * @param bo 查询条件
+     * @return 人员信息登记列表
+     */
+    List<AppPersonnelInfoVo> queryList(AppPersonnelInfoBo bo);
+
+    /**
+     * 新增人员信息登记
+     *
+     * @param bo 人员信息登记
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppPersonnelInfoBo bo);
+
+    /**
+     * 修改人员信息登记
+     *
+     * @param bo 人员信息登记
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppPersonnelInfoBo bo);
+
+    /**
+     * 校验并批量删除人员信息登记信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuyuanshen.app.domain.APPDevice;
 import com.fuyuanshen.app.domain.APPDeviceType;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
-import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 
 import java.util.List;
 
@@ -22,7 +25,7 @@ public interface APPDeviceService extends IService<APPDevice> {
      *
      * @param criteria
      */
-    PageResult<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
+    TableDataInfo<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
 
 
     /**
@@ -47,7 +50,7 @@ public interface APPDeviceService extends IService<APPDevice> {
      * @param page
      * @return
      */
-    PageResult<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
+    TableDataInfo<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
 
     /**
      * APP/小程序用户设备解绑
@@ -57,4 +60,17 @@ public interface APPDeviceService extends IService<APPDevice> {
     void unbindAPPDevice(APPUnbindDTO deviceForm);
 
 
+    List<APPDeviceTypeVo> getTypeList();
+
+    void reName(APPReNameDTO reNameDTO);
+
+    /**
+     * WEB端查看APP客户设备绑定
+     *
+     * @param criteria
+     * @return
+     */
+    TableDataInfo<APPDevice> queryAppDeviceList(DeviceQueryCriteria criteria);
+
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java

@@ -0,0 +1,142 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
+import com.fuyuanshen.app.service.IAppBusinessFileService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * app业务文件Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-03
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppBusinessFileServiceImpl implements IAppBusinessFileService {
+
+    private final AppBusinessFileMapper baseMapper;
+
+    /**
+     * 查询app业务文件
+     *
+     * @param id 主键
+     * @return app业务文件
+     */
+    @Override
+    public AppBusinessFileVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询app业务文件列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return app业务文件分页列表
+     */
+    @Override
+    public TableDataInfo<AppBusinessFileVo> queryPageList(AppBusinessFileBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppBusinessFile> lqw = buildQueryWrapper(bo);
+        Page<AppBusinessFileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的app业务文件列表
+     *
+     * @param bo 查询条件
+     * @return app业务文件列表
+     */
+    @Override
+    public List<AppBusinessFileVo> queryList(AppBusinessFileBo bo) {
+        LambdaQueryWrapper<AppBusinessFile> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppBusinessFile> buildQueryWrapper(AppBusinessFileBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppBusinessFile> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppBusinessFile::getId);
+        lqw.eq(bo.getFileId()!=null, AppBusinessFile::getFileId, bo.getFileId());
+        lqw.eq(bo.getBusinessId() != null, AppBusinessFile::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getFileType() != null, AppBusinessFile::getFileType, bo.getFileType());
+        lqw.in(bo.getIds()!=null, AppBusinessFile::getId, bo.getIds());
+        return lqw;
+    }
+
+    /**
+     * 新增app业务文件
+     *
+     * @param bo app业务文件
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppBusinessFileBo bo) {
+        AppBusinessFile add = MapstructUtils.convert(bo, AppBusinessFile.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改app业务文件
+     *
+     * @param bo app业务文件
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppBusinessFileBo bo) {
+        AppBusinessFile update = MapstructUtils.convert(bo, AppBusinessFile.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppBusinessFile entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除app业务文件信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public List<AppFileVo> queryAppFileList(AppBusinessFileBo bo) {
+        return baseMapper.queryAppFileList(bo);
+    }
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java

@@ -0,0 +1,134 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.app.mapper.AppOperationVideoMapper;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 操作视频Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
+
+    private final AppOperationVideoMapper baseMapper;
+
+    /**
+     * 查询操作视频
+     *
+     * @param id 主键
+     * @return 操作视频
+     */
+    @Override
+    public AppOperationVideoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询操作视频列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 操作视频分页列表
+     */
+    @Override
+    public TableDataInfo<AppOperationVideoVo> queryPageList(AppOperationVideoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppOperationVideo> lqw = buildQueryWrapper(bo);
+        Page<AppOperationVideoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的操作视频列表
+     *
+     * @param bo 查询条件
+     * @return 操作视频列表
+     */
+    @Override
+    public List<AppOperationVideoVo> queryList(AppOperationVideoBo bo) {
+        LambdaQueryWrapper<AppOperationVideo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppOperationVideo> buildQueryWrapper(AppOperationVideoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppOperationVideo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppOperationVideo::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getVideoName()), AppOperationVideo::getVideoName, bo.getVideoName());
+        lqw.eq(StringUtils.isNotBlank(bo.getVideoUrl()), AppOperationVideo::getVideoUrl, bo.getVideoUrl());
+        lqw.eq(bo.getDeviceId() != null, AppOperationVideo::getDeviceId, bo.getDeviceId());
+        return lqw;
+    }
+
+    /**
+     * 新增操作视频
+     *
+     * @param bo 操作视频
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppOperationVideoBo bo) {
+        AppOperationVideo add = MapstructUtils.convert(bo, AppOperationVideo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改操作视频
+     *
+     * @param bo 操作视频
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppOperationVideoBo bo) {
+        AppOperationVideo update = MapstructUtils.convert(bo, AppOperationVideo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppOperationVideo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除操作视频信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoServiceImpl.java

@@ -0,0 +1,135 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.app.service.IAppPersonnelInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 人员信息登记Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-02
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppPersonnelInfoServiceImpl implements IAppPersonnelInfoService {
+
+    private final AppPersonnelInfoMapper baseMapper;
+
+    /**
+     * 查询人员信息登记
+     *
+     * @param id 主键
+     * @return 人员信息登记
+     */
+    @Override
+    public AppPersonnelInfoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询人员信息登记列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 人员信息登记分页列表
+     */
+    @Override
+    public TableDataInfo<AppPersonnelInfoVo> queryPageList(AppPersonnelInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppPersonnelInfo> lqw = buildQueryWrapper(bo);
+        Page<AppPersonnelInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的人员信息登记列表
+     *
+     * @param bo 查询条件
+     * @return 人员信息登记列表
+     */
+    @Override
+    public List<AppPersonnelInfoVo> queryList(AppPersonnelInfoBo bo) {
+        LambdaQueryWrapper<AppPersonnelInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppPersonnelInfo> buildQueryWrapper(AppPersonnelInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppPersonnelInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDeviceId() != null, AppPersonnelInfo::getDeviceId, bo.getDeviceId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), AppPersonnelInfo::getName, bo.getName());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AppPersonnelInfo::getDeptName, bo.getDeptName());
+        lqw.like(StringUtils.isNotBlank(bo.getUnitName()), AppPersonnelInfo::getUnitName, bo.getUnitName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSendMsg()), AppPersonnelInfo::getSendMsg, bo.getSendMsg());
+        return lqw;
+    }
+
+    /**
+     * 新增人员信息登记
+     *
+     * @param bo 人员信息登记
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppPersonnelInfoBo bo) {
+        AppPersonnelInfo add = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改人员信息登记
+     *
+     * @param bo 人员信息登记
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppPersonnelInfoBo bo) {
+        AppPersonnelInfo update = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppPersonnelInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除人员信息登记信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -3,16 +3,32 @@ package com.fuyuanshen.app.service.impl.equipment;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.app.domain.APPDevice;
 import com.fuyuanshen.app.domain.APPDeviceType;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.app.enums.UserType;
 import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
+import com.fuyuanshen.app.mapper.equipment.AppDeviceTypeMapper;
 import com.fuyuanshen.app.service.equipment.APPDeviceService;
-import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.core.exception.BadRequestException;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
+import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -21,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -34,6 +49,9 @@ import java.util.stream.Collectors;
 public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice> implements APPDeviceService {
 
     private final APPDeviceMapper appDeviceMapper;
+    private final DeviceMapper deviceMapper;
+    private final AppDeviceTypeMapper appDeviceTypeMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
 
 
     /**
@@ -42,7 +60,7 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
      * @param criteria
      */
     @Override
-    public PageResult<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
         // criteria.setCustomerId(SecurityUtils.getCurrentUserId());
         // IPage<APPDevice> devices = appDeviceMapper.appDeviceList(page, criteria);
         // return new PageResult<>(devices.getRecords(), devices.getTotal());
@@ -72,56 +90,58 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
     @Override
     @Transactional
     public void appBindDevice(APPDeviceQueryCriteria criteria) {
-        //
-        // List<Device> devices = new ArrayList<>();
-        //
-        // if (criteria.getCommunicationMode().equals(CommunicationModeEnum.BLUETOOTH.getValue())) {
-        //     devices = deviceMapper.selectList(new QueryWrapper<Device>().eq("device_mac", criteria.getDeviceMac()));
-        //     if (CollectionUtil.isEmpty(devices)) {
-        //         throw new BadRequestException("请先将设备入库！！！");
-        //     }
-        //     List<APPDevice> appDevices = appDeviceMapper.selectList(new QueryWrapper<APPDevice>()
-        //             .eq("device_mac", criteria.getDeviceMac()).eq("binding_type", UserType.APP.getValue()));
-        //     if (CollectionUtil.isNotEmpty(appDevices)) {
-        //         throw new BadRequestException("该设备已绑定！！！");
-        //     }
-        // }
-        //
-        // if (criteria.getCommunicationMode().equals(CommunicationModeEnum.FOUR_G.getValue())) {
-        //     devices = deviceMapper.selectList(new QueryWrapper<Device>().eq("device_imei", criteria.getDeviceImei()));
-        //     if (CollectionUtil.isEmpty(devices)) {
-        //         throw new BadRequestException("请先将设备入库！！！");
-        //     }
-        //     List<APPDevice> appDevices = appDeviceMapper.selectList(new QueryWrapper<APPDevice>()
-        //             .eq("device_imei", criteria.getDeviceImei()).eq("binding_type", UserType.APP.getValue()));
-        //     if (CollectionUtil.isNotEmpty(appDevices)) {
-        //         throw new BadRequestException("该设备已绑定！！！");
-        //     }
-        // }
-        //
-        // Device device = devices.get(0);
-        // device.setBindingStatus(BindingStatusEnum.BOUND.getCode());
-        // deviceMapper.updateById(device);
-        //
-        // APPDevice appDevice = new APPDevice();
-        // BeanUtil.copyProperties(device, appDevice);
-        // appDevice.setBindingType(UserType.APP.getValue());
-        // appDevice.setBindingStatus(BindingStatusEnum.BOUND.getCode());
-        // Long currentUserId = SecurityUtils.getCurrentUserId();
-        // appDevice.setCustomerId(currentUserId);
-        // appDevice.setCreateTime(new Timestamp(System.currentTimeMillis()));
-        // // 设备类型名称
-        // appDevice.setDeviceTypeName(device.getTypeName());
-        // appDeviceMapper.insert(appDevice);
-        //
-        // APPDeviceType appDeviceType = appDeviceTypeMapper.selectById(device.getDeviceType());
-        // if (appDeviceType == null) {
-        //     DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        //     APPDeviceType type = new APPDeviceType();
-        //     BeanUtil.copyProperties(deviceType, type);
-        //     type.setCustomerId(currentUserId);
-        //     appDeviceTypeMapper.insert(type);
-        // }
+        List<Device> devices = new ArrayList<>();
+        if (criteria.getCommunicationMode().equals(CommunicationModeEnum.BLUETOOTH.getValue())) {
+            devices = deviceMapper.selectList(new QueryWrapper<Device>()
+                    .eq("original_device_id", null)
+                    .eq("device_mac", criteria.getDeviceMac()));
+            if (CollectionUtil.isEmpty(devices)) {
+                throw new BadRequestException("请先将设备入库！！！");
+            }
+            List<APPDevice> appDevices = appDeviceMapper.selectList(new QueryWrapper<APPDevice>()
+                    .eq("device_mac", criteria.getDeviceMac()).eq("binding_type", UserType.APP.getValue()));
+            if (CollectionUtil.isNotEmpty(appDevices)) {
+                throw new BadRequestException("该设备已绑定！！！");
+            }
+        }
+
+        if (criteria.getCommunicationMode().equals(CommunicationModeEnum.FOUR_G.getValue())) {
+            devices = deviceMapper.selectList(new QueryWrapper<Device>()
+                    .eq("original_device_id", null)
+                    .eq("device_imei", criteria.getDeviceImei()));
+            if (CollectionUtil.isEmpty(devices)) {
+                throw new BadRequestException("请先将设备入库！！！");
+            }
+            List<APPDevice> appDevices = appDeviceMapper.selectList(new QueryWrapper<APPDevice>()
+                    .eq("device_imei", criteria.getDeviceImei()).eq("binding_type", UserType.APP.getValue()));
+            if (CollectionUtil.isNotEmpty(appDevices)) {
+                throw new BadRequestException("该设备已绑定！！！");
+            }
+        }
+
+        Device device = devices.get(0);
+        device.setBindingStatus(BindingStatusEnum.BOUND.getCode());
+        deviceMapper.updateById(device);
+
+        APPDevice appDevice = new APPDevice();
+        BeanUtil.copyProperties(device, appDevice);
+        appDevice.setBindingType(UserType.APP.getValue());
+        appDevice.setBindingStatus(BindingStatusEnum.BOUND.getCode());
+        Long userId = LoginHelper.getUserId();
+        appDevice.setCustomerId(userId);
+        appDevice.setCreateTime(new Timestamp(System.currentTimeMillis()));
+        // 设备类型名称
+        appDevice.setDeviceTypeName(device.getTypeName());
+        appDeviceMapper.insert(appDevice);
+
+        APPDeviceType appDeviceType = appDeviceTypeMapper.selectById(device.getDeviceType());
+        if (appDeviceType == null) {
+            DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
+            APPDeviceType type = new APPDeviceType();
+            BeanUtil.copyProperties(deviceType, type);
+            type.setCustomerId(userId);
+            appDeviceTypeMapper.insert(type);
+        }
 
     }
 
@@ -134,11 +154,9 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
      * @return
      */
     @Override
-    public PageResult<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
-        // IPage<APPDevice> devices = appDeviceMapper.queryAll(page, criteria);
-        // return new PageResult<>(devices.getRecords(), devices.getTotal());
-
-        return null;
+    public TableDataInfo<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
+        IPage<APPDevice> devices = appDeviceMapper.queryAll(page, criteria);
+        return new TableDataInfo<>(devices.getRecords(), devices.getTotal());
     }
 
 
@@ -178,5 +196,36 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
 
     }
 
+    @Override
+    public List<APPDeviceTypeVo> getTypeList() {
+        Long userId = AppLoginHelper.getUserId();
+        return appDeviceMapper.getTypeList(userId);
+    }
+
+    @Override
+    public void reName(APPReNameDTO reNameDTO) {
+        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", reNameDTO.getId())
+                .eq("binding_user_id", AppLoginHelper.getUserId())
+                .set("device_name", reNameDTO.getDeviceName());
+        deviceMapper.update(updateWrapper);
+    }
+
+
+    /**
+     * WEB端查看APP客户设备绑定
+     *
+     * @param criteria
+     * @return
+     */
+    @Override
+    public TableDataInfo<APPDevice> queryAppDeviceList(DeviceQueryCriteria criteria) {
+
+        // Page<AppDeviceVo> result = baseMapper.queryAppDeviceList(pageQuery.build(), bo);
+        // return TableDataInfo.build(result);
+
+        return null;
+    }
+
 
 }

fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -0,0 +1,24 @@
+<?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.app.mapper.AppBusinessFileMapper">
+
+    <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
+        select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
+        where 1=1
+        <if test="businessId != null">
+            and a.business_id = #{businessId}
+        </if>
+        <if test="fileId != null">
+            and a.file_id = #{fileId}
+        </if>
+        <if test="fileType != null">
+            and a.file_type = #{fileType}
+        </if>
+        <if test="createBy != null">
+            and a.create_by = #{createBy}
+        </if>
+        order by a.create_time desc
+    </select>
+</mapper>

fys-modules/fys-app/src/main/resources/mapper/app/AppOperationVideoMapper.xml

@@ -0,0 +1,7 @@
+<?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.app.mapper.AppOperationVideoMapper">
+
+</mapper>

fys-modules/fys-app/src/main/resources/mapper/app/AppPersonnelInfoMapper.xml

@@ -0,0 +1,7 @@
+<?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.app.mapper.AppPersonnelInfoMapper">
+
+</mapper>

fys-modules/fys-app/src/main/resources/mapper/app/equipment/APPDeviceMapper.xml

@@ -79,13 +79,20 @@
             <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>
             and d.customer_id = #{criteria.customerId}
         </where>
         order by d.create_time desc
     </select>
 
+    <select id="getTypeList" resultType="com.fuyuanshen.app.domain.vo.APPDeviceTypeVo">
+        SELECT dt.id, dt.type_name, dt.communication_mode
+        FROM device_type dt
+        WHERE EXISTS(select 1
+                     from device d
+                     where d.device_type = dt.id
+                       and d.binding_user_id = #{userId}
+                       AND d.binding_status = 1)
+    </select>
+
 
 </mapper>

fys-modules/fys-app/src/main/resources/mapper/app/equipment/AppDeviceTypeMapper.xml

@@ -0,0 +1,35 @@
+<?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.app.mapper.equipment.AppDeviceTypeMapper">
+
+    <resultMap id="BaseResultMap" type="com.fuyuanshen.app.domain.APPDeviceType">
+        <id property="id" column="id"/>
+        <result property="typeName" column="type_name"/>
+        <result property="isSupportBle" column="is_support_ble"/>
+        <result property="locateMode" column="locate_mode"/>
+        <result property="networkWay" column="network_way"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="communicationMode" column="communication_mode"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        ,type_name,is_support_ble,locate_mode,network_way,create_by,
+        update_by,create_time,update_time,customer_id,communication_mode
+    </sql>
+
+    <!-- 查询设备类型列表 -->
+    <select id="appTypeList" resultType="com.fuyuanshen.app.domain.APPDeviceType">
+        select d.* from app_device_type as d
+        <where>
+            and d.customer_id = #{criteria.customerId}
+        </where>
+        order by d.create_time desc
+    </select>
+</mapper>

fys-modules/fys-customer/pom.xml

@@ -16,6 +16,12 @@
 	</description>
 
 	<dependencies>
+
+		<dependency>
+			<groupId>com.fuyuanshen</groupId>
+			<artifactId>fys-system</artifactId>
+		</dependency>
+
 		<!-- 通用工具-->
 		<dependency>
 			<groupId>com.fuyuanshen</groupId>

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/constant/ArrayConstants.java

@@ -0,0 +1,34 @@
+package com.fuyuanshen.customer.constant;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 数组相关常量
+ *
+ * @author: 默苍璃
+ * @date: 2025-07-0710:10
+ */
+public class ArrayConstants {
+
+    /**
+     * 默认长整型数组
+     */
+    public static final Long[] DEFAULT_LONG_ARRAY = {666L};
+    public static final Long DEFAULT_LONG = 666L;
+
+    /**
+     * 空字符串数组
+     */
+    public static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+    /**
+     * 获取只读的默认长整型列表
+     */
+    public static List<Long> getDefaultLongList() {
+        return Collections.unmodifiableList(new ArrayList<>(List.of(DEFAULT_LONG_ARRAY)));
+    }
+
+
+}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java

@@ -1,11 +1,16 @@
-package com.fuyuanshen.fyscustomer.controller;
+package com.fuyuanshen.customer.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.ResponseVO;
 import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.fyscustomer.domain.Customer;
-import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
-import com.fuyuanshen.fyscustomer.service.CustomerService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.customer.domain.Customer;
+import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
+import com.fuyuanshen.customer.domain.vo.ConsumerVo;
+import com.fuyuanshen.customer.service.CustomerService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.undertow.util.BadRequestException;
@@ -31,44 +36,59 @@ public class CustomerController {
     private final CustomerService customerService;
 
 
+    /**
+     * 分页查询客户(限制子客户)
+     *
+     * @param criteria
+     * @return
+     */
+    @Operation(summary = "分页查询客户")
+    @GetMapping(value = "/customer")
+    public TableDataInfo<ConsumerVo> queryCustomer(UserQueryCriteria criteria) {
+        Page<Customer> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
+        return customerService.queryCustomers(criteria, page);
+    }
+
+
     @GetMapping(value = "/allCustomer")
     @Operation(summary = "查询所有客户")
-    public ResponseVO<List<Customer>> queryAllCustomer(UserQueryCriteria criteria) {
+    public R<List<Customer>>  queryAllCustomer(UserQueryCriteria criteria) {
         List<Customer> customers = customerService.queryAllCustomers(criteria);
-        return ResponseVO.success(customers);
+        return R.ok(customers);
     }
 
 
     // @Log("新增客户")
     @Operation(summary = "新增客户")
     @PostMapping(value = "/addCustomer")
-    public ResponseVO<Object> addCustomer(@Validated @RequestBody Customer customer) throws BadRequestException {
+    public R<Void>  addCustomer(@Validated @RequestBody Customer customer) throws BadRequestException {
         if (StringUtils.isBlank(customer.getPassword())) {
             throw new BadRequestException("账号密码不能为空");
         }
+        customer.setPassword(BCrypt.hashpw(customer.getPassword()));
         customerService.addCustomer(customer);
-        return ResponseVO.success("新增客户成功！！！");
+        return R.ok();
     }
 
 
     // @Log("修改客户")
     @Operation(summary = "修改客户")
     @PutMapping(value = "updateCustomer")
-    public ResponseVO<Object> updateCustomer(@RequestBody Customer resources) throws Exception {
+    public R<Void>  updateCustomer(@RequestBody Customer resources) throws Exception {
         customerService.updateCustomer(resources);
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 
     // @Log("删除客户")
     @Operation(summary = "删除客户")
     @DeleteMapping(value = "/deleteCustomer")
-    public ResponseVO<Object> deleteCustomer(@RequestBody Set<Long> ids) throws BadRequestException {
+    public R<Void> deleteCustomer(@RequestBody Set<Long> ids) throws BadRequestException {
         if (CollectionUtil.isEmpty(ids)) {
             throw new BadRequestException("请选择要删除的客户");
         }
         customerService.delete(ids);
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/Customer.java

@@ -1,8 +1,10 @@
-package com.fuyuanshen.fyscustomer.domain;
+package com.fuyuanshen.customer.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -25,7 +27,7 @@ public class Customer extends TenantEntity {
      * 用户ID
      */
     @TableId(value = "user_id")
-    private Long userId;
+    private Long customerId;
 
     /**
      * 父id
@@ -40,13 +42,18 @@ public class Customer extends TenantEntity {
     /**
      * 用户账号
      */
+    @NotNull
     private String userName;
 
     /**
      * 用户昵称
      */
+    @NotNull
     private String nickName;
 
+    @TableField(value = "user_level")
+    private Byte userLevel;
+
     /**
      * 用户类型（sys_user系统用户）
      */
@@ -93,6 +100,10 @@ public class Customer extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    @NotNull
+    @Schema(name = "是否启用")
+    private Boolean enabled;
+
     /**
      * 最后登录IP
      */
@@ -110,11 +121,11 @@ public class Customer extends TenantEntity {
 
 
     public Customer(Long userId) {
-        this.userId = userId;
+        this.customerId = userId;
     }
 
     public boolean isSuperAdmin() {
-        return SystemConstants.SUPER_ADMIN_ID.equals(this.userId);
+        return SystemConstants.SUPER_ADMIN_ID.equals(this.customerId);
     }
 
 }

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java

@@ -13,8 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.fuyuanshen.fyscustomer.domain.query;
+package com.fuyuanshen.customer.domain.query;
 
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -29,7 +30,7 @@ import java.util.Set;
  * @date 2018-11-23
  */
 @Data
-public class UserQueryCriteria implements Serializable {
+public class UserQueryCriteria extends BaseEntity {
 
     @Schema(name = "ID")
     private Long id;
@@ -37,6 +38,9 @@ public class UserQueryCriteria implements Serializable {
     @Schema(name = "ids")
     private Set<Long> ids;
 
+    @Schema(name = "pid")
+    private Long pid;
+
     @Schema(name = "多个ID")
     private Set<Long> deptIds = new HashSet<>();
 
@@ -46,17 +50,23 @@ public class UserQueryCriteria implements Serializable {
     @Schema(name = "是否启用")
     private Boolean enabled;
 
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @Schema(name = "帐号状态（0正常 1停用）")
+    private String status;
+
     @Schema(name = "部门ID")
     private Long deptId;
 
-    @Schema(name = "创建时间")
-    private List<Timestamp> createTime;
+    // @Schema(name = "创建时间")
+    // // private List<Timestamp> createTime;
 
     @Schema(name = "页码", example = "1")
-    private Integer page = 1;
+    private Integer pageNum = 1;
 
     @Schema(name = "每页数据量", example = "10")
-    private Integer size = 10;
+    private Integer pageSize = 10;
 
     @Schema(name = "偏移量", hidden = true)
     private long offset;
@@ -75,4 +85,10 @@ public class UserQueryCriteria implements Serializable {
     @Schema(name = "APP/小程序账号")
     private String username;
 
+    /**
+     * 客户名称
+     */
+    @Schema(name = "客户名称")
+    private String customerName;
+
 }

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java

@@ -0,0 +1,95 @@
+package com.fuyuanshen.customer.domain.vo;
+
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1211:34
+ */
+@Getter
+@Setter
+public class ConsumerVo  extends TenantEntity {
+
+    @Schema(name = "ID", hidden = true)
+    private Long customerId;
+
+    @Schema(hidden = true)
+    private Long deptId;
+
+    @Schema(hidden = true)
+    private Long pid;
+
+    @Schema(hidden = true)
+    private Byte userLevel;
+
+    @Schema(name = "账号")
+    private String userName;
+
+    @Schema(name = "用户昵称")
+    private String nickName;
+
+    @Schema(name = "邮箱")
+    private String email;
+
+    @Schema(name = "电话号码")
+    private String phone;
+
+    @Schema(name = "用户性别")
+    private String gender;
+
+    @Schema(name = "头像真实名称", hidden = true)
+    private String avatarName;
+
+    @Schema(name = "头像存储的路径", hidden = true)
+    private String avatarPath;
+
+    @Schema(name = "密码")
+    private String password;
+
+    @Schema(name = "是否启用")
+    private Boolean enabled;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @Schema(name = "帐号状态（0正常 1停用）")
+    private String status;
+
+    @Schema(name = "是否为admin账号", hidden = true)
+    private Boolean isAdmin = false;
+
+    @Schema(name = "最后修改密码的时间", hidden = true)
+    private Date pwdResetTime;
+
+    private List<ConsumerVo> children;
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ConsumerVo consumer = (ConsumerVo) o;
+        return Objects.equals(customerId, consumer.customerId) && Objects.equals(userName, consumer.userName);
+    }
+
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(customerId, userName);
+    }
+
+
+}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/mapper/CustomerMapper.java

@@ -0,0 +1,60 @@
+package com.fuyuanshen.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuyuanshen.customer.domain.Customer;
+import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-0114:37
+ */
+@Mapper
+public interface CustomerMapper extends BaseMapper<Customer> {
+
+    /**
+     * 分页查询客户
+     *
+     * @param criteria
+     * @return
+     */
+    List<Customer> findCustomers(@Param("criteria") UserQueryCriteria criteria);
+
+    /**
+     * 获取分页总数
+     *
+     * @param criteria
+     * @return
+     */
+    Long countCustomers(@Param("criteria") UserQueryCriteria criteria);
+
+
+    /**
+     * 查询所有客户
+     *
+     * @param criteria
+     * @return
+     */
+    List<Customer> queryAllCustomers(@Param("criteria") UserQueryCriteria criteria);
+
+    /**
+     * 根据条件查询客户
+     *
+     * @param criteria
+     * @return
+     */
+    List<Customer> queryCustomers(@Param("criteria") UserQueryCriteria criteria);
+
+    /**
+     * 根据id查询客户
+     *
+     * @param customerId
+     * @return
+     */
+    Customer queryCustomerById(@Param("customerId") Long customerId, @Param("pid") Long pid);
+
+
+}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java

@@ -0,0 +1,59 @@
+package com.fuyuanshen.customer.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.customer.domain.Customer;
+import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
+import com.fuyuanshen.customer.domain.vo.ConsumerVo;
+import io.undertow.util.BadRequestException;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-0114:31
+ */
+public interface CustomerService {
+
+    /**
+     * 分页查询客户
+     *
+     * @param criteria
+     * @param page
+     * @return
+     */
+    TableDataInfo<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page);
+
+    /**
+     * 查询所有客户
+     *
+     * @param criteria
+     * @return
+     */
+    List<Customer> queryAllCustomers(UserQueryCriteria criteria);
+
+    /**
+     * 新增客户
+     *
+     * @param customer /
+     */
+    void addCustomer(Customer customer) throws BadRequestException;
+
+    /**
+     * 修改客户
+     *
+     * @param resources /
+     * @throws Exception /
+     */
+    void updateCustomer(Customer resources) throws Exception;
+
+    /**
+     * 删除客户
+     *
+     * @param ids /
+     */
+    void delete(Set<Long> ids);
+
+
+}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java

@@ -0,0 +1,136 @@
+package com.fuyuanshen.customer.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.customer.constant.ArrayConstants;
+import com.fuyuanshen.customer.domain.Customer;
+import com.fuyuanshen.customer.domain.query.UserQueryCriteria;
+import com.fuyuanshen.customer.domain.vo.ConsumerVo;
+import com.fuyuanshen.customer.mapper.CustomerMapper;
+import com.fuyuanshen.customer.service.CustomerService;
+import com.fuyuanshen.system.domain.SysUserRole;
+import com.fuyuanshen.system.domain.bo.SysUserBo;
+import com.fuyuanshen.system.mapper.SysRoleMapper;
+import com.fuyuanshen.system.mapper.SysUserRoleMapper;
+import com.fuyuanshen.system.service.ISysUserService;
+import com.fuyuanshen.system.service.impl.SysUserServiceImpl;
+import io.undertow.util.BadRequestException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-0114:31
+ */
+@Service
+@RequiredArgsConstructor
+public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
+
+    private final CustomerMapper customerMapper;
+    private final SysUserServiceImpl userService;
+    private final SysRoleMapper roleMapper;
+    private final SysUserRoleMapper userRoleMapper;
+
+
+    /**
+     * 分页查询客户
+     *
+     * @param criteria
+     * @param page
+     * @return
+     */
+    @Override
+    public TableDataInfo<ConsumerVo> queryCustomers(UserQueryCriteria criteria, Page<Customer> page) {
+        criteria.setOffset(page.offset());
+        criteria.setPid(LoginHelper.getUserId());
+        List<Customer> users = customerMapper.findCustomers(criteria);
+        List<ConsumerVo> consumerVoList = BeanUtil.copyToList(users, ConsumerVo.class);
+        Long total = customerMapper.countCustomers(criteria);
+        // return PageUtil.toPage(consumerVoList, total);
+        return new TableDataInfo<ConsumerVo>(consumerVoList, total);
+    }
+
+
+    /**
+     * 查询所有客户
+     *
+     * @param criteria
+     * @return
+     */
+    @Override
+    public List<Customer> queryAllCustomers(UserQueryCriteria criteria) {
+        criteria.setPid(LoginHelper.getUserId());
+        List<Customer> users = customerMapper.queryAllCustomers(criteria);
+        return users;
+    }
+
+
+    /**
+     * 新增客户
+     *
+     * @param customer /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addCustomer(Customer customer) throws BadRequestException {
+
+        LoginUser loginUser = LoginHelper.getLoginUser();
+
+        UserQueryCriteria userQueryCriteria = new UserQueryCriteria();
+        userQueryCriteria.setCustomerName(customer.getUserName());
+        List<Customer> customers = customerMapper.queryCustomers(userQueryCriteria);
+        if (!customers.isEmpty()) {
+            throw new BadRequestException("用户名已存在！！！");
+        }
+        customer.setUserLevel((byte) (loginUser.getUserLevel() + 1));
+        customer.setPid(loginUser.getUserId());
+
+        save(customer);
+
+        // 新增用户与角色管理
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserId(customer.getCustomerId());
+        sysUserRole.setRoleId(ArrayConstants.DEFAULT_LONG);
+        userRoleMapper.insert(sysUserRole);
+
+    }
+
+
+    /**
+     * 修改客户
+     *
+     * @param resources /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateCustomer(Customer resources) throws Exception {
+        if (resources.getEnabled()) {
+            resources.setStatus("0");
+        } else {
+            resources.setStatus("1");
+        }
+        saveOrUpdate(resources);
+    }
+
+
+    /**
+     * 删除客户
+     *
+     * @param ids /
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Set<Long> ids) {
+        customerMapper.deleteByIds(ids);
+    }
+
+
+}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/mapper/CustomerMapper.java

@@ -1,27 +0,0 @@
-package com.fuyuanshen.fyscustomer.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fuyuanshen.fyscustomer.domain.Customer;
-import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author: 默苍璃
- * @date: 2025-07-0114:37
- */
-@Mapper
-public interface CustomerMapper extends BaseMapper<Customer> {
-
-    /**
-     * 查询所有客户
-     *
-     * @param criteria
-     * @return
-     */
-    List<Customer> queryAllCustomers(@Param("criteria") UserQueryCriteria criteria);
-
-
-}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/CustomerService.java

@@ -1,47 +0,0 @@
-package com.fuyuanshen.fyscustomer.service;
-
-import com.fuyuanshen.fyscustomer.domain.Customer;
-import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author: 默苍璃
- * @date: 2025-07-0114:31
- */
-public interface CustomerService {
-
-    /**
-     * 查询所有客户
-     *
-     * @param criteria
-     * @return
-     */
-    List<Customer> queryAllCustomers(UserQueryCriteria criteria);
-
-    /**
-     * 新增客户
-     *
-     * @param customer /
-     */
-    void addCustomer(Customer customer);
-
-    /**
-     * 修改客户
-     *
-     * @param resources /
-     * @throws Exception /
-     */
-    void updateCustomer(Customer resources) throws Exception;
-
-    /**
-     * 删除客户
-     *
-     * @param ids /
-     */
-    void delete(Set<Long> ids);
-
-
-
-}

fys-modules/fys-customer/src/main/java/com/fuyuanshen/fyscustomer/service/impl/CustomerServiceImpl.java

@@ -1,75 +0,0 @@
-package com.fuyuanshen.fyscustomer.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fuyuanshen.fyscustomer.domain.Customer;
-import com.fuyuanshen.fyscustomer.domain.query.UserQueryCriteria;
-import com.fuyuanshen.fyscustomer.mapper.CustomerMapper;
-import com.fuyuanshen.fyscustomer.service.CustomerService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author: 默苍璃
- * @date: 2025-07-0114:31
- */
-@Service
-@RequiredArgsConstructor
-public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
-
-    private final CustomerMapper customerMapper;
-
-
-    /**
-     * 查询所有客户
-     *
-     * @param criteria
-     * @return
-     */
-    @Override
-    public List<Customer> queryAllCustomers(UserQueryCriteria criteria) {
-        List<Customer> users = customerMapper.queryAllCustomers(criteria);
-        return users;
-    }
-
-
-    /**
-     * 新增客户
-     *
-     * @param customer /
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void addCustomer(Customer customer) {
-
-    }
-
-
-    /**
-     * 修改客户
-     *
-     * @param resources /
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCustomer(Customer resources) throws Exception {
-
-    }
-
-
-    /**
-     * 删除客户
-     *
-     * @param ids /
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(Set<Long> ids) {
-
-    }
-
-
-}

fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -1,8 +1,8 @@
 <?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.fyscustomer.mapper.CustomerMapper">
-    <resultMap id="BaseResultMap" type="com.fuyuanshen.fyscustomer.domain.Customer">
-        <id column="user_user_id" property="userId"/>
+<mapper namespace="com.fuyuanshen.customer.mapper.CustomerMapper">
+    <resultMap id="BaseResultMap" type="com.fuyuanshen.customer.domain.Customer">
+        <id column="user_user_id" property="customerId"/>
         <result column="user_dept_id" property="deptId"/>
         <result column="user_user_name" property="userName"/>
         <result column="user_nick_name" property="nickName"/>
@@ -37,7 +37,9 @@
     </sql>
 
     <sql id="Base_Column_List">
-        u1.user_id
+        u1
+        .
+        user_id
         as user_user_id, u1.dept_id as user_dept_id, u1.user_name as user_user_name,
            u1.nick_name as user_nick_name, u1.email as user_email, u1.phone as user_phone,
            u1.gender as user_gender, u1.avatar_name as user_avatar_name, u1.avatar_path as user_avatar_path,
@@ -48,12 +50,16 @@
     </sql>
 
     <sql id="Job_Column_List">
-        j        .        job_id
+        j
+        .
+        job_id
         as job_id, j.name as job_name
     </sql>
 
     <sql id="Role_Column_List">
-        r        .        role_id
+        r
+        .
+        role_id
         as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
     </sql>
 
@@ -62,8 +68,8 @@
             <if test="criteria.id != null">
                 and u1.user_id = #{criteria.id}
             </if>
-            <if test="criteria.enabled != null">
-                and u1.enabled = #{criteria.enabled}
+            <if test="criteria.status != null">
+                and u.status = #{criteria.status}
             </if>
             <if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
                 and u1.dept_id in
@@ -84,87 +90,11 @@
         </where>
     </sql>
 
-    <!-- user_user_id 是您在SELECT子句中创建的别名，但ORDER BY不能直接使用这个别名引用原始表 -->
-    <select id="findAll" resultMap="BaseResultMap">
-        select
-        u.*,
-        <include refid="Job_Column_List"/>,
-        <include refid="Role_Column_List"/>
-        from (
-        select
-        <include refid="Base_Column_List"/>
-        from sys_user u1
-        left join sys_dept d on u1.dept_id = d.dept_id
-        <include refid="Whrer_Sql"/>
-        order by u1.user_id desc
-        <if test="criteria.offset != null">
-            limit #{criteria.offset}, #{criteria.size}
-        </if>
-        ) u
-        left join sys_users_jobs suj on u.user_user_id = suj.user_id
-        left join sys_job j on suj.job_id = j.job_id
-        left join sys_users_roles sur on u.user_user_id = sur.user_id
-        left join sys_role r on sur.role_id = r.role_id
-        order by u.user_user_id desc
-    </select>
-
-
-    <!-- 根据条件查询 用户 -->
-    <select id="selectByQuery" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        SELECT u.*
-        FROM sys_user u
-        <where>
-            <if test="userQuery.pid != null">
-                AND u.pid = #{userQuery.pid}
-            </if>
-        </where>
-        ORDER BY u.user_id DESC
-    </select>
-
-    <!-- 根据条件查询一个用户 -->
-    <select id="selectByQueryOne" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select
-        u.*
-        from sys_user u
-        <where>
-            <if test="userQuery.pid != null">
-                AND u.pid = #{userQuery.pid}
-            </if>
-            <if test="userQuery.nickName != null">
-                AND u.nick_name = #{userQuery.nickName}
-            </if>
-            <if test="userQuery.user_name != null">
-                AND u.user_name = #{userQuery.user_name}
-            </if>
-            <if test="userQuery.password != null">
-                AND u.password = #{userQuery.password}
-            </if>
-        </where>
-    </select>
-
-
-    <!-- 根据租户ID查询用户 -->
-    <select id="findByTenantId" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select
-        u.*
-        from sys_user u
-        <where>
-            <if test="tenantId != null">
-                and u.tenant_id = #{tenantId}
-            </if>
-        </where>
-    </select>
-
-    <select id="countAll" resultType="java.lang.Long">
-        select count(*)
-        from sys_user u1
-        <include refid="Whrer_Sql"/>
-    </select>
 
     <!-- 分页查询客户 -->
-    <select id="findCustomers" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
+    <select id="findCustomers" resultType="com.fuyuanshen.customer.domain.Customer">
         select
-        u.user_id as id, u.nick_name , u.user_name, u.enabled, u.create_time
+        u.user_id as customerId, u.nick_name , u.user_name, u.enabled, u.create_time,u.status
         from sys_user u
         <where>
             <if test="criteria.ids != null and !criteria.ids.isEmpty()">
@@ -173,19 +103,22 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="criteria.pid != null">
+                and u.pid = #{criteria.pid}
+            </if>
             <if test="criteria.blurry != null and criteria.blurry.trim() != ''">
                 and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%')
             </if>
-            <if test="criteria.enabled != null">
-                and u.enabled = #{criteria.enabled}
+            <if test="criteria.status != null">
+                and u.status = #{criteria.status}
             </if>
-            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
-                and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
+                and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
             </if>
         </where>
         order by u.user_id desc
         <if test="criteria.offset != null">
-            limit #{criteria.offset}, #{criteria.size}
+            limit #{criteria.offset}, #{criteria.pageSize}
         </if>
     </select>
 
@@ -200,21 +133,24 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="criteria.pid != null">
+                and u.pid = #{criteria.pid}
+            </if>
             <if test="criteria.blurry != null and criteria.blurry.trim() != ''">
                 and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%')
             </if>
-            <if test="criteria.enabled != null">
-                and u.enabled = #{criteria.enabled}
+            <if test="criteria.status != null">
+                and u.status = #{criteria.status}
             </if>
-            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
-                and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
+                and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
             </if>
         </where>
     </select>
 
     <!-- 查询所有客户 -->
-    <select id="queryAllCustomers" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select u.user_id as id,
+    <select id="queryAllCustomers" resultType="com.fuyuanshen.customer.domain.Customer">
+        select u.user_id as customerId,
         u.nick_name,
         u.user_name,
         u.enabled,
@@ -228,210 +164,41 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="criteria.pid != null">
+                and u.pid = #{criteria.pid}
+            </if>
         </where>
     </select>
 
-    <select id="findByuser_name" resultMap="BaseResultMap">
-        select
-        u1.password user_password, u1.is_admin user_is_admin, u1.tenant_id,
-        <include refid="Base_Column_List"/>
-        from sys_user u1
-        left join sys_dept d on u1.dept_id = d.dept_id
-        where u1.user_name = #{user_name}
-    </select>
 
-
-    <select id="findByNickName" resultMap="BaseResultMap">
-        select
-        u1.password user_password, u1.is_admin user_is_admin, u1.tenant_id,
-        <include refid="Base_Column_List"/>
-        from sys_user u1
-        left join sys_dept d on u1.dept_id = d.dept_id
-        where u1.nick_name = #{nickName}
-    </select>
-
-
-    <select id="findByEmail" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select user_id as id, user_name
-        from sys_user
-        where email = #{email}
-    </select>
-
-    <select id="findByPhone" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select user_id as id, user_name
-        from sys_user
-        where phone = #{phone}
-    </select>
-
-    <select id="findByRoleId" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        SELECT u.user_id as id, u.user_name
-        FROM sys_user u,
-             sys_users_roles r
-        WHERE u.user_id = r.user_id
-          AND r.role_id = #{roleId}
-        group by u.user_id
-    </select>
-
-    <select id="findByRoleDeptId" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        SELECT u.*
-        FROM sys_user u,
-             sys_users_roles r,
-             sys_roles_depts d
-        WHERE u.user_id = r.user_id
-          AND r.role_id = d.role_id
-          AND d.dept_id = #{deptId}
-        group by u.user_id
-    </select>
-
-    <select id="findByMenuId" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        SELECT u.user_id as id, u.user_name
-        FROM sys_user u,
-             sys_users_roles ur,
-             sys_roles_menus rm
-        WHERE u.user_id = ur.user_id
-          AND ur.role_id = rm.role_id
-          AND rm.menu_id = #{menuId}
-        group by u.user_id
-    </select>
-
-    <select id="countByJobs" resultType="int">
-        SELECT count(*) FROM sys_user u, sys_users_jobs j
-        WHERE u.user_id = j.user_id AND j.job_id IN
-        <foreach collection="jobIds" item="jobId" open="(" separator="," close=")">
-            #{jobId}
-        </foreach>
-    </select>
-
-    <select id="countByDepts" resultType="int">
-        SELECT count(*) FROM sys_user u
-        WHERE u.dept_id IN
-        <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
-            #{deptId}
-        </foreach>
-    </select>
-
-    <select id="countByRoles" resultType="int">
-        SELECT count(*) FROM sys_user u, sys_users_roles r
-        WHERE u.user_id = r.user_id AND r.role_id in
-        <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
-            #{roleId}
-        </foreach>
-    </select>
-
-
-    <update id="resetPwd">
-        update sys_user set password = #{pwd}
-        where user_id in
-        <foreach collection="userIds" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
-    <!-- 获取当前用户以及子用户 -->
-    <select id="getSubUsers" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        SELECT u.user_id AS id,
-               u.nick_name,
-               u.user_name,
-               u.enabled,
-               u.create_time
-        FROM sys_user u
-        WHERE u.pid = #{currentUserId}
-           OR u.user_id = #{currentUserId}
-    </select>
-
-    <!-- 获取当前用户以及子用户(递归) -->
-    <select id="findUserTree1" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        WITH RECURSIVE UserTree AS (
-            -- 初始查询：查找指定用户自己
-            SELECT user_id AS id, user_name, pid
-            FROM sys_user
-            WHERE user_id = #{currentUserId} -- 替换为你要查询的用户ID
-
-            UNION ALL
-
-            -- 递归部分：查找所有子节点
-            SELECT u.user_id AS id, u.user_name, u.pid
-            FROM sys_user u
-                     INNER JOIN UserTree ut ON u.pid = ut.id)
-        SELECT *
-        FROM UserTree;
-    </select>
-
-    <!--  获取当前用户以及子用户(递归)不包含本身  -->
-    <select id="findUserTree" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        WITH RECURSIVE UserTree AS (
-            -- 初始查询：查找当前用户的直接子节点
-            SELECT user_id AS id, user_name, pid
-            FROM sys_user
-            WHERE pid = #{currentUserId} -- 当前用户的子节点
-
-            UNION ALL
-
-            -- 递归部分：查找所有后代节点
-            SELECT u.user_id AS id, u.user_name, u.pid
-            FROM sys_user u
-                     INNER JOIN UserTree ut ON u.pid = ut.id)
-        SELECT *
-        FROM UserTree;
-    </select>
-
-
-    <select id="findCustomers1" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        select
-        u.user_id as id, u.nick_name , u.user_name, u.enabled, u.create_time,
-        u.pid -- 确保包含 pid 字段
+    <!-- 根据条件查询客户 -->
+    <select id="queryCustomers" resultType="com.fuyuanshen.customer.domain.Customer"
+            parameterType="com.fuyuanshen.customer.domain.query.UserQueryCriteria">
+        select u.user_id as customerId,
+        u.nick_name,
+        u.user_name,
+        u.enabled,
+        u.create_time
         from sys_user u
         <where>
-            <if test="criteria.ids != null and !criteria.ids.isEmpty()">
-                and u.pid IN
-                <foreach item="item" collection="criteria.ids" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="criteria.blurry != null and criteria.blurry.trim() != ''">
-                and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%')
-            </if>
-            <if test="criteria.enabled != null">
-                and u.enabled = #{criteria.enabled}
-            </if>
-            <if test="criteria.createTime != null and criteria.createTime.size() != 0">
-                and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
+            <if test="criteria.customerName != null and criteria.customerName.trim() != ''">
+                and u.user_name = TRIM(#{criteria.customerName})
             </if>
         </where>
-        order by u.user_id desc
-        <if test="criteria.offset != null">
-            limit #{criteria.offset}, #{criteria.size}
-        </if>
     </select>
 
-    <select id="findUsersWithAncestorsByIds" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        WITH RECURSIVE user_tree AS (
-        SELECT * FROM sys_user WHERE user_id IN
-        <foreach item="item" collection="ids" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        UNION ALL
-        SELECT u.* FROM sys_user u
-        INNER JOIN user_tree ut ON u.user_id = ut.pid
-        )
-        SELECT DISTINCT * FROM user_tree;
-    </select>
-
-    <!-- 获取当前用户的祖先用户 -->
-    <select id="findAncestorsById" resultType="com.fuyuanshen.fyscustomer.domain.Customer">
-        WITH RECURSIVE user_ancestors AS (SELECT user_id, pid, tenant_id
-                                          FROM sys_user
-                                          WHERE user_id = #{currentUserId}
-
-                                          UNION ALL
-
-                                          SELECT u.user_id, u.pid, u.tenant_id
-                                          FROM sys_user u
-                                                   INNER JOIN user_ancestors a ON u.user_id = a.pid)
-        SELECT *
-        FROM user_ancestors
-        WHERE user_id != #{currentUserId}
-          AND user_id IS NOT NULL;
+    <!-- 根据id查询客户 -->
+    <select id="queryCustomerById" resultType="com.fuyuanshen.customer.domain.Customer">
+        select u.*,u.user_id as customerId
+        from sys_user u
+        <where>
+            <if test="customerId!= null">
+                and u.user_id = #{customerId}
+            </if>
+            <if test="pid != null">
+                and u.pid = #{pid}
+            </if>
+        </where>
     </select>
 
 

fys-modules/fys-demo/pom.xml

@@ -103,6 +103,11 @@
             <artifactId>fys-common-websocket</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java

@@ -0,0 +1,244 @@
+package com.fuyuanshen.demo.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fuyuanshen.common.core.domain.R;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.nio.file.Files;
+import java.util.Base64;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.Frame;
+import org.bytedeco.javacv.Java2DFrameUtils;
+import org.springframework.http.ResponseEntity;
+
+@RestController
+@RequestMapping("/video")
+public class VideoUploadController {
+
+    // 可配置项：建议从 application.yml 中读取
+    private static final int MAX_VIDEO_SIZE = 10 * 1024 * 1024; // 10 MB
+    private static final int FRAME_RATE = 15; // 每秒抽15帧
+    private static final int DURATION = 2; // 抽2秒
+    private static final int TOTAL_FRAMES = FRAME_RATE * DURATION;
+    private static final int WIDTH = 160;
+    private static final int HEIGHT = 80;
+    private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
+
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SaIgnore
+    public R<List<String>> upload(@RequestParam("file") MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            return R.fail("上传文件不能为空");
+        }
+
+        if (!isVideo(file.getOriginalFilename())) {
+            return R.fail("只允许上传视频文件");
+        }
+
+        if (file.getSize() > MAX_VIDEO_SIZE) {
+            return R.fail("视频大小不能超过10MB");
+        }
+
+        File tempFile = null;
+        try {
+            // 创建临时文件保存上传的视频
+            tempFile = createTempVideoFile(file);
+
+
+            List<BufferedImage> frames = extractFramesFromVideo(tempFile);
+            if (frames.isEmpty()) {
+                return R.fail("无法提取任何帧");
+            }
+
+            // ✅ 新增：保存帧为图片
+            //saveFramesToLocal(frames, "extracted_frame");
+
+            byte[] binaryData = convertFramesToRGB565(frames);
+//            String base64Data = Base64.getEncoder().encodeToString(binaryData);
+//
+//            return R.ok(base64Data);
+            // 构造响应头
+            // 将二进制数据转为 Hex 字符串
+            // 转换为 Hex 字符串列表
+            List<String> hexList = bytesToHexList(binaryData);
+
+            return R.ok(hexList);
+
+        } catch (Exception e) {
+            return R.fail("视频处理失败：" + e.getMessage());
+        } finally {
+            deleteTempFile(tempFile);
+        }
+    }
+
+    /**
+     * rgb565 转 hex
+     */
+    private List<String> bytesToHexList(byte[] bytes) {
+        List<String> hexList = new ArrayList<>();
+        for (byte b : bytes) {
+            int value = b & 0xFF;
+            char high = HEX_ARRAY[value >>> 4];
+            char low = HEX_ARRAY[value & 0x0F];
+            hexList.add(String.valueOf(high) + low);
+        }
+        return hexList;
+    }
+
+    /**
+     * 创建临时文件并保存上传的视频
+     */
+    private File createTempVideoFile(MultipartFile file) throws Exception {
+        File tempFile = Files.createTempFile("upload-", ".mp4").toFile();
+        file.transferTo(tempFile);
+        return tempFile;
+    }
+
+    /**
+     * 从视频中按时间均匀提取指定数量的帧
+     */
+    private List<BufferedImage> extractFramesFromVideo(File videoFile) throws Exception {
+        List<BufferedImage> frames = new ArrayList<>();
+
+        try (FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(videoFile)) {
+            grabber.start();
+
+            // 获取视频总帧数和帧率
+            long totalFramesInVideo = grabber.getLengthInFrames();
+            int fps = (int) Math.round(grabber.getFrameRate());
+            if (fps <= 0) fps = 30;
+
+            double durationSeconds = (double) totalFramesInVideo / fps;
+
+            if (durationSeconds < DURATION) {
+                throw new IllegalArgumentException("视频太短，至少需要 " + DURATION + " 秒");
+            }
+
+            // 计算每帧之间的间隔（浮点以实现更精确跳转）
+            double frameInterval = (double) totalFramesInVideo / TOTAL_FRAMES;
+
+            for (int i = 0; i < TOTAL_FRAMES; i++) {
+                int targetFrameNumber = (int) Math.round(i * frameInterval);
+
+                // 避免设置无效帧号
+                if (targetFrameNumber >= totalFramesInVideo) {
+                    throw new IllegalArgumentException("目标帧超出范围: " + targetFrameNumber + " ");
+                }
+
+                grabber.setFrameNumber(targetFrameNumber);
+                Frame frame = grabber.grab();
+
+                if (frame != null && frame.image != null) {
+                    BufferedImage bufferedImage = Java2DFrameUtils.toBufferedImage(frame);
+                    frames.add(cropImage(bufferedImage, WIDTH, HEIGHT));
+                } else {
+                    throw new IllegalArgumentException("无法获取第 " + targetFrameNumber + "帧 ");
+                }
+            }
+
+            grabber.stop();
+        }
+
+        return frames;
+    }
+
+    /**
+     * 将抽取的帧保存到本地，用于调试
+     */
+    private void saveFramesToLocal(List<BufferedImage> frames, String prefix) {
+        // 指定输出目录
+        File outputDir = new File("output_frames");
+        if (!outputDir.exists()) {
+            outputDir.mkdirs();
+        }
+
+        int index = 0;
+        for (BufferedImage frame : frames) {
+            try {
+                File outputImage = new File(outputDir, prefix + "_" + (index++) + ".png");
+                ImageIO.write(frame, "png", outputImage);
+                System.out.println("保存帧图片成功: " + outputImage.getAbsolutePath());
+            } catch (Exception e) {
+                throw new IllegalArgumentException("保存帧图片失败 " + e);
+            }
+        }
+    }
+
+    /**
+     * 将所有帧转换为 RGB565 格式字节数组
+     */
+    private byte[] convertFramesToRGB565(List<BufferedImage> frames) throws Exception {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+        for (BufferedImage image : frames) {
+            byte[] rgb565Bytes = convertToRGB565(image);
+            byteArrayOutputStream.write(rgb565Bytes);
+        }
+
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    /**
+     * 判断是否是支持的视频格式
+     */
+    private boolean isVideo(String filename) {
+        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+        return Arrays.asList(".mp4", ".avi", ".mov", ".mkv").contains(ext);
+    }
+
+    /**
+     * 裁剪图像到目标尺寸
+     */
+    private BufferedImage cropImage(BufferedImage img, int targetWidth, int targetHeight) {
+        int w = Math.min(img.getWidth(), targetWidth);
+        int h = Math.min(img.getHeight(), targetHeight);
+        return img.getSubimage(0, 0, w, h);
+    }
+
+    /**
+     * 将 BufferedImage 转换为 RGB565 格式的字节数组
+     */
+    private byte[] convertToRGB565(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        byte[] result = new byte[width * height * 2]; // RGB565: 2 bytes per pixel
+        int index = 0;
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = image.getRGB(x, y);
+                int r = ((rgb >> 16) & 0xFF) >> 3;
+                int g = ((rgb >> 8) & 0xFF) >> 2;
+                int b = (rgb & 0xFF) >> 3;
+                short pixel = (short) ((r << 11) | (g << 5) | b);
+
+                result[index++] = (byte) (pixel >> 8); // High byte first
+                result[index++] = (byte) pixel;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 删除临时文件
+     */
+    private void deleteTempFile(File file) {
+        if (file != null && file.exists()) {
+            if (!file.delete()) {
+                throw new IllegalArgumentException("无法删除临时文件:  " + file.getAbsolutePath());
+            }
+        }
+    }
+}

fys-modules/fys-equipment/pom.xml

@@ -17,6 +17,12 @@
     </description>
 
     <dependencies>
+
+        <!-- <dependency> -->
+        <!--     <groupId>com.fuyuanshen</groupId> -->
+        <!--     <artifactId>fys-app</artifactId> -->
+        <!-- </dependency> -->
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.fuyuanshen</groupId>
@@ -38,6 +44,11 @@
             <artifactId>fys-common-translation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-system</artifactId>
+        </dependency>
+
         <!-- OSS功能模块 -->
         <dependency>
             <groupId>com.fuyuanshen</groupId>
@@ -101,18 +112,24 @@
             <artifactId>fys-common-sse</artifactId>
         </dependency>
 
+        <!-- 客户管理模块 -->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-customer</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>
 
+        <!-- fastjson2 -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.54</version>
+        </dependency>
     </dependencies>
 
 

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

@@ -0,0 +1,54 @@
+package com.fuyuanshen.equipment.controller;
+
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.UserAppBo;
+import com.fuyuanshen.equipment.service.AppUserService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Tag(name = "设备管理", description = "设备：设备管理")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/app/device1")
+public class DeviceAPPController extends BaseController {
+
+    private final AppUserService appUserService;
+
+
+    /**
+     * 修改APP用户信息
+     */
+    // @SaCheckPermission("app:user:edit")
+    @Log(title = "APP用户信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAppBo bo) {
+        return toAjax(appUserService.updateByBo(bo));
+    }
+
+
+
+
+
+
+}
+
+

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

@@ -1,20 +1,36 @@
 package com.fuyuanshen.equipment.controller;
 
 
+import com.alibaba.excel.EasyExcel;
 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.R;
 import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.utils.file.FileUtil;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.customer.mapper.CustomerMapper;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
 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.excel.DeviceImportParams;
+import com.fuyuanshen.equipment.excel.UploadDeviceDataListener;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.DeviceTypeService;
+import com.fuyuanshen.equipment.service.impl.DeviceExportService;
+import com.fuyuanshen.system.service.ISysOssService;
 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 io.undertow.util.BadRequestException;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,160 +47,164 @@ import java.util.List;
  * @Date: 2025/5/16
  **/
 @Slf4j
-@Tag(name = "设备管理", description = "设备：设备管理")
+@Tag(name = "web:设备管理", description = "web:设备管理")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/device")
-public class DeviceController {
+public class DeviceController extends BaseController {
 
+    private final ISysOssService ossService;
     private final DeviceService deviceService;
+    private final DeviceMapper deviceMapper;
+    private final CustomerMapper customerMapper;
+    private final DeviceTypeService deviceTypeService;
+    private final DeviceTypeMapper deviceTypeMapper;
+
+    private final DeviceExportService exportService;
 
 
     @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);
+    public TableDataInfo<Device> queryDevice(DeviceQueryCriteria criteria) throws IOException {
+        Page<Device> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
+        return deviceService.queryAll(criteria, page);
     }
 
 
     // @Log("新增设备")
     @Operation(summary = "新增设备")
     @PostMapping(value = "/add")
-    public ResponseVO<Object> addDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+    public R<Void> addDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
         try {
             deviceService.addDevice(deviceForm);
         } catch (Exception e) {
             log.error("addDevice error: " + e.getMessage());
-            return ResponseVO.fail(e.getMessage());
+            return R.fail(e.getMessage());
         }
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 
     // @Log("修改设备")
     @Operation(summary = "修改设备")
     @PutMapping(value = "/update")
-    public ResponseVO<Object> updateDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+    public R<Void> updateDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
         try {
             deviceService.update(deviceForm);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("updateDevice error: " + e.getMessage());
-            return ResponseVO.fail("出错了");
+            return R.fail(e.getMessage());
         }
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 
     @Operation(summary = "设备详情")
     @GetMapping(value = "/detail/{id}")
-    public ResponseVO<Object> getDevice(@PathVariable Long id) {
+    public R<Device> getDevice(@PathVariable Long id) {
         Device device = deviceService.getById(id);
-        return ResponseVO.success(device);
+        return R.ok(device);
     }
 
 
     // @Log("删除设备")
     @Operation(summary = "删除设备")
     @DeleteMapping(value = "/delete")
-    public ResponseVO<Object> deleteDevice(@Parameter(name = "传ID数组[]") @RequestBody List<Long> ids) {
+    public R<Void> deleteDevice(@Parameter(name = "传ID数组[]") @RequestBody List<Long> ids) {
         deviceService.deleteAll(ids);
-        // deviceService.deleteAssign(ids);
-        return ResponseVO.success(ResponseMessageConstants.DELETE_SUCCESS);
+        return R.ok();
     }
 
 
     @Operation(summary = "设备定位")
     @GetMapping(value = "/locateDevice")
-    public ResponseVO<Object> locateDevice(DeviceQueryCriteria criteria) throws IOException {
+    public R<List<Device>> locateDevice(DeviceQueryCriteria criteria) throws IOException {
         List<Device> devices = deviceService.queryAllDevices(criteria);
-        return ResponseVO.success(devices);
+        return R.ok(devices);
     }
 
 
     // @Log("分配客户")
     @Operation(summary = "分配客户")
     @PutMapping(value = "/assignCustomer")
-    public ResponseVO<Object> assignCustomer(@Validated @RequestBody CustomerVo customerVo) {
+    public R<Void> assignCustomer(@Validated @RequestBody CustomerVo customerVo) {
         deviceService.assignCustomer(customerVo);
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 
     // @Log("撤回设备")
-    @Operation(summary = "撤回设备")
+    @Operation(summary = "撤回分配设备")
     @PostMapping(value = "/withdraw")
-    public ResponseVO<Object> withdrawDevice(@Validated @ModelAttribute DeviceForm deviceForm) {
+    public R<Void> withdrawDevice(@RequestBody List<Long> ids) {
         try {
-            deviceService.withdrawDevice(deviceForm);
+            deviceService.withdrawDevice(ids);
         } catch (Exception e) {
             log.error("updateDevice error: " + e.getMessage());
-            return ResponseVO.fail("出错了");
+            return R.fail(e.getMessage());
         }
-        return ResponseVO.success(null);
+        return R.ok();
     }
 
 
     /**
-     * @param deviceForm
+     * @param id
      * @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 = "WEB端解绑设备")
+    @GetMapping(value = "/unbind")
+    public R<Void> unbindDevice(@Validated Long id) {
+        return toAjax(deviceService.webUnBindDevice(id));
     }
 
 
     @Operation(summary = "导出数据设备")
     @GetMapping(value = "/download")
-    public void exportDevice(HttpServletResponse response, DeviceQueryCriteria criteria) throws IOException {
-
+    public R<Void> exportDevice(HttpServletResponse response, DeviceQueryCriteria criteria) throws IOException {
+        List<Device> devices = deviceService.queryAll(criteria);
+        exportService.export(devices, response);
+        return R.ok();
     }
 
 
     @Operation(summary = "导入设备数据")
     @PostMapping(value = "/import", consumes = "multipart/form-data")
-    public ResponseVO<ImportResult> importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) {
+    public R<ImportResult> importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) throws BadRequestException {
 
-        // 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;
+        String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
+        if (!("xlsx".equalsIgnoreCase(suffix))) {
+            throw new BadRequestException("只能上传Excel——xlsx格式文件");
+        }
+
+        ImportResult result = new ImportResult();
+        try {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            DeviceImportParams params = DeviceImportParams.builder().ossService(ossService)
+                    .deviceService(deviceService).tenantId(loginUser.getTenantId())
+                    .file(file).filePath("").deviceMapper(deviceMapper).deviceTypeService(deviceTypeService)
+                    .deviceTypeMapper(deviceTypeMapper).userId(loginUser.getUserId())
+                    .customerMapper(customerMapper).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 R.ok(message, result);
+        } catch (Exception e) {
+            log.error("导入设备数据出错: {}", e.getMessage(), e);
+            // 在异常情况下，设置默认结果
+            String errorMessage = String.format("导入失败: %s。成功 %d 条，失败 %d 条", e.getMessage(), result.getSuccessCount(), result.getFailureCount());
+            // 使用新方法确保类型正确
+            return R.fail(errorMessage, result);
+        }
     }
 
 }