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

glj-代码提交

This commit is contained in:
glj 2023-05-05 16:07:14 +08:00
parent f75f6404b8
commit ffbab94627
11 changed files with 74 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
View File

@ -17,6 +17,8 @@ public class AdminManager extends DisasterInfo{
private Long managerId;
private Long disasterId;
private Integer status;
private String occupation;

25
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java
View File

@ -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;
}

6
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
View File

@ -86,4 +86,10 @@ public class CallForHelpVo extends DisasterInfo {
* 完成时间
*/
private Date respondedTime;
/**
* 角色名称
*/
private String roleName;
}

10
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java
View File

@ -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){
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));

17
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
View File

@ -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<List<Tool>> toolRanking() {
List<Tool> detail = toolService.toolRanking();
return R.data(detail);
}
}

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

@ -203,9 +203,6 @@
<if test="callForHelpVo.respondStatus!=null">
d.respond_status = #{callForHelpVo.respondStatus}
</if>
<if test="callForHelpVo.chiefId != null">
and d.chief_id is null
</if>
<if test="callForHelpVo.chiefIdEquals != null">
and d.chief_id = #{callForHelpVo.chiefIdEquals}
</if>

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

@ -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<Tool> {
List<Tool> toolRanking();
}

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

@ -18,8 +18,9 @@
<result property="type" column="type" jdbcType="VARCHAR"/>
<result property="voluntaryFlag" column="voluntary_flag" jdbcType="INTEGER"/>
<result property="uploader" column="uploader" jdbcType="BIGINT"/>
<result property="show_name" column="show_name" jdbcType="VARCHAR"/>
<result property="e_mail" column="e_mail" jdbcType="VARCHAR"/>
<result property="showName" column="show_name" jdbcType="VARCHAR"/>
<result property="mailbox" column="mailbox" jdbcType="VARCHAR"/>
<result property="paperLink" column="paper_link" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@ -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
</sql>
<select id="toolRanking" resultType="com.kening.vordm.entity.Tool">
select show_name, count(*) as number from tool group by show_name order by number desc limit 10
</select>
</mapper>

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

@ -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<Tool> {
List<Tool> toolRanking();
}

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

@ -154,6 +154,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
@Override
public IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo) {
if (callForHelpVo.getRoleName().equals("admin")){
callForHelpVo.setChiefIdEquals(null);
}
return page.setRecords(this.baseMapper.page(page, callForHelpVo));
}

6
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ToolServiceImpl.java
View File

@ -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<ToolMapper, Tool>
implements ToolService {
@Override
public List<Tool> toolRanking() {
return this.baseMapper.toolRanking();
}
}