Module and Banner（update）

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/BannerInfoQO.java

@@ -24,17 +24,17 @@ import java.io.Serializable;
 //@ApiModel(value = "com.mmc.csf.model.qo.BannerInfoQO", description = "banner查询QO")
 public class BannerInfoQO implements Serializable {
     private static final long serialVersionUID = 7376276027677051853L;
-    @ApiModelProperty(value = "关键字")
+    @ApiModelProperty(value = "关键字",required = true)
     private String keyword;
     @ApiModelProperty(value = "所属产品")
     private Integer moduleType;
     @ApiModelProperty(value = "宣传模块id")
     private Integer moduleId;
-    @ApiModelProperty(value = "页码", required = true)
+    @ApiModelProperty(value = "页码", required = true,example = "1")
     @NotNull(message = "页码不能为空", groups = Page.class)
     @Min(value = 1, groups = Page.class)
     private Integer pageNo;
-    @ApiModelProperty(value = "每页显示数", required = true)
+    @ApiModelProperty(value = "每页显示数", required = true,example = "10")
     @NotNull(message = "每页显示数不能为空", groups = Page.class)
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/ModuleInfoQO.java

@@ -22,19 +22,19 @@ import java.io.Serializable;
 //@ApiModel(value = "com.mmc.csf.model.qo.ModuleInfoQO", description = "宣传中心模块查询QO")
 public class ModuleInfoQO implements Serializable {
     private static final long serialVersionUID = -681758664049977685L;
-    @ApiModelProperty(value = "关键字")
-    private String keyword;
-    @ApiModelProperty(value = "所属产品")
+    @ApiModelProperty(value = "模块名称")
+    private String moduleName;
+    @ApiModelProperty(value = "所属产品",hidden = true)
     private Integer moduleType;
-    @ApiModelProperty(value = "关键字")
+    @ApiModelProperty(value = "模块代码")
     private String moduleCode;
-    @ApiModelProperty(value = "port:0云享飞，1无人机城")
+    @ApiModelProperty(value = "port:0云享飞，1无人机城",hidden = true)
     private Integer port;
-    @ApiModelProperty(value = "页码", required = true)
+    @ApiModelProperty(value = "页码", required = true,example = "1")
     @NotNull(message = "页码不能为空", groups = Page.class)
     @Min(value = 1, groups = Page.class)
     private Integer pageNo;
-    @ApiModelProperty(value = "每页显示数", required = true)
+    @ApiModelProperty(value = "每页显示数", required = true,example = "10")
     @NotNull(message = "每页显示数不能为空", groups = Page.class)
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/BannerInfoVO.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -31,7 +32,8 @@ public class BannerInfoVO implements Serializable {
     @ApiModelProperty(value = "模块id")
     @NotNull(message = "模块id不能为空", groups = {Create.class, Update.class})
     private Integer moduleId;
-    @ApiModelProperty(value = "banner名称")
+    @ApiModelProperty(value = "banner名称",example = "首页")
+    @NotNull(message = "名称不能为null", groups = {Create.class, Update.class})
     @Size(max = 70, message = "名称不能超过70个字符", groups = { Create.class, Update.class })
     private String bannerName;
     @ApiModelProperty(value = "banner类型")
@@ -40,19 +42,23 @@ public class BannerInfoVO implements Serializable {
     private Integer goodsId;
     @ApiModelProperty(value = "点击后的页面地址")
     private String bannerUrl;
+    @NotNull(message = "请先上传内容图片", groups = {Create.class, Update.class})
     @ApiModelProperty(value = "banner图片url")
-    //@NotEmpty(message = "请先上传内容图片", groups = { Create.class})
+    @NotEmpty(message = "请先上传内容图片", groups = { Create.class})
     private String bannerImg;
     @ApiModelProperty(value = "banner海报url")
     private String bannerPoster;
     @ApiModelProperty(value = "顺序")
     @NotNull(message = "sort不能为空", groups = { Others.class})
     private Integer sort;
+    @NotNull(message = "有效开始时间不能为null", groups = { Create.class})
     @ApiModelProperty(value = "有效开始时间")
     private Date startTime;
+    @NotNull(message = "有效结束时间不能为null", groups = { Create.class})
     @ApiModelProperty(value = "有效结束时间")
     private Date endTime;
-    @ApiModelProperty(value = "是否使用")
+    @ApiModelProperty(value = "是否使用 0未上架，1上架" ,example = "1")
+    @NotNull(message = "状态不能为空", groups = { Create.class})
     private Integer using;
     @ApiModelProperty(value = "描述信息")
     private String detailInfo;

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/flyer/vo/ModuleInfoVO.java

@@ -27,14 +27,16 @@ public class ModuleInfoVO implements Serializable {
     @ApiModelProperty(value = "模块id")
     @NotNull(message = "id不能为空", groups = { Update.class})
     private Integer id;
-    @ApiModelProperty(value = "模块名称")
-    @Size(max = 70, message = "模块名称不能超过70个字符", groups = { Create.class, Update.class })
+    @ApiModelProperty(value = "模块名称",example = "首页轮播图")
+    @NotNull(message = "moduleName不能为空", groups = { Create.class, Update.class })
+    @Size(max = 40, message = "必填，输入项，输入字符长度不超过20位", groups = { Create.class, Update.class })
     private String moduleName;
-    @ApiModelProperty(value = "所属产品")
+    @ApiModelProperty(value = "所属产品",example = "0")
+    @NotNull(message = "moduleType不能为空", groups = { Create.class, Update.class })
     private Integer moduleType;
-    @ApiModelProperty(value = "code")
+    @ApiModelProperty(value = "code",example = "HOME_CAROUSEL")
     @NotEmpty(message = "moduleCode不能为空", groups = { Create.class, Update.class })
-    @Size(max = 15, message = "moduleCode不能超过15个字符", groups = { Create.class, Update.class })
+    @Size(max = 40, message = "必填，输入项，输入字符长度不超过20位", groups = { Create.class, Update.class })
     private String moduleCode;
     @ApiModelProperty(value = "备注")
     private String remark;

release-service/src/main/resources/mapper/module/ModuleInfoDao.xml

@@ -72,11 +72,11 @@
         select mi.id,mi.module_name,mi.module_type,mi.module_code,mi.remark,mi.is_deleted,mi.create_time,mi.update_time
         from module_info mi
         where mi.is_deleted = 0
-        <if test=" keyword != null and keyword != '' ">
-            and mi.module_name like CONCAT('%',#{keyword},'%')
+        <if test=" moduleName != null and moduleName != '' ">
+            and mi.module_name like CONCAT('%',#{moduleName},'%')
         </if>
         <if test=" moduleCode != null and moduleCode != '' ">
-            and mi.module_code = #{moduleCode}
+            and mi.module_code like CONCAT('%',#{moduleCode},'%')
         </if>
         <if test=" moduleType != null ">
             and mi.module_type = #{moduleType}
@@ -93,11 +93,11 @@
     <select id="countListModuleInfoPage" resultType="int" parameterType="com.mmc.csf.infomation.qo.ModuleInfoQO">
         select count(*) from module_info mi
         where mi.is_deleted = 0
-        <if test=" keyword != null and keyword != '' ">
-            and mi.module_name like CONCAT('%',#{keyword},'%')
+        <if test=" moduleName != null and moduleName != '' ">
+            and mi.module_name like CONCAT('%',#{moduleName},'%')
         </if>
         <if test=" moduleCode != null and moduleCode != '' ">
-            and mi.module_code = #{moduleCode}
+            and mi.module_code like CONCAT('%',#{moduleCode},'%')
         </if>
         <if test=" moduleType != null ">
             and mi.module_type = #{moduleType}