QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(动态消息): 翻译、来源

Browse Source
This commit is contained in:
yjz
2024-07-17 11:21:07 +08:00
parent e4cd83ac1f
commit 1ef3431d6a
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java
+11 -10
View File
@@ -1,28 +1,28 @@
package com.jero.modules.laws.standard.controller;
import java.util.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.exception.JeroBootException;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.standard.entity.LawsNewsFeed;
import com.jero.modules.laws.standard.service.ILawsNewsFeedService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import java.util.*;
/**
@@ -52,6 +52,7 @@ public class LawsNewsFeedController extends JeroController<LawsNewsFeed, ILawsNe
@ApiOperation(value = "动态消息-分页列表查询", notes = "动态消息-分页列表查询")
@GetMapping(value = "/page")
@RequiresPermissions("dynamicMessage:search")
@Translation
@ApiOperationSupport(order = 1)
public Result<IPage<LawsNewsFeed>> queryPageList(LawsNewsFeed lawsNewsFeed,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+11 -9
View File
@@ -1,23 +1,21 @@
package com.jero.modules.laws.standard.entity;
import java.io.Serializable;
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 com.jero.common.aspect.annotation.Dict;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Value;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* @Description: 动态消息
@@ -96,8 +94,12 @@ public class LawsNewsFeed implements Serializable {
private java.lang.Integer readCount;
/**编辑人*/
@ApiModelProperty(value = "编辑人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
private String writer;
/**来源*/
@Excel(name = "来源", width = 15)
@ApiModelProperty(value = "来源")
private java.lang.String source;
/**推送范围标识（1-指定用户、2-全体用户）*/
private Integer pushRangeFlag;
@@ -107,7 +109,7 @@ public class LawsNewsFeed implements Serializable {
@ApiModelProperty(value = "推送范围")
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
private String pushRange;
@ApiModelProperty(value = "是否可以编辑和删除")