From 7a42e218979d88408ad54f41880a1fe71dd59e1d Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Thu, 20 Apr 2023 14:20:52 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/entity/OtherData.java    |  2 ++
 .../com/kening/vordm/mapper/DisasterInfoMapper.xml |  1 +
 .../vordm/service/impl/OtherDataServiceImpl.java   | 14 ++++++++------
 .../vordm/service/impl/PictureInfoServiceImpl.java |  4 ----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
index d7d8f9f..deb9653 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
@@ -21,4 +21,6 @@ public class OtherData{
 	private String remark;
 
 	private Long disasterId;
+
+	private Integer visualFlag;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index c665bf9..5f47773 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -77,6 +77,7 @@
             <if test="id != null and id != ''">
                 di.id = #{id}
             </if>
+                and gmdr.STATUS != 2
         </where>
     </select>
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
index 74e40f0..5652da0 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.EntityData;
 import com.kening.vordm.entity.OtherData;
-import com.kening.vordm.mapper.DataUploadMapper;
 import com.kening.vordm.mapper.OtherDataMapper;
-import com.kening.vordm.service.DataUploadService;
 import com.kening.vordm.service.OtherDataService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +23,7 @@ import java.util.Map;
 
 /**
  * 管理员用户实现类
+ *
  * @author liyuchen
  */
 @Slf4j
@@ -45,24 +44,26 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 	 */
 	@Override
 	public IPage queryDisasterPage(IPage page, Map<String, Object> params) {
-		page.setRecords(baseMapper.queryDisasterPage(page,params));
+		page.setRecords(baseMapper.queryDisasterPage(page, params));
 		return page;
 	}
 
 	/**
 	 * 分页列表查询
+	 *
 	 * @param page
 	 * @param params
 	 * @return
 	 */
 	@Override
 	public IPage queryPage(IPage page, Map<String, Object> params) {
-		page.setRecords(baseMapper.queryPage(page,params));
+		page.setRecords(baseMapper.queryPage(page, params));
 		return page;
 	}
 
 	/**
 	 * 根据角色名称获取角色id
+	 *
 	 * @param roleName
 	 * @return
 	 */
@@ -73,13 +74,13 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 
 	/**
 	 * 上传数据
+	 *
 	 * @param OtherData
 	 * @return
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean uploadData(OtherData OtherData) {
-		log.info("上传数据:{}",OtherData);
 		//路径拼接
 		List<String> link = new ArrayList<>();
 		//文件大小
@@ -97,7 +98,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 		//实体数据
 		entityData.setType(OtherData.getType());
 		entityData.setSize(sum);
-		entityData.setLink(StringUtils.join(link,","));
+		entityData.setLink(StringUtils.join(link, ","));
 		entityData.setDisasterId(OtherData.getDisasterId());
 		entityData.setUploadTime(new Date());
 		entityData.setRemark(OtherData.getRemark());
@@ -106,6 +107,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 		entityData.setUploaderId(AuthUtil.getUserId());
 		entityData.setManagerId(AuthUtil.getUserId());
 		entityData.setReviewTime(new Date());
+		entityData.setVisualFlag(OtherData.getVisualFlag());
 		return save(entityData);
 	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
index 9029ced..caeaba5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
@@ -1,8 +1,6 @@
 package com.kening.vordm.service.impl;
 
-import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kening.vordm.entity.EntityData;
 import com.kening.vordm.entity.OtherData;
 import com.kening.vordm.entity.PictureInfo;
 import com.kening.vordm.mapper.PictureInfoMapper;
@@ -11,12 +9,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.oss.MinioTemplate;
 import org.springblade.core.oss.model.BladeFile;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**