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 f7b2477..67dde3c 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 @@ -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> list(CallForHelpVo CallForHelpVo, Query query) { + IPage pages = disasterInfoService.page(Condition.getPage(query),CallForHelpVo); + return R.data(pages); + } /** * 首页数据，轮播和定位相关 * @return @@ -298,17 +312,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 review( String id){ + DisasterInfo disasterInfo = new DisasterInfo(); + disasterInfo.setId(Long.valueOf(id)); + disasterInfo.setRespondStatus(1); + Boolean flag=disasterInfoService.updateById(disasterInfo); + return R.data(flag); + } } 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 f0281e2..9051bd0 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 @@ -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 { List getLeft1Data(); List getLeft2Data(); + + List page(IPage page,@Param("callForHelpVo" )CallForHelpVo callForHelpVo); } 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 ccf9d70..e9fb0b9 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 @@ -130,5 +130,43 @@ group by t.disaster_country order by cnt desc limit 7) b on c.flagname = b.`name` - + 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 6285ce4..d852563 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 @@ -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 { List getLeft2Data(); Boolean addVisitCount(Long id); + + IPage page(IPage page, CallForHelpVo callForHelpVo); } 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 f66fa12..a65ebc4 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 @@ -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; @@ -119,9 +120,15 @@ implements DisasterInfoService { @Async public Boolean addVisitCount(Long id) { DisasterInfo disasterInfo = getById(id); - disasterInfo.setVisitCount(disasterInfo.getVisitCount()+1); + disasterInfo.setVisitCount(disasterInfo.getVisitCount() + 1); updateById(disasterInfo); return null; + + } + + @Override + public IPage page(IPage page, CallForHelpVo callForHelpVo) { + return page.setRecords(this.baseMapper.page(page,callForHelpVo)); } diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java index 2c40fbb..29d1e5d 100644 --- a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java +++ b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java @@ -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 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 list = dict.getChildren(); + dictService.remove(Wrappers.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?"操作成功":"操作失败"); + } } diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/system/dto/DictBizDTO.java b/kn-sys-manager/src/main/java/org/springblade/auth/system/dto/DictBizDTO.java new file mode 100644 index 0000000..b9eee4a --- /dev/null +++ b/kn-sys-manager/src/main/java/org/springblade/auth/system/dto/DictBizDTO.java @@ -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 children; +}