liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into dyf-device

Browse Source
This commit is contained in:
daiyongfei
2025-07-07 11:41:04 +08:00
parent f338ef47d1 6b2ebf2414
commit 26cba479e2
13 changed files with 392 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,49 +0,0 @@
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.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 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/device")
public class AppDeviceController extends BaseController {
private final DeviceService deviceService;
/**
* 查询设备信息列表
*/
@GetMapping("/list")
public TableDataInfo<DeviceVo> list(AppUserBo bo, PageQuery pageQuery) {
return deviceService.queryPageList(bo, pageQuery);
}
}

9
fys-admin/src/main/resources/application-dev.yml
View File

@ -293,3 +293,12 @@ file:
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