修改--编辑用户作品接口添加修改图片支持
This commit is contained in:
parent
f51934d6a4
commit
402d3de682
@ -36,6 +36,10 @@ import com.ruoyi.web.controller.app.baidu.OcrIdCardBAI;
|
||||
//import com.ruoyi.web.controller.app.pay.PayService;
|
||||
import com.ruoyi.web.controller.backstage.BackstageController;
|
||||
import javafx.scene.chart.StackedAreaChart;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.Duration;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@ -465,6 +469,21 @@ public class AppSystemController extends BaseController {
|
||||
BaiduCardBack baiduCardBack = GsonUtils.fromJson(resultBack, BaiduCardBack.class);
|
||||
String expiryDate = baiduCardBack.getWords_result().get("失效日期").getWords();
|
||||
|
||||
// 删除上传图片
|
||||
|
||||
Path path_front = Paths.get(filePath+"/"+username+"_card_front.jpg");
|
||||
Path path_back = Paths.get(filePath+"/"+username+"_card_back.jpg");
|
||||
|
||||
try {
|
||||
Files.delete(path_front);
|
||||
Files.delete(path_back);
|
||||
|
||||
System.out.println("删除成功");
|
||||
} catch (IOException e) {
|
||||
System.err.println("删除失败:" + e.getMessage());
|
||||
}
|
||||
|
||||
|
||||
if(!pRealName.equals(qRealName) || !pIdCard.equals(qIdCard)){
|
||||
return error("实名认证信息不一致");
|
||||
}
|
||||
@ -776,7 +795,8 @@ public class AppSystemController extends BaseController {
|
||||
// 用户创建作品
|
||||
@PostMapping("createUserWork")
|
||||
public AjaxResult createUserWork(@RequestParam("workDto") String userWorkDtoString,
|
||||
@RequestParam("work") MultipartFile workImage){
|
||||
@RequestParam("work") MultipartFile workImage)
|
||||
{
|
||||
|
||||
UserWorkDto userWorkdto = GsonUtils.fromJson(userWorkDtoString, UserWorkDto.class);
|
||||
String username = SecurityUtils.getUsername();
|
||||
@ -1414,36 +1434,85 @@ public class AppSystemController extends BaseController {
|
||||
|
||||
// 编辑作品---对于草稿作品来说草稿就是草稿. 对于已发布作品, 修改完状态可以变为草稿,未发表, 已发表未审核. 审过的也要改成未审核.
|
||||
@PutMapping("/editUserWork")
|
||||
public AjaxResult editUserWork(@RequestBody UserWork userWork) {
|
||||
public AjaxResult editUserWork(@RequestParam("workDto") String userWorkDtoString,
|
||||
@RequestParam("work") MultipartFile workImage) {
|
||||
|
||||
Long workId = userWork.getWorkId();
|
||||
UserWorkDto userWorkdto = GsonUtils.fromJson(userWorkDtoString, UserWorkDto.class);
|
||||
String username = SecurityUtils.getUsername();
|
||||
|
||||
System.out.println(" 保存作品状态: "+ userWork.getWorkStatus());
|
||||
String workName = userWorkdto.getWorkName();
|
||||
String workType = userWorkdto.getWorkStatus();
|
||||
String workDetail = userWorkdto.getDetail();
|
||||
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
|
||||
// 根据work_id 查询作品.
|
||||
UserWork userWork = userWorkService.selectUserWorkByWorkId(userWorkdto.getWorkId());
|
||||
|
||||
if(userWork.getUserId() != userId){
|
||||
return error("非法操作");
|
||||
}
|
||||
|
||||
userWork.setWorkName(workName);
|
||||
userWork.setWorkStatus(workType);
|
||||
userWork.setDetail(workDetail);
|
||||
userWork.setCoordinate("0000");
|
||||
|
||||
|
||||
UserWork userWork1 = userWorkService.selectUserWorkByWorkId(workId);
|
||||
if (workImage.isEmpty()) {
|
||||
return error("文件为空");
|
||||
}
|
||||
//-----------------------------------------新版文件上传------------------------------------------------------
|
||||
String workImageFilePath = "";
|
||||
try {
|
||||
// 保存文件到配置的路径
|
||||
workImageFilePath = FileUploadUtils.upload(RuoYiConfig.getProfile()+"/work", workImage);
|
||||
userWork.setWorkAddress(workImageFilePath);
|
||||
boolean flag = userWorkService.updateUserWork(userWork) > 0;
|
||||
if(flag){
|
||||
|
||||
// 避免一些非法操作,
|
||||
if(!userWork1.getUserId().equals(getUserId())){
|
||||
return error("非法操作, 请不要编辑不是自己的作品");
|
||||
}
|
||||
return success("编辑作品成功");
|
||||
}
|
||||
else{
|
||||
return error("编辑作品失败");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return error("上传作品文件失败");
|
||||
|
||||
// 清空审核记录
|
||||
userWork.setAuditOpinion("");
|
||||
// userWork.setAuditStatus(userWork.);
|
||||
userWorkService.updateUserWork(userWork);
|
||||
}
|
||||
//------------------------------------新版文件上传end-------------------------------------------------------
|
||||
|
||||
// 编辑作品后,这个作品就需要重新审核, 所以有关他的审核记录要删掉
|
||||
WorkReview workReview = new WorkReview();
|
||||
workReview.setWorkId(workId);
|
||||
workReview.setDeleteFlag("1");
|
||||
//----------------------------------------------------------- 旧版编辑用户作品-------------------------------------------------------------------
|
||||
// Long workId = userWork.getWorkId();
|
||||
//
|
||||
// System.out.println(" 保存作品状态: "+ userWork.getWorkStatus());
|
||||
//
|
||||
//
|
||||
// UserWork userWork1 = userWorkService.selectUserWorkByWorkId(workId);
|
||||
//
|
||||
// // 避免一些非法操作,
|
||||
// if(!userWork1.getUserId().equals(getUserId())){
|
||||
// return error("非法操作, 请不要编辑不是自己的作品");
|
||||
// }
|
||||
//
|
||||
// // 清空审核记录
|
||||
// userWork.setAuditOpinion("");
|
||||
//// userWork.setAuditStatus(userWork.);
|
||||
// userWorkService.updateUserWork(userWork);
|
||||
//
|
||||
// // 编辑作品后,这个作品就需要重新审核, 所以有关他的审核记录要删掉
|
||||
// WorkReview workReview = new WorkReview();
|
||||
// workReview.setWorkId(workId);
|
||||
// workReview.setDeleteFlag("1");
|
||||
//
|
||||
// // 根据workId 修改删除flag
|
||||
// workReviewService.setWorkReviewDeleteFlag(workReview);
|
||||
//
|
||||
// System.out.println("更新审核数据");
|
||||
//
|
||||
// return success();
|
||||
|
||||
// 根据workId 修改删除flag
|
||||
workReviewService.setWorkReviewDeleteFlag(workReview);
|
||||
|
||||
System.out.println("更新审核数据");
|
||||
|
||||
return success();
|
||||
//---------------------------------------------------------旧版编辑用户作品end-------------------------------------------------------------------
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.ruoyi.system.domain.dto;
|
||||
|
||||
public class UserWorkDto {
|
||||
private Long workId;
|
||||
private String workname;
|
||||
private String detail;
|
||||
private String workstatus;
|
||||
@ -32,4 +33,12 @@ public class UserWorkDto {
|
||||
this.workstatus = workstatus;
|
||||
}
|
||||
|
||||
public Long getWorkId() {
|
||||
return workId;
|
||||
}
|
||||
|
||||
public void setWorkId(Long workId) {
|
||||
this.workId = workId;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user