冲突解决

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java

@@ -3,14 +3,9 @@ package com.kening.vordm.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.kening.vordm.entity.DisasterInfo;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.kening.vordm.entity.DownloadRecord;
+import com.kening.vordm.entity.*;
-import com.kening.vordm.entity.News;
+import com.kening.vordm.service.*;
-import com.kening.vordm.entity.Websites;
-import com.kening.vordm.service.DisasterInfoService;
-import com.kening.vordm.service.DownloadRecordService;
-import com.kening.vordm.service.NewsService;
-import com.kening.vordm.service.WebsitesService;
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
 import com.kening.vordm.vo.UserTenantVo;
@@ -33,10 +28,41 @@ public class DisasterInfoController {
 	private final WebsitesService websitesService;
 
 	private final NewsService newsService;
+	private final PictureInfoService pictureInfoService;
 
 	//下载次数记录
 	private final DownloadRecordService downloadRecordService;
 
+	/**
+	 * 首页数据，轮播和定位相关
+	 * @return
+	 */
+	@GetMapping("/indexData")
+	public R<List<DisasterInfo>> indexData(){
+		return R.data(disasterInfoService.list(Wrappers.<DisasterInfo>lambdaQuery()
+			.eq(DisasterInfo::getRespondStatus,2)));
+	}
+
+	@GetMapping("/getPicInfoByDisasterId")
+	public R<List<PictureInfo>> getPicInfoByDisasterInfoId(Long disasterId){
+		return R.data(pictureInfoService.list(Wrappers.<PictureInfo>lambdaQuery()
+			.eq(PictureInfo::getDisasterId,disasterId)));
+	}
+
+	/**
+	 * 灾害查询条件，时间，类型，灾害联动
+	 * @param disasterInfo
+	 * @return
+	 */
+	@GetMapping("/selectCondition")
+	public R<List<GroupByUse>> getSelectCondition1(DisasterInfo disasterInfo){
+		String disaster_time=null;
+		if (disasterInfo.getDisasterTime()!=null){
+			disaster_time=disasterInfo.getDisasterTime().toString();
+		}
+		return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(),disasterInfo.getDisasterCountry(),disaster_time,disasterInfo.getName()
+		));
+	}
 
 	/**
 	 * 灾害查询条件，时间，类型，灾害联动

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java

@@ -37,4 +37,5 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
 	List<UserTenantVo> getAllUser();
 
+	List<GroupByUse> getLeftData();
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -84,6 +84,9 @@
         where d.respond_status=#{respondStatus}
         order by d.disaster_time desc
     </select>
+    <select id="getLeftData" resultType="com.kening.vordm.vo.GroupByUse">
+        select t.sponsor_organization as `name`, count(*) as cnt from disaster_info t GROUP BY t.sponsor_organization ORDER BY cnt desc LIMIT 3
+    </select>
 
     <select id="getAllUser" resultType="com.kening.vordm.vo.UserTenantVo">
         SELECT

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java

@@ -11,16 +11,17 @@ import com.kening.vordm.vo.UserTenantVo;
 import java.util.List;
 
 /**
-* @author G1393
+ * @author G1393
-* @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service
+ * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service
-* @createDate 2023-04-04 15:54:30
+ * @createDate 2023-04-04 15:54:30
-*/
+ */
 public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	List<GroupByUse> getConditionData(String type, String country, String time, String name);
 
 	/**
 	 * 获取债害详情信息
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -28,17 +29,19 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	/**
 	 * 根据灾害信息获取灾害id
+	 *
 	 * @param disasterInfo
 	 * @return
 	 */
 	List<Long> getDisasterId(DisasterInfo disasterInfo);
 
 
-	List<GroupByUse> getDisasterStatistics( String name);
+	List<GroupByUse> getDisasterStatistics(String name);
 
 
 	IPage<DisasterMangerInfo> getHomeDisaster(IPage<DisasterMangerInfo> page, Integer respondStatus);
 
 	List<UserTenantVo> getAllUser();
 
+	List<GroupByUse> getLeftData();
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java

@@ -94,4 +94,8 @@ implements DisasterInfoService {
 		return this.baseMapper.getAllUser();
 	}
 
+	public List<GroupByUse> getLeftData() {
+		return this.baseMapper.getLeftData();
+	}
+
 }