From 525346db8768e3a63f14a0f43a922e76cf4b2d1b Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 8 May 2023 18:31:02 +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

---
 .../main/java/com/kening/vordm/vo/CallForHelpVo.java |  2 +-
 .../java/com/kening/vordm/vo/EntityDataUserVo.java   |  2 +-
 .../vordm/controller/DisasterInfoController.java     |  4 ++--
 .../vordm/controller/EntityDataController.java       |  4 ++--
 .../RemoteSensingSourceDataController.java           |  5 +++++
 .../com/kening/vordm/mapper/DisasterInfoMapper.java  |  2 +-
 .../com/kening/vordm/mapper/DisasterInfoMapper.xml   | 10 ++++++++--
 .../com/kening/vordm/mapper/EntityDataMapper.java    |  2 +-
 .../com/kening/vordm/mapper/EntityDataMapper.xml     |  5 +++++
 .../java/com/kening/vordm/mapper/GuestInfoMapper.xml | 10 ++--------
 .../kening/vordm/service/DisasterInfoService.java    |  2 +-
 .../com/kening/vordm/service/EntityDataService.java  |  4 ++--
 .../vordm/service/impl/DisasterInfoServiceImpl.java  |  4 ++--
 .../vordm/service/impl/EntityDataServiceImpl.java    | 12 ++++++++----
 14 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
index 3f42628..cfeefcb 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
@@ -102,5 +102,5 @@ public class CallForHelpVo extends DisasterInfo {
 	 */
 	private Long parentId;
 
-
+	private String roleAlias;
 }
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
index f84c942..7b6338e 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
@@ -167,7 +167,7 @@ public class EntityDataUserVo {
 	/**
 	 * 生产时间
 	 */
-	private Date productTime;
+	private String productTime;
 
 
 	/**
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index eca504f..fb9c123 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -79,11 +79,11 @@ public class DisasterInfoController {
 	})
 	@GetMapping("/list")
 	public R<IPage<CallForHelpVo>> list(CallForHelpVo CallForHelpVo, Query query) {
-		CallForHelpVo userRole = disasterInfoService.getByNameRole("admin");
 		String userRole1 = AuthUtil.getUserRole();
 
 		if (CallForHelpVo.getChiefIdEquals()!=null){
-			if (userRole1.equals("TENANT_ADMIN") && CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){
+			CallForHelpVo userRole = disasterInfoService.getByUserIdRole(CallForHelpVo.getChiefIdEquals());
+			if (userRole1.equals("TENANT_ADMIN") && userRole.getRoleAlias().equals("TENANT_ADMIN")){
 				CallForHelpVo.setChiefIdEquals(null);
 			}
 		}else {
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
index dcb1031..3a43e16 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
@@ -38,8 +38,8 @@ public class EntityDataController {
 	 * @return
 	 */
 	@GetMapping("/getEntityDataSourceOrganization")
-	public R<List<UserTenantVo>> getEntityDataSourceOrganization() {
-		return R.data(entityDataService.getEntityDataSourceOrganization());
+	public R<List<UserTenantVo>> getEntityDataSourceOrganization(Long disasterId) {
+		return R.data(entityDataService.getEntityDataSourceOrganization(disasterId));
 	}
 
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
index d08f310..0d1692b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
@@ -71,4 +71,9 @@ public class RemoteSensingSourceDataController {
 		qw.eq("disaster_id", disasterId);
 		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw));
 	}
+
+	@PostMapping("/approval")
+	public R approval(@RequestBody RemoteSensingSourceData remoteSensingSourceData){
+		return R.status(remoteSensingSourceDataService.updateById(remoteSensingSourceData));
+	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
index 5a8278f..bca45c7 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
@@ -81,6 +81,6 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
 	List<Map<String, Long>> disasterNum(String year);
 
-	CallForHelpVo getByNameRole(@Param("admin") String admin);
+	CallForHelpVo getByUserIdRole(@Param("chiefIdEquals") Long chiefIdEquals);
 
 }
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 cefe5d9..8983971 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
@@ -371,8 +371,14 @@
 
     </select>
 
-    <select id="getByNameRole" resultType="com.kening.vordm.vo.CallForHelpVo">
-        SELECT id AS roleId, parent_id AS parentId, role_name AS roleName FROM blade_role WHERE role_name = #{admin}
+    <select id="getByUserIdRole" resultType="com.kening.vordm.vo.CallForHelpVo">
+        SELECT 	br.role_alias AS roleAlias,
+                  br.id AS roleId,
+                  br.parent_id AS parentId,
+                  br.role_name AS roleName
+        FROM blade_user bu
+        left JOIN blade_role br on bu.role_id = br.id
+        WHERE bu.id = #{chiefIdEquals}
     </select>
 
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java
index 6c1df2c..3962545 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java
@@ -21,6 +21,6 @@ public interface EntityDataMapper extends BaseMapper<EntityData> {
 	IPage<EntityData> getEntityDataList(@Param("entityData") EntityData entityData, IPage<Object> page);
 
 
-	List<UserTenantVo> getEntityDataSourceOrganization();
+	List<UserTenantVo> getEntityDataSourceOrganization(@Param("disasterId") Long disasterId);
 
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index 73feec6..21347b9 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -71,6 +71,11 @@
     <select id="getEntityDataSourceOrganization" resultType="com.kening.vordm.vo.UserTenantVo">
         select ed.source_organization AS organizationName
         from entity_data ed
+        <where>
+            <if test="disasterId != null and disasterId != ''">
+                ed.disaster_id = #{disasterId}
+            </if>
+        </where>
         GROUP BY ed.source_organization
     </select>
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index 15040a8..dcceda5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -43,11 +43,8 @@
     <select id="getByUserStatisticsOne" resultType="java.lang.Integer">
         select count(di.id)
         FROM disaster_info di
-        inner join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        inner join guest_info gi on gi.id = gmdr.sponsor_id
-        inner join blade_user bu on bu.email = gi.email
         <where>
-            bu.id = #{userId}
+            di.chief_id = #{userId}
             and di.respond_status = 3
         </where>
     </select>
@@ -55,11 +52,8 @@
     <select id="getByUserStatisticsTwo" resultType="java.lang.Integer">
         select count(di.id)
         FROM disaster_info di
-        inner join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        inner join guest_info gi on gi.id = gmdr.sponsor_id
-        inner join blade_user bu on bu.email = gi.email
         <where>
-            bu.id = #{userId}
+            di.chief_id = #{userId}
             and di.respond_status = 2
         </where>
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
index 3fd1b73..2fbc0cf 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
@@ -73,5 +73,5 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	UserVo getByUserDisasterInfoStatistics(Long userId);
 
-	CallForHelpVo getByNameRole(String anmin);
+	CallForHelpVo getByUserIdRole(Long chiefIdEquals);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java
index 98b97f8..611c8c1 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java
@@ -20,10 +20,10 @@ public interface EntityDataService extends IService<EntityData> {
 	IPage<EntityData> getEntityDataList(IPage<Object> page, EntityData entityData);
 
 	/**
-	 * 获取所以不可可视化下机构信息
+	 * 获取所有不可可视化下机构信息
 	 * @return
 	 */
-	List<UserTenantVo> getEntityDataSourceOrganization();
+	List<UserTenantVo> getEntityDataSourceOrganization(Long disasterId);
 
 	/**
 	 * Resource upload 上传实体信息
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
index 719bb7c..fa2d20d 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
@@ -236,8 +236,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	}
 
 	@Override
-	public CallForHelpVo getByNameRole(String anmin) {
-		return this.baseMapper.getByNameRole(anmin);
+	public CallForHelpVo getByUserIdRole(Long chiefIdEquals) {
+		return this.baseMapper.getByUserIdRole(chiefIdEquals);
 	}
 
 	/**
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
index 5dc30cf..ee7d999 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
@@ -1,5 +1,6 @@
 package com.kening.vordm.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -64,8 +67,8 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 	 * @return
 	 */
 	@Override
-	public List<UserTenantVo> getEntityDataSourceOrganization() {
-		return this.baseMapper.getEntityDataSourceOrganization();
+	public List<UserTenantVo> getEntityDataSourceOrganization(Long disasterId) {
+		return this.baseMapper.getEntityDataSourceOrganization(disasterId);
 	}
 
 
@@ -105,7 +108,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 			remoteSensingSourceData.setSatelliteCode(entityDataUserVo.getSatelliteCode());
 			remoteSensingSourceData.setProductResolution(entityDataUserVo.getProductResolution());
 			remoteSensingSourceData.setCloudCover(entityDataUserVo.getCloudCover());
-			remoteSensingSourceData.setProductTime(entityDataUserVo.getProductTime());
+
+			Date date= new Date(DateTime.parse(entityDataUserVo.getProductTime()));
+			remoteSensingSourceData.setProductTime(date);
 			remoteSensingSourceData.setProductBandsNum(entityDataUserVo.getProductBandsNum());
 			//0-爬虫获取，1-未审核，2-，已审核，上传源数据未补充下载 链接，3-已审核上传源数据已补充下载链接
 			remoteSensingSourceData.setStatus(1);
@@ -141,5 +146,4 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		}
 	}
 
-
 }