From 0271a84bc219f8487395d7822b75fe45972994d6 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Thu, 3 Jul 2025 16:58:08 +0800
Subject: [PATCH] =?UTF-8?q?WEB=EF=BC=9A=E8=AE=BE=E5=A4=87=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-dev.yml | 10 +++----
fys-modules/fys-equipment/pom.xml | 5 ++++
.../controller/DeviceController.java | 27 ++++++++++++-------
.../controller/DeviceTypeController.java | 7 ++---
.../equipment/domain/DeviceType.java | 8 +++---
.../equipment/mapper/DeviceMapper.java | 2 +-
.../equipment/mapper/DeviceTypeMapper.java | 2 +-
.../equipment/service/DeviceService.java | 3 ++-
.../equipment/service/DeviceTypeService.java | 3 ++-
.../service/impl/DeviceServiceImpl.java | 7 +++--
.../service/impl/DeviceTypeServiceImpl.java | 16 +++++++----
11 files changed, 58 insertions(+), 32 deletions(-)
diff --git a/fys-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml
index 43b5507..52b2877 100644
--- a/fys-admin/src/main/resources/application-dev.yml
+++ b/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://120.79.224.186:3366/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: 1fys@QWER..
# # 从库数据源
# slave:
# lazy: true
@@ -98,13 +98,13 @@ spring:
spring.data:
redis:
# 地址
- host: 123.207.99.140
+ host: 120.79.224.186
# 端口,默认为6379
- port: 6379
+ port: 26379
# 数据库索引
database: 2
# redis 密码必须配置
- password: ccxx11234
+ password: 1fys@QWER..
# 连接超时时间
timeout: 10s
# 是否开启ssl
diff --git a/fys-modules/fys-equipment/pom.xml b/fys-modules/fys-equipment/pom.xml
index f1f5e8c..fe09466 100644
--- a/fys-modules/fys-equipment/pom.xml
+++ b/fys-modules/fys-equipment/pom.xml
@@ -38,6 +38,11 @@
fys-common-translation
+
+ com.fuyuanshen
+ fys-system
+
+
com.fuyuanshen
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
index 62f6bc3..f93b997 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuyuanshen.common.core.constant.ResponseMessageConstants;
import com.fuyuanshen.common.core.domain.PageResult;
import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.dto.ImportResult;
import com.fuyuanshen.equipment.domain.form.DeviceForm;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.CustomerVo;
import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+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;
@@ -37,21 +40,23 @@ import java.util.List;
@RequestMapping("/api/device")
public class DeviceController {
+ private final ISysOssService ossService;
private final DeviceService deviceService;
@Operation(summary = "分页查询设备列表", security = {@SecurityRequirement(name = "bearer-key")})
@GetMapping
- public ResponseVO> queryDevice(DeviceQueryCriteria criteria) {
- Page