From 307d735aaad826a2e09f608ee8c5f1ba42df05bd Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 27 May 2025 09:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=97=A0=E5=8A=A8?= =?UTF-8?q?=E5=8A=9B=E8=AE=BE=E5=A4=87=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 13 ++-- .../src/main/resources/application.yml | 4 +- .../api/controller/BroadApiController.java | 9 +++ .../com/ruoyi/api/domain/NoPowerDevice.java | 78 +++++++++++++++++++ .../com/ruoyi/api/mapper/BroadApiMapper.java | 3 + .../api/service/impl/BroadApiService.java | 13 +++- .../main/resources/mapper/BroadApiMapper.xml | 14 ++++ .../common/utils/file/MimeTypeUtils.java | 2 +- 8 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/domain/NoPowerDevice.java diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3b5ebf0..ab4598f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,16 +6,17 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://119.45.202.115:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://119.45.202.115:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://1.13.177.47:3306/bg_wheel_chocks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: haiwei@123 + password: Haiwei123456 # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: + enabled: true + url: jdbc:mysql://119.45.202.115:3306/no_power_control?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: haiwei@123 # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 632da07..1a090c5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -64,9 +64,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 20MB + max-file-size: 50MB # 设置总上传的文件大小 - max-request-size: 30MB + max-request-size: 50MB # 服务模块 devtools: restart: diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java index c14092f..0feb61a 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java @@ -1,6 +1,7 @@ package com.ruoyi.api.controller; import com.ruoyi.api.domain.BroadCountNumber; +import com.ruoyi.api.domain.NoPowerDevice; import com.ruoyi.api.service.impl.BroadApiService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.manage.domain.BaseStore; @@ -46,5 +47,13 @@ public class BroadApiController { } + @PostMapping("/getDevice") + @ResponseBody + public AjaxResult getDevice(String storeName){ + List list=service.getDevice(storeName); + return AjaxResult.success(list); + } + + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/domain/NoPowerDevice.java b/ruoyi-api/src/main/java/com/ruoyi/api/domain/NoPowerDevice.java new file mode 100644 index 0000000..79d2c33 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/api/domain/NoPowerDevice.java @@ -0,0 +1,78 @@ +package com.ruoyi.api.domain; + +import com.ruoyi.common.annotation.Excel; + +public class NoPowerDevice { + + /** 摆放桩位 */ + @Excel(name = "摆放桩位") + private String locationName; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String deviceCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String deviceName; + + /** 设备类型 */ + @Excel(name = "设备类型") + private Long deviceType; + + /** 使用状态 */ + @Excel(name = "使用状态 0=空闲 1=使用中") + private String useState; + + /** 设备状态 */ + @Excel(name = "设备状态 0=停用 1=正常 2=维修中") + private String deviceState; + + public String getLocationName() { + return locationName; + } + + public void setLocationName(String locationName) { + this.locationName = locationName; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public Long getDeviceType() { + return deviceType; + } + + public void setDeviceType(Long deviceType) { + this.deviceType = deviceType; + } + + public String getUseState() { + return useState; + } + + public void setUseState(String useState) { + this.useState = useState; + } + + public String getDeviceState() { + return deviceState; + } + + public void setDeviceState(String deviceState) { + this.deviceState = deviceState; + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java index 415c5ee..a776901 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.api.mapper; import com.ruoyi.api.domain.BroadCountNumber; +import com.ruoyi.api.domain.NoPowerDevice; import com.ruoyi.manage.domain.BaseStore; import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.stereotype.Repository; @@ -20,4 +21,6 @@ public interface BroadApiMapper { List getCountNumberById(int id); List getLedgerByCode(String locationCode); + + List getDevice(String storeName); } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java index c5f7923..8299d45 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java @@ -1,7 +1,10 @@ package com.ruoyi.api.service.impl; import com.ruoyi.api.domain.BroadCountNumber; +import com.ruoyi.api.domain.NoPowerDevice; import com.ruoyi.api.mapper.BroadApiMapper; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.manage.domain.BaseStore; import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.beans.factory.annotation.Autowired; @@ -15,9 +18,8 @@ import java.util.List; */ @Service public class BroadApiService { -@Autowired -private BroadApiMapper mapper; - + @Autowired + private BroadApiMapper mapper; public List getArea() { @@ -31,4 +33,9 @@ private BroadApiMapper mapper; public List getLedgerByCode(String locationCode) { return mapper.getLedgerByCode(locationCode); } + + @DataSource(value = DataSourceType.SLAVE) + public List getDevice(String storeName) { + return mapper.getDevice(storeName); + } } diff --git a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml index 4e0b6e1..b38b8c2 100644 --- a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml @@ -29,6 +29,20 @@ where is_scrap = 1 and location_code = #{locationCode} + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java index 2ffc14a..2041d46 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java @@ -32,7 +32,7 @@ public class MimeTypeUtils // word excel powerpoint "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", // 压缩文件 - "rar", "zip", "gz", "bz2", + "rar", "zip", "gz", "bz2", "7z", // 视频格式 "mp4", "avi", "rmvb", // pdf