tsurumure 5 сар өмнө
parent
commit
709081a210
26 өөрчлөгдсөн 35 нэмэгдсэн , 29 устгасан
  1. 1 1
      src/main/java/com/backendsys/entity/Ai/AiGenerateVideoDTO.java
  2. 1 1
      src/main/java/com/backendsys/entity/Ai/Aizn/AiznImageIncantationDTO.java
  3. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cGoodBrandDTO.java
  4. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cGoodCategoryDTO.java
  5. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cGoodDTO.java
  6. 2 2
      src/main/java/com/backendsys/entity/B2c/B2cGoodSpecDTO.java
  7. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cGoodUnitDTO.java
  8. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cMemberDTO.java
  9. 1 1
      src/main/java/com/backendsys/entity/B2c/B2cMemberRecipientDTO.java
  10. 1 1
      src/main/java/com/backendsys/entity/Cms/CmsArticleCategoryDTO.java
  11. 1 1
      src/main/java/com/backendsys/entity/Cms/CmsBannerDTO.java
  12. 2 2
      src/main/java/com/backendsys/entity/Cms/CmsSiteInfoDTO.java
  13. 1 1
      src/main/java/com/backendsys/entity/Med/MedMaterialCategoryDTO.java
  14. 1 1
      src/main/java/com/backendsys/entity/System/SysFile/SysFileCategoryDTO.java
  15. 1 1
      src/main/java/com/backendsys/entity/System/SysSMSDTO.java
  16. 1 1
      src/main/java/com/backendsys/modules/cms/article/entity/ArticleCategoryI18n.java
  17. 1 1
      src/main/java/com/backendsys/modules/cms/banner/entity/BannerI18n.java
  18. 1 1
      src/main/java/com/backendsys/modules/cms/navigation/entity/NavigationI18n.java
  19. 1 1
      src/main/java/com/backendsys/modules/cms/page/entity/PageI18n.java
  20. 2 2
      src/main/java/com/backendsys/modules/cms/siteinfo/entity/SiteInfo.java
  21. 2 2
      src/main/java/com/backendsys/modules/system/entity/SysCommon.java
  22. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserRole.java
  23. 2 2
      src/main/java/com/backendsys/modules/system/entity/SysUserRoleMenu.java
  24. 1 1
      src/main/java/com/backendsys/modules/upload/entity/SysFileCategory.java
  25. 3 0
      src/main/resources/mapper/cms/article/ArticleCategoryDao.xml
  26. 3 0
      src/main/resources/mapper/cms/banner/BannerDao.xml

+ 1 - 1
src/main/java/com/backendsys/entity/Ai/AiGenerateVideoDTO.java

@@ -22,7 +22,7 @@ public class AiGenerateVideoDTO {
     private Long job_id;
 
     @NotNull(message = "标题不能为空", groups = { Create.class })
-    @Size(max = 20, message = "标题长度不超过 {max} 字符", groups = { Create.class })
+    @Size(max = 50, message = "标题长度不超过 {max} 字符", groups = { Create.class })
     private String title;
 
     @NotNull(message = "内容不能为空", groups = { Create.class })

+ 1 - 1
src/main/java/com/backendsys/entity/Ai/Aizn/AiznImageIncantationDTO.java

@@ -13,6 +13,6 @@ public class AiznImageIncantationDTO {
 
     private String category_name;
 
-    @Size(max = 20, message = "category_name 长度不超过 {max} 个字符")
+    @Size(max = 50, message = "category_name 长度不超过 {max} 个字符")
     private String name;
 }

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cGoodBrandDTO.java

@@ -24,7 +24,7 @@ public class B2cGoodBrandDTO {
     private Long parent_id;
 
     @NotBlank(message = "商品品牌名称不能为空", groups = { B2cGoodBrandDTO.Create.class, B2cGoodBrandDTO.Update.class })
-    @Size(max = 20, message = "商品品牌名称长度不超过 {max} 个字符", groups = { B2cGoodBrandDTO.Create.class, B2cGoodBrandDTO.Update.class })
+    @Size(max = 50, message = "商品品牌名称长度不超过 {max} 个字符", groups = { B2cGoodBrandDTO.Create.class, B2cGoodBrandDTO.Update.class })
     private String brand_name;
 
     @Range(min = 1, max = 9999, message = "排序必须在 {min} 到 {max} 之间")

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cGoodCategoryDTO.java

@@ -23,7 +23,7 @@ public class B2cGoodCategoryDTO {
 
     private Long parent_id;
 
-    @Size(max = 20, message = "分类名称长度不超过 {max} 个字符", groups = { B2cGoodCategoryDTO.Create.class, B2cGoodCategoryDTO.Update.class })
+    @Size(max = 50, message = "分类名称长度不超过 {max} 个字符", groups = { B2cGoodCategoryDTO.Create.class, B2cGoodCategoryDTO.Update.class })
     @NotBlank(message = "分类名称不能为空", groups = { B2cGoodCategoryDTO.Create.class, B2cGoodCategoryDTO.Update.class })
     private String category_name;
 

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cGoodDTO.java

@@ -30,7 +30,7 @@ public class B2cGoodDTO {
     private String unit_name;
 
     @NotBlank(message = "商品名称不能为空", groups = { B2cGoodDTO.Create.class, B2cGoodDTO.Update.class })
-    @Size(max = 20, message = "商品名称长度不超过 {max} 字符", groups = { B2cGoodDTO.Create.class, B2cGoodDTO.Update.class })
+    @Size(max = 50, message = "商品名称长度不超过 {max} 字符", groups = { B2cGoodDTO.Create.class, B2cGoodDTO.Update.class })
     private String good_name;
 
     @Size(max = 200, message = "商品描述长度不超过 {max} 字符", groups = { B2cGoodDTO.Create.class, B2cGoodDTO.Update.class })

+ 2 - 2
src/main/java/com/backendsys/entity/B2c/B2cGoodSpecDTO.java

@@ -23,11 +23,11 @@ public class B2cGoodSpecDTO {
 //    private Long good_id;
 
     @NotBlank(message = "商品规格名称不能为空", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
-    @Size(max = 20, message = "商品规格名称长度不超过 {max} 字符", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
+    @Size(max = 50, message = "商品规格名称长度不超过 {max} 字符", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
     private String spec_name;
 
     @NotBlank(message = "商品规格值不能为空", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
-    @Size(max = 20, message = "商品规格值长度不超过 {max} 字符", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
+    @Size(max = 50, message = "商品规格值长度不超过 {max} 字符", groups = { B2cGoodSpecDTO.Create.class, B2cGoodSpecDTO.Update.class })
     private String spec_value;
 
     @Range(min = 1, max = 9999, message = "排序必须在 {min} 到 {max} 之间")

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cGoodUnitDTO.java

@@ -20,7 +20,7 @@ public class B2cGoodUnitDTO {
     @NotNull(message = "商品单位ID不能为空", groups = { B2cGoodUnitDTO.Detail.class, B2cGoodUnitDTO.Update.class, B2cGoodUnitDTO.Delete.class })
     private Long good_unit_id;
 
-    @Size(max = 20, message = "商品单位名称长度不超过 {max} 个字符", groups = { B2cGoodUnitDTO.Create.class, B2cGoodUnitDTO.Update.class })
+    @Size(max = 50, message = "商品单位名称长度不超过 {max} 个字符", groups = { B2cGoodUnitDTO.Create.class, B2cGoodUnitDTO.Update.class })
     @NotBlank(message = "商品单位名称不能为空", groups = { B2cGoodUnitDTO.Create.class, B2cGoodUnitDTO.Update.class })
     private String unit_name;
 

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cMemberDTO.java

@@ -25,7 +25,7 @@ public class B2cMemberDTO {
 
     private String open_id;
 
-    @Size(min = 2, max = 20, message = "昵称长度在 {min}-{max} 字符", groups = { B2cMemberDTO.Create.class, B2cMemberDTO.Update.class })
+    @Size(min = 2, max = 50, message = "昵称长度在 {min}-{max} 字符", groups = { B2cMemberDTO.Create.class, B2cMemberDTO.Update.class })
     private String nickname;
 
     @Phone(message="手机号码格式不正确", groups = { B2cMemberDTO.Create.class, B2cMemberDTO.Update.class, B2cMemberDTO.Login.class })

+ 1 - 1
src/main/java/com/backendsys/entity/B2c/B2cMemberRecipientDTO.java

@@ -20,7 +20,7 @@ public class B2cMemberRecipientDTO {
     @NotNull(message = "会员ID不能为空", groups = { B2cMemberRecipientDTO.Detail.class, B2cMemberRecipientDTO.Update.class, B2cMemberRecipientDTO.Delete.class })
     private Long member_id;
 
-    @Size(min = 2, max = 20, message = "收货人姓名长度在 {min}-{mx} 字符", groups = { B2cMemberRecipientDTO.Create.class, B2cMemberRecipientDTO.Update.class })
+    @Size(min = 2, max = 50, message = "收货人姓名长度在 {min}-{mx} 字符", groups = { B2cMemberRecipientDTO.Create.class, B2cMemberRecipientDTO.Update.class })
     private String recipient_name;
 
     @Phone(message="手机号码格式不正确", groups = { B2cMemberRecipientDTO.Create.class, B2cMemberRecipientDTO.Update.class })

+ 1 - 1
src/main/java/com/backendsys/entity/Cms/CmsArticleCategoryDTO.java

@@ -23,7 +23,7 @@
 //
 //    private Long parent_id;
 //
-//    @Size(max = 20, message = "资讯分类名称长度不超过 {max} 字符", groups = {Create.class, Update.class})
+//    @Size(max = 50, message = "资讯分类名称长度不超过 {max} 字符", groups = {Create.class, Update.class})
 //    @NotBlank(message="资讯分类名称不能为空", groups = {Create.class, Update.class, })
 //    private String category_name;
 //

+ 1 - 1
src/main/java/com/backendsys/entity/Cms/CmsBannerDTO.java

@@ -19,7 +19,7 @@ public class CmsBannerDTO {
     private Long id;
     @NotNull(message="banner_id 不能为空", groups = { CmsBannerDTO.Detail.class, CmsBannerDTO.Update.class, CmsBannerDTO.Delete.class })
     private Long banner_id;
-    @Size(max = 20, message = "资讯标题长度不超过 {max} 字符", groups = {CmsBannerDTO.Create.class, CmsBannerDTO.Update.class})
+    @Size(max = 50, message = "资讯标题长度不超过 {max} 字符", groups = {CmsBannerDTO.Create.class, CmsBannerDTO.Update.class})
     @NotNull(message="幻灯片标题不能为空", groups = { CmsBannerDTO.Create.class, CmsBannerDTO.Update.class })
     private String title;
     @RangeArray(message="幻灯片类型取值有误,范围应是(1首页幻灯片, 2内页幻灯片)", value = {"1", "2"}, groups = { CmsBannerDTO.Create.class })

+ 2 - 2
src/main/java/com/backendsys/entity/Cms/CmsSiteInfoDTO.java

@@ -14,7 +14,7 @@
 //    @NotNull(message="site_info_id 不能为空", groups = { Detail.class })
 //
 //    @NotEmpty(message="网站名称不能为空", groups = { Update.class })
-//    @Size(min = 2, max = 20, message = "网站名称长度在 {min}-{max} 字符", groups = { Update.class })
+//    @Size(min = 2, max = 50, message = "网站名称长度在 {min}-{max} 字符", groups = { Update.class })
 //    private String name;
 //
 //    @Size(max = 100, message = "关键词长度不超过 {max} 字符", groups = { Update.class })
@@ -25,7 +25,7 @@
 //    @Size(max = 100, message = "版权信息长度不超过 {max} 字符", groups = { Update.class })
 //    private String copyright;
 //
-//    @Size(max = 20, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
+//    @Size(max = 50, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
 //    private String icp;
 //
 //    @RangeArray(message="状态取值有误,范围应是(-1禁用, 1启用)", value = {"-1", "1"}, groups = { Update.class })

+ 1 - 1
src/main/java/com/backendsys/entity/Med/MedMaterialCategoryDTO.java

@@ -23,7 +23,7 @@ public class MedMaterialCategoryDTO {
 
     private Long parent_id;
 
-    @Size(max = 20, message = "素材分类名称长度不超过 {max} 字符", groups = {MedMaterialCategoryDTO.Create.class, MedMaterialCategoryDTO.Update.class})
+    @Size(max = 50, message = "素材分类名称长度不超过 {max} 字符", groups = {MedMaterialCategoryDTO.Create.class, MedMaterialCategoryDTO.Update.class})
     @NotBlank(message="素材分类名称不能为空", groups = {MedMaterialCategoryDTO.Create.class, MedMaterialCategoryDTO.Update.class, })
     private String category_name;
 

+ 1 - 1
src/main/java/com/backendsys/entity/System/SysFile/SysFileCategoryDTO.java

@@ -16,7 +16,7 @@ public class SysFileCategoryDTO {
     @NotNull(message = "分类ID不能为空", groups = { Create.class, Update.class })
     private Long category_id;
 
-    @Size(max = 20, message = "分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
     private String category_name;
 
     @Size(max = 1000, message = "文件后缀名长度不超过 {max} 字符", groups = { Create.class, Update.class })

+ 1 - 1
src/main/java/com/backendsys/entity/System/SysSMSDTO.java

@@ -18,7 +18,7 @@ public class SysSMSDTO {
     private String origin;
 
     @NotEmpty(message="手机号码不能为空", groups = { Send.class })
-    @Size(max = 20, message = "手机号码长度不超过 {max} 字符", groups = { Send.class })
+    @Size(max = 50, message = "手机号码长度不超过 {max} 字符", groups = { Send.class })
     private String phone;
     @NotNull(message="区号/国家码不能为空", groups = { Send.class })
     @Max(value = 999999, message = "区号/国家码长度不超过 {value} 字符", groups = { Send.class })

+ 1 - 1
src/main/java/com/backendsys/modules/cms/article/entity/ArticleCategoryI18n.java

@@ -27,7 +27,7 @@ public class ArticleCategoryI18n {
     @TableField("id")
     private Long article_category_id;
 
-    @Size(max = 20, message = "资讯分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "资讯分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
     @NotBlank(message="资讯分类名称不能为空", groups = { Create.class, Update.class })
     private String category_name;
     @Size(max = 200, message = "资讯分类描述长度不超过 {max} 字符", groups = { Create.class, Update.class })

+ 1 - 1
src/main/java/com/backendsys/modules/cms/banner/entity/BannerI18n.java

@@ -26,7 +26,7 @@ public class BannerI18n {
     @TableId(type = IdType.AUTO)
     private Long id;
     private Long banner_id;
-    @Size(max = 20, message = "资讯标题长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "资讯标题长度不超过 {max} 字符", groups = { Create.class, Update.class })
     @NotNull(message="幻灯片标题不能为空", groups = { Create.class, Update.class })
     private String title;
     @Size(max = 1000, message = "链接路径长度不超过 {max} 字符", groups = { Create.class, Update.class})

+ 1 - 1
src/main/java/com/backendsys/modules/cms/navigation/entity/NavigationI18n.java

@@ -22,7 +22,7 @@ public class NavigationI18n {
     private Long navigation_id;
     @NotEmpty(message="语言不能为空")
     private String language;
-    @Size(max = 20, message = "菜单名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "菜单名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
     private String navigation_name;
     @Size(max = 1000, message = "链接长度不超过 {max} 字符", groups = { Create.class, Update.class })
     private String link;

+ 1 - 1
src/main/java/com/backendsys/modules/cms/page/entity/PageI18n.java

@@ -24,7 +24,7 @@ public class PageI18n {
     @TableId(type = IdType.AUTO)
     private Long id;
     private String page_sign;
-    @Size(max = 20, message = "内容标题长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "内容标题长度不超过 {max} 字符", groups = { Create.class, Update.class })
     @NotBlank(message="内容标题不能为空", groups = { Create.class, Update.class })
     private String title;
     @Size(max = 200, message = "内容描述长度不超过 {max} 字符", groups = { Create.class, Update.class })

+ 2 - 2
src/main/java/com/backendsys/modules/cms/siteinfo/entity/SiteInfo.java

@@ -19,7 +19,7 @@ public class SiteInfo {
     private Long id;
 
     @NotEmpty(message="网站名称不能为空", groups = { Update.class })
-    @Size(min = 2, max = 20, message = "网站名称长度在 {min}-{max} 字符", groups = { Update.class })
+    @Size(min = 2, max = 50, message = "网站名称长度在 {min}-{max} 字符", groups = { Update.class })
     private String name;
 
     @Size(max = 100, message = "关键词长度不超过 {max} 字符", groups = { Update.class })
@@ -30,7 +30,7 @@ public class SiteInfo {
     @Size(max = 100, message = "版权信息长度不超过 {max} 字符", groups = { Update.class })
     private String copyright;
 
-    @Size(max = 20, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
+    @Size(max = 50, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
     private String icp;
 
     @RangeArray(message="状态取值有误,范围应是(-1禁用, 1启用)", value = {"-1", "1"}, groups = { Update.class })

+ 2 - 2
src/main/java/com/backendsys/modules/system/entity/SysCommon.java

@@ -21,7 +21,7 @@ public class SysCommon {
     @NotNull(message = "id 不能为空", groups = { Detail.class, Update.class })
     private Long id;
 
-    @Size(max = 20, message = "配置名称长度不超过 {max} 个字符", groups = { Update.class })
+    @Size(max = 50, message = "配置名称长度不超过 {max} 个字符", groups = { Update.class })
     private String name;
     @Size(max = 500, message = "配置描述长度不超过 {max} 个字符", groups = { Update.class })
     private String description;
@@ -35,7 +35,7 @@ public class SysCommon {
 
     private String value_option;
     private Integer max;
-    @Size(max = 20, message = "分类长度不超过 {max} 个字符", groups = { Update.class })
+    @Size(max = 50, message = "分类长度不超过 {max} 个字符", groups = { Update.class })
     private String category;
 
     private Integer sort;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUserRole.java

@@ -28,7 +28,7 @@ public class SysUserRole {
     @TableField("id")
     private Long role_id;
 
-    @Size(min = 2, max = 20, message = "角色名称长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
+    @Size(min = 2, max = 50, message = "角色名称长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
     private String role_name;
 
     @Size(max = 200, message = "角色描述长度不超过 {max} 字符", groups = { Create.class, Update.class })

+ 2 - 2
src/main/java/com/backendsys/modules/system/entity/SysUserRoleMenu.java

@@ -29,11 +29,11 @@ public class SysUserRoleMenu {
     private Long parent_id;
 
     @NotEmpty(message="菜单名称不能为空", groups = { Create.class, Update.class })
-    @Size(min = 2, max = 20, message = "菜单名称长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
+    @Size(min = 2, max = 50, message = "菜单名称长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
     private String menu_name;
 
     @NotEmpty(message="菜单名称(英文)不能为空", groups = { Create.class, Update.class })
-    @Size(min = 2, max = 20, message = "菜单名称(英文)长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
+    @Size(min = 2, max = 50, message = "菜单名称(英文)长度在 {min}-{max} 字符", groups = { Create.class, Update.class })
     private String menu_name_en;
 
     @NotNull(message="菜单类型不能为空", groups = { Create.class, Update.class })

+ 1 - 1
src/main/java/com/backendsys/modules/upload/entity/SysFileCategory.java

@@ -23,7 +23,7 @@ public class SysFileCategory {
     private Long id;
 
     private Long user_id;
-    @Size(max = 20, message = "资讯分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
+    @Size(max = 50, message = "资讯分类名称长度不超过 {max} 字符", groups = { Create.class, Update.class })
     @NotBlank(message="资讯分类名称不能为空", groups = { Create.class, Update.class })
     private String category_name;
 

+ 3 - 0
src/main/resources/mapper/cms/article/ArticleCategoryDao.xml

@@ -64,6 +64,9 @@
             <if test="category_name != null and category_name != ''">
                 AND act.category_name LIKE CONCAT('%', #{category_name}, '%')
             </if>
+            <if test="status != null and status != ''">
+                AND ac.status = #{status}
+            </if>
         </where>
         ORDER BY ac.sort DESC
     </select>

+ 3 - 0
src/main/resources/mapper/cms/banner/BannerDao.xml

@@ -84,6 +84,9 @@
             <if test="title != null and title != ''">
                 AND bt.title LIKE CONCAT('%', #{title}, '%')
             </if>
+            <if test="status != null and status != ''">
+                AND b.status = #{status}
+            </if>
         </where>
     </select>