yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突解决

This commit is contained in:
glj 2023-04-12 09:20:46 +08:00
parent af0f3f42ef bc575f6bcb
commit b7510eb960
7 changed files with 116 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,7 +24,7 @@ import org.springblade.core.tool.utils.DateUtil;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -46,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
@ -298,6 +312,7 @@ 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());
@ -311,4 +326,12 @@ public class DisasterInfoController {
// 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);
}
}

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

@ -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;
@ -45,4 +47,6 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
List<GroupByUse> getLeft1Data();
List<GroupByUse> getLeft2Data();
List<CallForHelpVo> page(IPage page,@Param("callForHelpVo" )CallForHelpVo callForHelpVo);
}

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

@ -130,5 +130,43 @@
group by t.disaster_country
order by cnt desc 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>

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

@ -4,6 +4,7 @@ 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;
@ -52,4 +53,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
List<GroupByUse> getLeft2Data();
Boolean addVisitCount(Long id);
IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo);
}

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

@ -6,6 +6,7 @@ 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;
@ -122,6 +123,12 @@ implements DisasterInfoService {
disasterInfo.setVisitCount(disasterInfo.getVisitCount() + 1);
updateById(disasterInfo);
return null;
}
@Override
public IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo) {
return page.setRecords(this.baseMapper.page(page,callForHelpVo));
}

22
kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java
View File

@ -1,6 +1,7 @@
package org.springblade.auth.system.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -8,6 +9,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.auth.system.dto.DictBizDTO;
import org.springblade.auth.system.entity.DictBiz;
import org.springblade.auth.system.service.IDictBizService;
import org.springblade.auth.system.vo.DictBizVO;
@ -166,6 +168,24 @@ public class DictBizController {
List<DictBiz> tree = dictService.getList(code);
return R.data(DictBizWrapper.build().listNodeVO(tree));
}
/**
* 新增或修改
*/
@PostMapping("/submit2")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dict")
public R submit2(@Valid @RequestBody DictBizDTO dict) {
CacheUtil.clear(DICT_CACHE);
dictService.submit(dict);
List<DictBiz> list = dict.getChildren();
dictService.remove(Wrappers.<DictBiz>update().lambda().eq(DictBiz::getParentId,dict.getId()));
for (DictBiz dictBiz : list) {
//清空id
dictBiz.setId(null);
//添加父子关系
dictBiz.setParentId(dict.getId());
}
return R.success(dictService.saveBatch(list)||list.size()==0?"操作成功":"操作失败");
}
}

15
kn-sys-manager/src/main/java/org/springblade/auth/system/dto/DictBizDTO.java Normal file
View File

@ -0,0 +1,15 @@
package org.springblade.auth.system.dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.auth.system.entity.DictBiz;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DictBizDTO对象", description = "DictBizDTO对象")
public class DictBizDTO extends DictBiz {
private List<DictBiz> children;
}