Skip to content

C
chnmuseum-party
Commit c5208255 authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent 2a789f52
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 110 deletions
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
View file @ c5208255
......@@ -43,35 +43,45 @@ public class Asset implements Serializable {
@NotBlank(message = "视频名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("视频版权方ID")
@TableField("asset_copyright_owner_id")
@NotBlank(message = "视频版权方ID不能为空", groups = {Add.class, Update.class})
private String assetCopyrightOwnerId;
@ApiModelProperty("视频类别ID")
@TableField(value = "asset_type_id", updateStrategy = FieldStrategy.IGNORED)
@NotBlank(message = "视频类别ID不能为空", groups = {Add.class, Update.class})
private String assetTypeId;
@ApiModelProperty("视频缩略图")
@TableField("thumbnail")
@NotBlank(message = "视频缩略图不能为空", groups = {Add.class, Update.class})
private String thumbnail;
@ApiModelProperty("视频链接")
@ApiModelProperty("视频类别ID")
@TableField("asset_type_id")
private String assetTypeId;
@ApiModelProperty("视频版权方ID")
@TableField("asset_copyright_owner_id")
private String assetCopyrightOwnerId;
@ApiModelProperty("下载链接")
@TableField("video_url")
@NotBlank(message = "下载链接不能为空", groups = {Add.class, Update.class})
private String videoUrl;
@ApiModelProperty("审核状态")
@TableField("audit_status")
private String auditStatus;
@ApiModelProperty("新增审核状态")
@TableField("audit_status_add")
@NotBlank(message = "新增审核状态不能为空", groups = {Add.class, Update.class})
private String auditStatusAdd;
@ApiModelProperty("修改审核状态")
@TableField("audit_status_edit")
private String auditStatusEdit;
@ApiModelProperty("删除审核状态")
@TableField("audit_status_delete")
private String auditStatusDelete;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
@NotNull(message = "创建日期不能为空", groups = {Add.class, Update.class})
private LocalDateTime createTime;
@ApiModelProperty("修改日期")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@NotNull(message = "修改日期不能为空", groups = {Add.class, Update.class})
private LocalDateTime updateTime;
@ApiModelProperty("视频分类")
......
src/main/java/cn/wisenergy/chnmuseum/party/model/AssetType.java
View file @ c5208255
......@@ -35,7 +35,7 @@ public class AssetType implements Serializable {
@ApiModelProperty("视频分类ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "视频分类ID不能为空", groups = {Update.class})
@NotNull(message = "视频分类IDID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty("视频分类名称")
......
src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwner.java
View file @ c5208255
......@@ -30,7 +30,7 @@ import java.util.List;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("copyright_owner")
@ApiModel(value = "版权方", description = "版权方1")
@ApiModel(value = "版权方", description = "版权方")
public class CopyrightOwner implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -42,23 +42,24 @@ public class CopyrightOwner implements Serializable {
@ApiModelProperty("版权方名称")
@TableField("name")
@NotBlank(message = "版权方名称不能为空", groups = {Add.class, Update.class})
private String name;
@NotBlank(message = "版权方名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("版权方类型")
@TableField("owner_type")
private String ownerType;
@NotBlank(message = "版权方类型不能为空", groups = {Add.class, Update.class})
private String ownerType;
@ApiModelProperty("版权方有效期开始")
@TableField("expire_date_start")
@NotNull(message = "版权方有效期开始不能为空", groups = {Add.class, Update.class})
private LocalDate expireDateStart;
@NotNull(message = "版权方有效期开始不能为空", groups = {Add.class, Update.class})
private LocalDate expireDateStart;
@ApiModelProperty("版权方有效期结束")
@TableField("expire_date_end")
@NotNull(message = "版权方有效期结束不能为空", groups = {Add.class, Update.class})
private LocalDate expireDateEnd;
@NotNull(message = "版权方有效期结束不能为空", groups = {Add.class, Update.class})
private LocalDate expireDateEnd;
@ApiModelProperty("备注")
@TableField("remarks")
private String remarks;
......
src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwnerAssetType.java
View file @ c5208255
......@@ -21,7 +21,7 @@ import java.io.Serializable;
* </p>
*
* @author Danny Lee
* @since 2021-03-18
* @since 2021-03-23
*/
@Data
@Builder
......@@ -35,21 +35,19 @@ public class CopyrightOwnerAssetType implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("标识ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "ID不能为空", groups = {Update.class})
@NotNull(message = "标识ID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty("版权方ID")
@ApiModelProperty("视频版权方ID")
@TableField("copyright_owner_id")
@NotBlank(message = "版权方ID不能为空", groups = {Add.class, Update.class})
private String copyrightOwnerId;
@NotBlank(message = "视频版权方ID不能为空", groups = {Add.class, Update.class})
private String copyrightOwnerId;
@ApiModelProperty("视频分类ID")
@TableField("asset_type_id")
@NotBlank(message = "视频分类ID不能为空", groups = {Add.class, Update.class})
private String assetTypeId;
@NotBlank(message = "视频分类ID不能为空", groups = {Add.class, Update.class})
private String assetTypeId;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
View file @ c5208255
......@@ -44,45 +44,68 @@ public class ExhibitionBoard implements Serializable {
private String name;
@ApiModelProperty("展板版权方ID")
@TableField("copyright_owner_id")
@NotBlank(message = "展板版权方ID不能为空", groups = {Add.class, Update.class})
private String copyrightOwnerId;
@TableField("board_copyright_owner_id")
private String boardCopyrightOwnerId;
@ApiModelProperty("展板分类ID")
@TableField("exhibition_board_cat_id")
@NotBlank(message = "展板分类ID不能为空", groups = {Add.class, Update.class})
private String exhibitionBoardCatId;
@ApiModelProperty("展板图片URL")
@TableField("board_img_url")
@TableField("cover")
@NotBlank(message = "展板图片URL不能为空", groups = {Add.class, Update.class})
private String boardImgUrl;
private String cover;
@ApiModelProperty("展板二维码URL")
@TableField("board_qrcode_url")
@TableField("qrcode_url")
@NotBlank(message = "展板二维码URL不能为空", groups = {Add.class, Update.class})
private String boardQrcodeUrl;
private String qrcodeUrl;
@ApiModelProperty("简介")
@TableField("introduction")
@NotBlank(message = "简介不能为空", groups = {Add.class, Update.class})
private String introduction;
@ApiModelProperty("视频版权方ID")
@TableField("asset_copyright_owner_id")
private String assetCopyrightOwnerId;
@ApiModelProperty("视频类别ID")
@TableField("asset_type")
private String assetType;
@TableField("asset_type_id")
private String assetTypeId;
@ApiModelProperty("视频ID")
@TableField("asset_id")
@NotBlank(message = "视频ID不能为空", groups = {Add.class, Update.class})
private String assetId;
@ApiModelProperty("导览音频URL")
@TableField("guide_audio_url")
@NotBlank(message = "导览音频URL不能为空", groups = {Add.class, Update.class})
private String guideAudioUrl;
@ApiModelProperty("参考资料")
@TableField("reference_material")
private String referenceMaterial;
@ApiModelProperty("参考资料文件夹")
@TableField("ref_material_dir")
@NotBlank(message = "参考资料文件夹不能为空", groups = {Add.class, Update.class})
private String refMaterialDir;
@ApiModelProperty("参考资料URL")
@TableField("ref_material_url")
@NotBlank(message = "参考资料URL不能为空", groups = {Add.class, Update.class})
private String refMaterialUrl;
@ApiModelProperty("新增审核状态")
@TableField("audit_status_add")
@NotBlank(message = "新增审核状态不能为空", groups = {Add.class, Update.class})
private String auditStatusAdd;
@ApiModelProperty("修改审核状态")
@TableField("audit_status_edit")
private String auditStatusEdit;
@ApiModelProperty("删除审核状态")
@TableField("audit_status_delete")
private String auditStatusDelete;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
......@@ -92,9 +115,4 @@ public class ExhibitionBoard implements Serializable {
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty("审核状态")
@TableField("audit_status")
private String auditStatus;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoardCat.java
View file @ c5208255
......@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author Danny Lee
* @since 2021-03-17
* @since 2021-03-23
*/
@Data
@Builder
......@@ -39,23 +39,19 @@ public class ExhibitionBoardCat implements Serializable {
@ApiModelProperty("展板分类名称")
@TableField("name")
@NotBlank(message = "展板分类名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("所属版权方ID")
@TableField("copyright_owner")
private String copyrightOwner;
@NotBlank(message = "展板分类名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("备注")
@TableField("remarks")
private String remarks;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty("修改日期")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContent.java
View file @ c5208255
package cn.wisenergy.chnmuseum.party.model;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -17,7 +19,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author Danny Lee
* @since 2021-03-16
* @since 2021-03-23
*/
@Data
@Builder
......@@ -26,34 +28,53 @@ import java.time.LocalDateTime;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("learning_content")
@ApiModel(value = "LearningContent对象", description = "学习内容")
@ApiModel(value = "学习内容", description = "学习内容")
public class LearningContent implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("学习内容ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "学习内容IDID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty("学习内容名称")
@TableField("name")
@NotBlank(message = "学习内容名称不能为空")
@NotBlank(message = "学习内容名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("学习内容宣传图")
@TableField("avartar")
@NotBlank(message = "学习内容宣传图不能为空")
private String avartar;
@TableField("cover")
@NotBlank(message = "学习内容宣传图不能为空", groups = {Add.class, Update.class})
private String cover;
@ApiModelProperty("适用范围")
@TableField("applicable_scope")
@NotNull(message = "适用范围不能为空")
private Integer applicableScope;
@NotBlank(message = "适用范围不能为空", groups = {Add.class, Update.class})
private String applicableScope;
@ApiModelProperty("审核状态")
@TableField("audit_status")
@NotBlank(message = "审核状态不能为空")
private String auditStatus;
@ApiModelProperty("学习项目ID")
@TableField("learning_project_id")
@NotBlank(message = "学习项目ID不能为空", groups = {Add.class, Update.class})
private String learningProjectId;
@ApiModelProperty("新增审核状态")
@TableField("audit_status_add")
@NotBlank(message = "新增审核状态不能为空", groups = {Add.class, Update.class})
private String auditStatusAdd;
@ApiModelProperty("修改审核状态")
@TableField("audit_status_edit")
private String auditStatusEdit;
@ApiModelProperty("删除审核状态")
@TableField("audit_status_delete")
private String auditStatusDelete;
@ApiModelProperty("排序顺序")
@TableField("sortorder")
@NotNull(message = "排序顺序不能为空", groups = {Add.class, Update.class})
private Integer sortorder;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
......
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContentBoard.java
View file @ c5208255
package cn.wisenergy.chnmuseum.party.model;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
......@@ -17,25 +21,32 @@ import java.io.Serializable;
* </p>
*
* @author Danny Lee
* @since 2021-03-16
* @since 2021-03-23
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("learning_content_board")
@ApiModel(value = "LearningContentBoard对象", description = "学习内容展板")
@ApiModel(value = "学习内容展板", description = "学习内容展板")
public class LearningContentBoard implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "ID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty(value = "学习内容ID")
@ApiModelProperty("学习内容ID")
@TableField("learning_content_id")
@NotBlank(message = "学习内容ID不能为空", groups = {Add.class, Update.class})
private String learningContentId;
@ApiModelProperty(value = "展板ID")
@ApiModelProperty("展板ID")
@TableField("exhibition_board_id")
@NotBlank(message = "展板ID不能为空", groups = {Add.class, Update.class})
private String exhibitionBoardId;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContentBoardCat.java
View file @ c5208255
package cn.wisenergy.chnmuseum.party.model;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
......@@ -17,25 +21,32 @@ import java.io.Serializable;
* </p>
*
* @author Danny Lee
* @since 2021-03-16
* @since 2021-03-23
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("learning_content_board_cat")
@ApiModel(value = "LearningContentBoardCat对象", description = "学习内容展板分类")
@ApiModel(value = "学习内容展板分类", description = "学习内容展板分类")
public class LearningContentBoardCat implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "ID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty(value = "学习内容ID")
@ApiModelProperty("学习内容ID")
@TableField("learning_content_id")
@NotBlank(message = "学习内容ID不能为空", groups = {Add.class, Update.class})
private String learningContentId;
@ApiModelProperty(value = "展板类别ID")
@ApiModelProperty("展板类别ID")
@TableField("exhibition_board_cat_id")
@NotBlank(message = "展板类别ID不能为空", groups = {Add.class, Update.class})
private String exhibitionBoardCatId;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContentCopyrightOwner.java
View file @ c5208255
package cn.wisenergy.chnmuseum.party.model;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
......@@ -17,25 +21,32 @@ import java.io.Serializable;
* </p>
*
* @author Danny Lee
* @since 2021-03-16
* @since 2021-03-23
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("learning_content_copyright_owner")
@ApiModel(value = "LearningContentCopyrightOwner对象", description = "学习内容版权方")
@ApiModel(value = "学习内容版权方", description = "学习内容版权方")
public class LearningContentCopyrightOwner implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "ID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty(value = "学习内容ID")
@ApiModelProperty("学习内容ID")
@TableField("learning_content_id")
@NotBlank(message = "学习内容ID不能为空", groups = {Add.class, Update.class})
private String learningContentId;
@ApiModelProperty(value = "版权方ID")
@ApiModelProperty("版权方ID")
@TableField("copyright_owner_id")
@NotBlank(message = "版权方ID不能为空", groups = {Add.class, Update.class})
private String copyrightOwnerId;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/LearningProject.java 0 → 100644
View file @ c5208255
package cn.wisenergy.chnmuseum.party.model;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author Danny Lee
* @since 2021-03-23
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@TableName("learning_project")
@ApiModel(value = "", description = "")
public class LearningProject implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("学习项目ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@NotNull(message = "学习项目IDID不能为空", groups = {Update.class})
private String id;
@ApiModelProperty("学习项目名称")
@TableField("name")
@NotBlank(message = "学习项目名称不能为空", groups = {Add.class, Update.class})
private String name;
@ApiModelProperty("备注")
@TableField("remarks")
private String remarks;
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty("更新日期")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java
View file @ c5208255
......@@ -85,7 +85,7 @@ public class AssetController extends BaseController {
.fileSize(file.getSize()).fileUrl(url).build());
}
asset.setVideoUrl(JSONObject.toJSONString(filesMetadata));
asset.setAuditStatus(AuditStatusEnum.TBC.name());
asset.setAuditStatusAdd(AuditStatusEnum.TBC.name());
// 保存业务节点信息
boolean result = assetService.save(asset);
// 返回操作结果
......@@ -109,9 +109,9 @@ public class AssetController extends BaseController {
String url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
filesMetadata.put(originalFilename.trim(), url);
}
asset.setAuditStatus(AuditStatusEnum.TBC.name());
asset.setAuditStatusAdd(AuditStatusEnum.TBC.name());
}
asset.setAuditStatus(AuditStatusEnum.TBC.name());
asset.setAuditStatusAdd(AuditStatusEnum.TBC.name());
boolean flag = assetService.updateById(asset);
if (flag) {
return getSuccessResult();
......@@ -158,7 +158,7 @@ public class AssetController extends BaseController {
@ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
})
public Map<String, Object> getAssetList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
List<Asset> assetList = assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getAuditStatus, auditStatus.name()));
List<Asset> assetList = assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getAuditStatusAdd, auditStatus.name()));
return getResult(assetList);
}
......@@ -199,7 +199,9 @@ public class AssetController extends BaseController {
queryWrapper.select(
Asset::getId,
Asset::getName,
Asset::getAuditStatus,
Asset::getAuditStatusAdd,
Asset::getAuditStatusEdit,
Asset::getAuditStatusDelete,
Asset::getAssetTypeId,
Asset::getAssetCopyrightOwnerId,
Asset::getCreateTime,
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @ c5208255
......@@ -192,7 +192,7 @@ public class ChinaMobileRestApiController extends BaseController {
}
// 对版权方模糊查询
if (StringUtils.isNotBlank(genericPageParam.getBoardCopyrightOwnerId())) {
queryWrapper.like(ExhibitionBoard::getCopyrightOwnerId, genericPageParam.getBoardCopyrightOwnerId());
queryWrapper.like(ExhibitionBoard::getBoardCopyrightOwnerId, genericPageParam.getBoardCopyrightOwnerId());
}
// 根据创建时间区间检索
if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
......@@ -205,7 +205,6 @@ public class ChinaMobileRestApiController extends BaseController {
queryWrapper.select(
ExhibitionBoard::getId,
ExhibitionBoard::getName,
ExhibitionBoard::getAuditStatus,
ExhibitionBoard::getCreateTime,
ExhibitionBoard::getUpdateTime);
Page<ExhibitionBoard> page = this.exhibitionBoardService.page(getPage(), queryWrapper);
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/CopyrightOwnerController.java
View file @ c5208255
......@@ -123,8 +123,8 @@ public class CopyrightOwnerController extends BaseController {
updateWrapper.set(Asset::getAssetCopyrightOwnerId, null);
boolean result1 = this.assetService.update(updateWrapper);
LambdaUpdateWrapper<ExhibitionBoard> updateWrapper1 = Wrappers.<ExhibitionBoard>lambdaUpdate().eq(ExhibitionBoard::getCopyrightOwnerId, id);
updateWrapper1.set(ExhibitionBoard::getCopyrightOwnerId, null);
LambdaUpdateWrapper<ExhibitionBoard> updateWrapper1 = Wrappers.<ExhibitionBoard>lambdaUpdate().eq(ExhibitionBoard::getBoardCopyrightOwnerId, id);
updateWrapper1.set(ExhibitionBoard::getBoardCopyrightOwnerId, null);
boolean result2 = this.exhibitionBoardService.update(updateWrapper1);
LambdaUpdateWrapper<CopyrightOwnerAssetType> updateWrapper2 = Wrappers.<CopyrightOwnerAssetType>lambdaUpdate().eq(CopyrightOwnerAssetType::getCopyrightOwnerId, id);
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @ c5208255
......@@ -123,7 +123,7 @@ public class ExhibitionBoardController extends BaseController {
@ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
})
public Map<String, Object> getExhibitionBoardList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED", required = false) AuditStatusEnum auditStatus) {
List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, auditStatus.name()));
List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatusAdd, auditStatus.name()));
return getResult(exhibitionBoardList);
}
......@@ -146,7 +146,7 @@ public class ExhibitionBoardController extends BaseController {
}
// 对版权方模糊查询
if (StringUtils.isNotBlank(genericPageParam.getBoardCopyrightOwnerId())) {
queryWrapper.like(ExhibitionBoard::getCopyrightOwnerId, genericPageParam.getBoardCopyrightOwnerId());
queryWrapper.like(ExhibitionBoard::getAssetCopyrightOwnerId, genericPageParam.getBoardCopyrightOwnerId());
}
// 根据创建时间区间检索
if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
......@@ -159,7 +159,9 @@ public class ExhibitionBoardController extends BaseController {
queryWrapper.select(
ExhibitionBoard::getId,
ExhibitionBoard::getName,
ExhibitionBoard::getAuditStatus,
ExhibitionBoard::getAuditStatusAdd,
ExhibitionBoard::getAuditStatusEdit,
ExhibitionBoard::getAuditStatusDelete,
ExhibitionBoard::getCreateTime,
ExhibitionBoard::getUpdateTime);
Page<ExhibitionBoard> page = this.exhibitionBoardService.page(getPage(), queryWrapper);
......
src/main/resources/templates/entity.java.vm
View file @ c5208255
......@@ -26,6 +26,8 @@ import com.baomidou.mybatisplus.annotations.Version;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
#end
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.baomidou.mybatisplus.annotation.TableField;
/**
......@@ -87,7 +89,7 @@ public class ${entity} implements Serializable {
#elseif(!$null.isNull(${idType}) && "$!idType" != "")
## 设置主键注解
@TableId(value = "${field.name}", type = IdType.${idType})
@NotNull(message = "${field.comment}ID不能为空", groups = {Update.class})
@NotNull(message = "${field.comment}不能为空", groups = {Update.class})
## 是主键类型
#set($custom_is_pk=true)
#elseif(${field.convert})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment