From d119b9fde00e9aba687039be97f172c3273ac581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C18231669351=E2=80=9D?= <“1686821393@qq.com”> Date: Sat, 25 Mar 2023 21:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=A1=E6=89=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=882023.3.25=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/task/TaskAuditController.java | 9 +++ .../carbon/mapper/task/TaskAuditMapper.java | 3 + .../edu/ncst/carbon/model/task/TaskAudit.java | 5 +- .../carbon/service/ITaskAuditService.java | 5 ++ .../impl/task/TaskAuditServiceImpl.java | 59 ++++++++++--------- .../ncst/carbon/vo/task/TaskAuditDetail.java | 22 +++++++ 6 files changed, 73 insertions(+), 30 deletions(-) create mode 100644 CarbonSysBE1/src/main/java/edu/ncst/carbon/vo/task/TaskAuditDetail.java diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java index 3aa1a5d..b8e2ee2 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java @@ -10,6 +10,7 @@ import edu.ncst.carbon.utils.SessionUtils; import edu.ncst.carbon.vo.ListResultVO; import edu.ncst.carbon.vo.Query; import edu.ncst.carbon.vo.ResultVO; +import edu.ncst.carbon.vo.task.TaskAuditDetail; import edu.ncst.carbon.vo.user.UserInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,6 +28,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.util.List; @Api(description = "任务审核管理", tags = "TaskAuditController") @RestController @@ -130,4 +132,11 @@ public class TaskAuditController { return ResultUtils.success("ok", result); } + + @ApiOperation("获取用户审核任务列表") + @GetMapping("/listByUserId") + public ResultVO> getTaskAuditListByUserId(HttpServletResponse response) throws IOException { + List TaskAuditList = taskAuditService.getTaskAuditListByUserId(); + return ResultUtils.success("ok", TaskAuditList); + } } diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/mapper/task/TaskAuditMapper.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/mapper/task/TaskAuditMapper.java index 1e34570..6a33567 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/mapper/task/TaskAuditMapper.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/mapper/task/TaskAuditMapper.java @@ -1,10 +1,13 @@ package edu.ncst.carbon.mapper.task; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import edu.ncst.carbon.model.task.Task; import edu.ncst.carbon.model.task.TaskAudit; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 任务审核 Mapper 接口 */ diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java index 68200d0..65165c8 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java @@ -29,6 +29,9 @@ public class TaskAudit implements Serializable { @ApiModelProperty(value = "审核图片id") private Integer imageId; + @ApiModelProperty(value = "审核图片id") + private String imageUrl; + @ApiModelProperty(value = "审核文本") private String text; @@ -42,7 +45,7 @@ public class TaskAudit implements Serializable { private Integer createUserId; @ApiModelProperty(value = "创建用户时间") - private Integer createTime; + private Date createTime; @ApiModelProperty(value = "审核者id") private Integer auditUserId; diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java index ff6d0f2..746a126 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java @@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService; import edu.ncst.carbon.model.task.TaskAudit; import edu.ncst.carbon.vo.ListResultVO; import edu.ncst.carbon.vo.Query; +import edu.ncst.carbon.vo.ResultVO; +import edu.ncst.carbon.vo.task.TaskAuditDetail; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.List; /** * 任务审核 服务类 @@ -28,4 +32,5 @@ public interface ITaskAuditService extends IService{ TaskAudit audit(Integer taskAuditId, Boolean yesNo); + List getTaskAuditListByUserId() throws IOException; } diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java index 4b95023..66266f9 100644 --- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java @@ -26,10 +26,14 @@ import edu.ncst.carbon.utils.ImageUtils; import edu.ncst.carbon.utils.SessionUtils; import edu.ncst.carbon.vo.ListResultVO; import edu.ncst.carbon.vo.Query; +import edu.ncst.carbon.vo.ResultVO; +import edu.ncst.carbon.vo.task.TaskAuditDetail; import edu.ncst.carbon.vo.user.UserInfoVO; import edu.ncst.carbon.vo.wechat.SportDay; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -39,8 +43,12 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; +import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; +import java.awt.image.BufferedImage; +import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -52,6 +60,9 @@ import java.util.List; @Slf4j public class TaskAuditServiceImpl extends ServiceImpl implements ITaskAuditService { + // 读取配置文件中上传路径 + @Value("${file.file-dir}") + String imagePath; @Autowired private ImageServiceImpl imageService; @@ -206,9 +217,11 @@ public class TaskAuditServiceImpl extends ServiceImpl getTaskAuditListByUserId() throws IOException { UserInfoVO currentUser = SessionUtils.getCurrentUser(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_id", currentUser.getId()); - LogUser logUser = logUserMapper.selectList(queryWrapper).get(0); - - logUser.setIntegralTotal( logUser.getIntegralTotal() + taskAudit.getIntegral()); - logUser.setEmissionTotal( logUser.getEmissionTotal() + taskAudit.getEmission()); - logUser.setAuditingTaskTotal( logUser.getAuditingTaskTotal() -1); - - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - queryWrapper.eq("user_id", currentUser.getId()); - int update = logUserMapper.update(logUser, updateWrapper); - - - return taskAudit; - + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("create_user_id", currentUser.getId()); + List taskAuditList = taskAuditMapper.selectList(queryWrapper); + + /*List result = new ArrayList<>(); + for(TaskAudit item: taskAuditList){ + TaskAuditDetail taskAuditDetail = new TaskAuditDetail(); + BeanUtils.copyProperties(item, taskAuditDetail); + BufferedImage image = ImageIO.read(new File(imagePath + "/" + item.getTaskName()+currentUser.getUsername())); + taskAuditDetail.setImage(image); + result.add(taskAuditDetail); + }*/ + return taskAuditList; } } diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/vo/task/TaskAuditDetail.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/vo/task/TaskAuditDetail.java new file mode 100644 index 0000000..7b2c27c --- /dev/null +++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/vo/task/TaskAuditDetail.java @@ -0,0 +1,22 @@ +package edu.ncst.carbon.vo.task; + +import lombok.Data; + +import java.awt.image.BufferedImage; +import java.util.Date; + +@Data +public class TaskAuditDetail { + + private Integer id; + + private Integer integral; + + private Date createTime; + + private String status; + + private String taskName; + + BufferedImage image; +}