Compare commits
No commits in common. "aacf29a3dbce20fed1b20b8f5323eccdaaabb4ed" and "af0638438ce50cd4e51ecf1a0182067aba1585f8" have entirely different histories.
aacf29a3db
...
af0638438c
|
@ -1,11 +1,11 @@
|
||||||
package com.mcwl.web.controller.resource;
|
package com.mcwl.web.controller.resource;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.mcwl.common.core.domain.AjaxResult;
|
||||||
import com.mcwl.common.core.domain.R;
|
import com.mcwl.common.core.domain.R;
|
||||||
import com.mcwl.resource.domain.Report;
|
import com.mcwl.resource.domain.Report;
|
||||||
import com.mcwl.resource.domain.vo.PageVo;
|
import com.mcwl.resource.domain.vo.PageVo;
|
||||||
import com.mcwl.resource.service.ReportService;
|
import com.mcwl.resource.service.ReportService;
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
|
||||||
* @apiNote
|
* @apiNote
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Api(tags = "举报")
|
|
||||||
@RequestMapping("/report")
|
@RequestMapping("/report")
|
||||||
@RestController
|
@RestController
|
||||||
public class ReportController {
|
public class ReportController {
|
||||||
|
|
|
@ -2,8 +2,6 @@ package com.mcwl.resource.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
@ -14,7 +12,6 @@ import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 举报表
|
* 举报表
|
||||||
*
|
|
||||||
* @author DaiZibo
|
* @author DaiZibo
|
||||||
* @date 2025/1/18
|
* @date 2025/1/18
|
||||||
* @apiNote
|
* @apiNote
|
||||||
|
@ -24,63 +21,53 @@ import java.util.Date;
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(description = "举报表")
|
|
||||||
@TableName("report")
|
@TableName("report")
|
||||||
public class Report {
|
public class Report {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主键ID
|
* 主键ID
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "举报ID")
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 被举报的商品ID
|
* 被举报的商品ID
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "被举报作品ID")
|
|
||||||
private Long productId;
|
private Long productId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 举报人ID
|
* 举报人ID
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "举报人ID")
|
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 举报类型
|
* 举报类型
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "举报类型 字典值")
|
|
||||||
private Integer reportId;
|
private Integer reportId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 区分举报内容(1模型 2图片 3工作流)
|
* 区分举报内容(1模型 2图片 3工作流)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "作品类型 (1模型 2图片 3工作流)")
|
|
||||||
private Integer type;
|
private Integer type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 举报描述
|
* 举报描述
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "举报描述")
|
|
||||||
private String text;
|
private String text;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 状态(0未处理 1已处理)
|
* 状态(0未处理 1已处理)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "状态(0未处理 1已处理 )")
|
|
||||||
private Integer status = 0;
|
private Integer status = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "创建时间")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 逻辑删除(0展示 2删除)
|
* 逻辑删除(0展示 2删除)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "逻辑删除(0展示 2删除)")
|
|
||||||
private Integer delFlag = 0;
|
private Integer delFlag = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package com.mcwl.resource.service.impl;
|
package com.mcwl.resource.service.impl;
|
||||||
|
|
||||||
import com.mcwl.common.core.domain.AjaxResult;
|
import com.mcwl.common.core.domain.AjaxResult;
|
||||||
import com.mcwl.common.utils.StringUtils;
|
|
||||||
import com.mcwl.resource.domain.ModelVersion;
|
import com.mcwl.resource.domain.ModelVersion;
|
||||||
import com.mcwl.resource.domain.WorkFlowVersion;
|
import com.mcwl.resource.domain.WorkFlowVersion;
|
||||||
import com.mcwl.resource.mapper.ModelVersionMapper;
|
import com.mcwl.resource.mapper.ModelVersionMapper;
|
||||||
|
@ -28,11 +27,6 @@ public class FileServiceImpl implements FileService {
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult selectFileName(String name, String type) {
|
public AjaxResult selectFileName(String name, String type) {
|
||||||
|
|
||||||
if (StringUtils.isEmpty(type)){
|
|
||||||
|
|
||||||
return AjaxResult.error("请输入type");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (type.equals("model")) {
|
if (type.equals("model")) {
|
||||||
|
|
||||||
ModelVersion modelVersion = versionMapper.selectByFileName(name);
|
ModelVersion modelVersion = versionMapper.selectByFileName(name);
|
||||||
|
@ -42,7 +36,7 @@ public class FileServiceImpl implements FileService {
|
||||||
}
|
}
|
||||||
|
|
||||||
return AjaxResult.success(modelVersion);
|
return AjaxResult.success(modelVersion);
|
||||||
}else if (type.equals("workflow")){
|
}else if (type.equals("workFlow")){
|
||||||
WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectByFileName(name);
|
WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectByFileName(name);
|
||||||
if (workFlowVersion == null) {
|
if (workFlowVersion == null) {
|
||||||
|
|
||||||
|
|
|
@ -510,10 +510,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
||||||
|
|
||||||
List<ResponseWorkFlow> responseWorkFlowList = baseMapper.workFlowList(pageVo);
|
List<ResponseWorkFlow> responseWorkFlowList = baseMapper.workFlowList(pageVo);
|
||||||
|
|
||||||
for (ResponseWorkFlow responseWorkFlow : responseWorkFlowList) {
|
|
||||||
|
|
||||||
responseWorkFlow.setType(DictInit.getDictValue(DictConstants.WORK_FLOW_TYPE_CHILD,responseWorkFlow.getType()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PageInfo<ResponseWorkFlow>(responseWorkFlowList);
|
return new PageInfo<ResponseWorkFlow>(responseWorkFlowList);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue