From 81acb24dd0d1b30bce2598defe49e8be4283d304 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 10 Apr 2021 15:54:28 +0800
Subject: [PATCH] 1.音视频录制
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 1 -
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index bacb942..ef126bc 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -46,7 +46,6 @@
List<AlarmVO> listAll();
List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> getLimit();
- List<AlarmVO> selectListSe(String beginTime, String endTime);
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
void deletejj(String id);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 2502f51..ea1393a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -489,6 +489,10 @@
update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
+ <update id="updateAaddress">
+ update sys_alarm SET aaddress=#{aaddress} where id=#{jid}
+ </update>
+
<select id="selectEq" resultType="java.util.HashMap">
SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
index dc270d6..8d22bd7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
@@ -268,7 +268,7 @@
@PostMapping("put-objecty")
public R puty(@RequestParam MultipartFile file,String jid) throws InvalidPortException, InvalidEndpointException, IOException, XmlPullParserException, NoSuchAlgorithmException, InvalidKeyException, InvalidArgumentException, InternalException, NoResponseException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, RegionConflictException {
MinioClient minioClient = new MinioClient("http://web.byisf.com:9000","adminminio","adminminio");
- if (!minioClient.bucketExists("jfpt")) { //是否存在名为“test”的bucket
+ if (!minioClient.bucketExists("jfpt")) {
minioClient.makeBucket("jfpt");
}
String fileName = file.getOriginalFilename();
--
Gitblit v1.9.3