From ffbab94627b7acffaa4bd012926f276d7cfb0554 Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 5 May 2023 16:07:14 +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 --- .../com/kening/vordm/entity/AdminManager.java | 2 ++ .../java/com/kening/vordm/entity/Tool.java | 25 +++++++++++++------ .../com/kening/vordm/vo/CallForHelpVo.java | 6 +++++ .../controller/AdminManagerController.java | 10 ++++++++ .../vordm/controller/ToolController.java | 17 ++++++++++--- .../vordm/mapper/DisasterInfoMapper.xml | 3 --- .../com/kening/vordm/mapper/ToolMapper.java | 4 +++ .../com/kening/vordm/mapper/ToolMapper.xml | 11 +++++--- .../com/kening/vordm/service/ToolService.java | 4 +++ .../service/impl/DisasterInfoServiceImpl.java | 3 +++ .../vordm/service/impl/ToolServiceImpl.java | 6 +++++ 11 files changed, 74 insertions(+), 17 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java index acd4b0f..79ebf8e 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -17,6 +17,8 @@ public class AdminManager extends DisasterInfo{ private Long managerId; + private Long disasterId; + private Integer status; private String occupation; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java index 0d91ac0..4808feb 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java @@ -80,21 +80,30 @@ public class Tool implements Serializable { * 上传人 */ private Long uploader; + /** - * 昵称 + * 邮箱 */ - private String show_name; + private String mailbox; + /** - * 昵称 + * 学术论文地址 */ - private String e_mail; - @TableField(exist = false) - private static final long serialVersionUID = 1L; - @TableField(exist = false) - private String checked; + private String paperLink; + /** * 贡献者 */ private String showName; + @TableField(exist = false) + private String checked; + + @TableField(exist = false) + private Integer number; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + } 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 c9f3182..fc4c2ce 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 @@ -86,4 +86,10 @@ public class CallForHelpVo extends DisasterInfo { * 完成时间 */ private Date respondedTime; + + /** + * 角色名称 + */ + private String roleName; + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index 5d6061b..96e821f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -1,7 +1,9 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.entity.GuestManageDisasterRef; +import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.GuestManageDisasterRefService; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; @@ -25,6 +27,7 @@ public class AdminManagerController { private GuestManageDisasterRefService guestManageDisasterRefService; + private DisasterInfoService disasterInfoService; /** * 普通管理员分页查询 * @param query @@ -43,6 +46,13 @@ public class AdminManagerController { @PostMapping("/audit") public R audit(@RequestBody List guestManageDisasterRef){ guestManageDisasterRef.stream().forEach(guestManageDisasterRef1 -> { + if (guestManageDisasterRef1.getStatus() == 1){ + DisasterInfo disasterInfo = new DisasterInfo(); + disasterInfo.setId(guestManageDisasterRef1.getDisasterId()); + disasterInfo.setChiefId(guestManageDisasterRef1.getManagerId()); + disasterInfoService.updateById(disasterInfo); + } + guestManageDisasterRef1.setReviewTime(new Date()); }); return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef)); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index f38b0c5..52efbea 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -20,6 +20,7 @@ import com.kening.vordm.entity.Tool; import java.util.Arrays; import java.util.Date; +import java.util.List; @RestController @AllArgsConstructor @@ -77,12 +78,13 @@ public class ToolController{ return R.data(detail); } - @ApiOperationSupport(order = 6) - @ApiOperation(value = "提交", notes = "传入Tool") + @PostMapping("/submit") - public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody Tool tool) { + public R submit(@RequestBody Tool tool) { + tool.setCreateTime(new Date()); return R.status(toolService.saveOrUpdate(tool)); } + @ApiOperationSupport(order = 7 ) @ApiOperation(value = "审核", notes = "传入Tool") @PostMapping("/review") @@ -90,5 +92,14 @@ public class ToolController{ tool.setReviewTime(new Date()); return R.status(toolService.saveOrUpdate(tool)); } + + + @GetMapping("/toolRanking") + public R> toolRanking() { + List detail = toolService.toolRanking(); + return R.data(detail); + } + + } 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 422b5a1..adfd244 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 @@ -203,9 +203,6 @@ d.respond_status = #{callForHelpVo.respondStatus} - - and d.chief_id is null - and d.chief_id = #{callForHelpVo.chiefIdEquals} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.java index 76003ee..6ef8b62 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.java @@ -4,6 +4,8 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.Tool; +import java.util.List; + /** * @author G1393 * @description 针对表【tool(模型工具表)】的数据库操作Mapper @@ -13,4 +15,6 @@ import com.kening.vordm.entity.Tool; public interface ToolMapper extends BaseMapper { + List toolRanking(); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.xml index 0eb20d9..0a2b39f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ToolMapper.xml @@ -18,8 +18,9 @@ - - + + + @@ -27,6 +28,10 @@ Introduction,link,detail, create_time,upload_id,manager_id, review_time,type,voluntary_flag, - uploader,show_name,e_mail + uploader,show_name,mailbox,paper_link + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java index c1517fb..82d6f73 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ToolService.java @@ -4,6 +4,8 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.Tool; +import java.util.List; + /** * @author G1393 * @description 针对表【tool(模型工具表)】的数据库操作Service @@ -11,4 +13,6 @@ import com.kening.vordm.entity.Tool; */ public interface ToolService extends IService { + List toolRanking(); + } 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 00e4a9a..8b99414 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 @@ -154,6 +154,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { + if (callForHelpVo.getRoleName().equals("admin")){ + callForHelpVo.setChiefIdEquals(null); + } return page.setRecords(this.baseMapper.page(page, callForHelpVo)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java index df8d919..130f93b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java @@ -6,6 +6,8 @@ import com.kening.vordm.mapper.ToolMapper; import com.kening.vordm.service.ToolService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【tool(模型工具表)】的数据库操作Service实现 @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; public class ToolServiceImpl extends ServiceImpl implements ToolService { + @Override + public List toolRanking() { + return this.baseMapper.toolRanking(); + } }