提交callforhelp等

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

@@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.kening.vordm.entity.*;
 import com.kening.vordm.service.*;
 import com.kening.vordm.vo.CallForHelpVo;
 import com.kening.vordm.vo.DisasterInfoVo;
 import com.kening.vordm.vo.GroupByUse;
 import com.kening.vordm.vo.UserTenantVo;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -20,6 +24,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,7 +50,17 @@ public class DisasterInfoController {
 	private final DownloadRecordService downloadRecordService;
 
 	private final DisasterInfoVoService disasterInfoVoService;
-
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "分页", notes = "传入Tool")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "current", value = "当前页", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "size", value = "分页大小", paramType = "query", dataType = "int")
+	})
+	@GetMapping("/list")
+	public R<IPage<CallForHelpVo>> list(CallForHelpVo CallForHelpVo, Query query) {
+		IPage<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query),CallForHelpVo);
+		return R.data(pages);
+	}
 	/**
 	 * 首页数据，轮播和定位相关
 	 * @return
@@ -219,17 +234,26 @@ public class DisasterInfoController {
 		DisasterInfo disasterInfo = new DisasterInfo();
 		BeanUtil.copyProperties(callForHelpVo, disasterInfo);
 		disasterInfo.setId(IdWorker.getId());
+		disasterInfo.setUploadTime(new Date());
 		GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef();
 		GuestManageDisasterRef.setId(IdWorker.getId());
 		GuestManageDisasterRef.setSponsorId(guestInfo.getId());
 		String vordm_id="test";
 		GuestManageDisasterRef.setDisasterId(disasterInfo.getId());
 		Boolean flag1=guestInfoService.save(guestInfo);
-		Boolean flag2= guestManageDisasterRefService.save(GuestManageDisasterRef);
+		Boolean flag2=guestManageDisasterRefService.save(GuestManageDisasterRef);
 		Boolean flag3=disasterInfoService.save(disasterInfo);
 		Boolean callForHelp= flag1&flag2&flag3;
 //    callForHelpVo.setId(IdWorker.getId());
 //    Boolean insertFlag=accountInfoService.save(accountInfo);
 		return R.data(callForHelp);
 	}
+	@PostMapping("review")
+	public R<Boolean> review( String  id){
+		DisasterInfo disasterInfo = new DisasterInfo();
+		disasterInfo.setId(Long.valueOf(id));
+		disasterInfo.setRespondStatus(1);
+		Boolean flag=disasterInfoService.updateById(disasterInfo);
+		return R.data(flag);
+	}
 }

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

@@ -4,10 +4,12 @@ package com.kening.vordm.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kening.vordm.entity.DisasterInfo;
+import com.kening.vordm.vo.CallForHelpVo;
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
 import com.kening.vordm.vo.UserTenantVo;
 import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -44,4 +46,6 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 	List<GroupByUse> getLeft1Data();
 
 	List<GroupByUse> getLeft2Data();
+
+    List<CallForHelpVo> page(IPage page,@Param("callForHelpVo" )CallForHelpVo callForHelpVo);
 }

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

@@ -118,5 +118,43 @@
 		limit 7) b on c.flagname = b.`name`
 
     </select>
-
+    <select id="page" parameterType="com.kening.vordm.vo.CallForHelpVo" resultType="com.kening.vordm.vo.CallForHelpVo">
+        SELECT
+            u.username ,
+            u.id as uid ,
+            u.email,
+            u.research_field,
+            u.organization,
+            d.id,
+            d.disaster_type,
+            d.disaster_time,
+            d.disaster_keyword,
+            d.upload_time,
+            d.geometry,
+            d.respond_status
+        From
+            guest_manage_disaster_ref  ud join
+            guest_info u  on  u.id = ud.sponsor_id JOIN
+            disaster_info d on  d.id = ud.disaster_id
+        <where>
+            <if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
+                d.disaster_type = #{callForHelpVo.disasterType}
+            </if>
+            <if test="callForHelpVo.disasterCountry != null and callForHelpVo.disasterCountry != ''">
+                and d.disaster_country = #{callForHelpVo.disasterCountry}
+            </if>
+            <if test="callForHelpVo.disasterTime != null and callForHelpVo.disasterTime != ''">
+                and d.disaster_time = #{callForHelpVo.disasterTime}
+            </if>
+            <if test="callForHelpVo.disasterKeyword != null and callForHelpVo.disasterKeyword != ''">
+                and d.disaster_keyword = #{callForHelpVo.disasterKeyword}
+            </if>
+            <if test="callForHelpVo.uploadTime != null and callForHelpVo.uploadTime != ''">
+                and d.upload_time = #{callForHelpVo.uploadTime}
+            </if>
+            <if test="callForHelpVo.geometry != null and callForHelpVo.geometry != ''">
+                and d.geometry = #{callForHelpVo.geometry}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -4,9 +4,11 @@ package com.kening.vordm.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kening.vordm.entity.DisasterInfo;
+import com.kening.vordm.vo.CallForHelpVo;
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
 import com.kening.vordm.vo.UserTenantVo;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -50,4 +52,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 	List<GroupByUse> getLeft1Data();
 
 	List<GroupByUse> getLeft2Data();
+
+	IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo);
 }

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

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.DisasterInfo;
 import com.kening.vordm.mapper.DisasterInfoMapper;
 import com.kening.vordm.service.DisasterInfoService;
+import com.kening.vordm.vo.CallForHelpVo;
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
 import com.kening.vordm.vo.UserTenantVo;
 import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -114,5 +116,10 @@ implements DisasterInfoService {
 		return this.baseMapper.getLeft2Data();
 	}
 
+	@Override
+	public IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo) {
+		return page.setRecords(this.baseMapper.page(page,callForHelpVo));
+	}
+
 
 }