From ac9991272ba66cecc08a6053738697de171ff126 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 26 Dec 2024 15:16:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/dashboard/fan/heart12.png | Bin 369 -> 374 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ui/dasadmin/src/assets/dashboard/fan/heart12.png b/ui/dasadmin/src/assets/dashboard/fan/heart12.png index 70b809a488d6999e456dc197526d64143c51b7a6..076b8f9fa3b8ad437b66de1bfe21e3418843e23d 100644 GIT binary patch delta 253 zcmVxsfq&phL_t&-89h)zPQx$|oQVu}Ri%YW%^NsYsRVb5F2DYKc7^JdlHv0W;{$mWM+lvCC0cV9-_SiNOP1+;Owyw%Ai#-z>p}oq4nK=FRLljwda+#Q7P%8u1gJ`E76Af;US$ zGim9kbcYXALksngAnYQ|W+LKak>(6UxZ~^`dLorQ_zp%rk#WC=dRz#OmFQDeWTN@7 zg|;!Zi!`qX9V Date: Thu, 26 Dec 2024 15:35:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=80=BB=E8=A7=88=E5=9B=BE=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/home/windMatrix.vue | 3 +++ ui/dasadmin/src/views/backend/home/windMatrixpage.vue | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index 92703362..b73732c8 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -610,6 +610,9 @@ const getSafeImagePath = (item, type) => { } } } + .grid-content{ + width: 170px; + } .modelOperate{ display: flex; flex-direction: column; diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue index 0fd49d80..a02da561 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue @@ -622,7 +622,9 @@ const getSafeImagePath = (item, type) => { } } } - + .grid-content{ + width: 170px; + } .modelOperate{ display: flex; flex-direction: column; From 2977584b39a750146e13bf139b0d9828317b2c43 Mon Sep 17 00:00:00 2001 From: fengrong Date: Thu, 26 Dec 2024 15:42:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=80=BB=E8=A7=88=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/home/windMatrix.vue | 2 +- ui/dasadmin/src/views/backend/home/windMatrixpage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index b73732c8..cf8435ad 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -143,7 +143,7 @@ const getAnimationStyle = (item) => { let animationDuration; animationDuration = 60 / irotorspeed / 3 const processedoperationmode = item.attributeMap?.processedoperationmode ?? 0 - if(processedoperationmode==33){ + if(processedoperationmode==33||processedoperationmode==0){ return { 'animation-duration': `0s`, 'animation-timing-function': 'linear', diff --git a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue index a02da561..86e4690d 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrixpage.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrixpage.vue @@ -145,7 +145,7 @@ const getAnimationStyle = (item) => { let animationDuration; animationDuration = 60 / irotorspeed / 3 const processedoperationmode = item.attributeMap?.processedoperationmode ?? 0 - if(processedoperationmode==33){ + if(processedoperationmode==33||processedoperationmode==0){ return { 'animation-duration': `0s`, 'animation-timing-function': 'linear', From e4cafde25edf8b51ab3c34a9be314ae4af81a855 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 26 Dec 2024 16:10:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/equipment/entity/SysEquipmentDocs.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysEquipmentDocs.java b/das/src/main/java/com/das/modules/equipment/entity/SysEquipmentDocs.java index ced4545c..27e01eb0 100644 --- a/das/src/main/java/com/das/modules/equipment/entity/SysEquipmentDocs.java +++ b/das/src/main/java/com/das/modules/equipment/entity/SysEquipmentDocs.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,6 +19,7 @@ import java.util.Date; @AllArgsConstructor public class SysEquipmentDocs { + @JsonSerialize(using = ToStringSerializer.class) @TableId(value = "id") private Long id; From 1a9102f3a4830c2db18e5d8ce2e2bed76c75ef7e Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 26 Dec 2024 16:15:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/SysEquipmentServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index 42310c57..45190176 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -444,8 +444,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { List collectDelete = sysEquipmentDocs.stream().filter(item -> !collect.contains(item.getId())).collect(Collectors.toList()); //删除minio文件和数据库记录 for (SysEquipmentDocs item : collectDelete){ - sysEquipmentDocsMapper.deleteById(item.getId()); deleteFile(item); + sysEquipmentDocsMapper.deleteById(item.getId()); } @@ -550,7 +550,6 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { public void deleteFile(SysEquipmentDocs sysEquipmentDocs) { try { - sysEquipmentDocsMapper.deleteById(sysEquipmentDocs.getId()); minioViewsServcie.removeFile(minioAutoProperties.getPublicBucket(), sysEquipmentDocs.getUrl(),false); }catch (Exception e){ log.error("文件删除失败"); From a8fd5cc727e146783b021dfca381416352380276 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 26 Dec 2024 16:30:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?update=E9=99=84=E5=B1=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysEquipmentServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index 45190176..fb35ffc9 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -455,6 +455,16 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { item.setDeviceId(sysGenExtPropsDto.getId()); sysEquipmentDocsMapper.insert(item); } + }else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("deviceid",sysGenExtPropsDto.getId()); + List sysEquipmentDocs = sysEquipmentDocsMapper.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(sysEquipmentDocs)){ + for (SysEquipmentDocs item : sysEquipmentDocs){ + deleteFile(item); + sysEquipmentDocsMapper.deleteById(item.getId()); + } + } } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("deviceid",sysGenExtPropsDto.getId()); From 5786c056d0e6b0bffbfe8069bcb910fe3583881b Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 26 Dec 2024 16:45:36 +0800 Subject: [PATCH 7/7] =?UTF-8?q?update=E9=99=84=E5=B1=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/fdr/service/MinioViewsServcie.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java index a4d555ad..62b7ec17 100644 --- a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java +++ b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java @@ -41,21 +41,16 @@ public class MinioViewsServcie { * @param objectName 文件名称 */ public void removeFile(String bucketName, String objectName, Boolean recursive) throws Exception { - Iterable> results = minioClient.listObjects( - ListObjectsArgs.builder().bucket(bucketName).prefix(objectName).recursive(true).build()); - List> list = StreamSupport.stream(results.spliterator(), false) - .collect(Collectors.toList()); - if (list.size() >= 2 && !recursive) { - throw new IOException("请清空文件后再删除目录"); - } - for (Result result : results) { - Item item = result.get(); + try { minioClient.removeObject( RemoveObjectArgs.builder() .bucket(bucketName) - .object(item.objectName()) + .object(objectName) .build()); + } catch (Exception e) { + log.error("minio删除文件失败{}", e); } + }