1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/IArticleManagementService.java

@@ -26,6 +26,7 @@ public interface IArticleManagementService{
 	public Page<ArticleManagement> list(
 								@HttpParam(name = "articleTitle", type = HttpParamType.COMMON, description = "文章标题") String articleTitle,
 							@HttpParam(name = "articleIntroduction", type = HttpParamType.COMMON, description = "文章简介") String articleIntroduction,
+							@HttpParam(name = "articleClassify", type = HttpParamType.COMMON, description = "文章分类") String articleClassify,
 							@HttpParam(name = "coverImage", type = HttpParamType.COMMON, description = "封面") String coverImage,
 							@HttpParam(name = "classification", type = HttpParamType.COMMON, description = "分类") String classification,
 							@HttpParam(name = "articleTemplate", type = HttpParamType.COMMON, description = "文章模板") String articleTemplate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/ICarouselManagementService.java

@@ -28,6 +28,7 @@ public interface ICarouselManagementService{
 								@HttpParam(name = "title", type = HttpParamType.COMMON, description = "标题") String title,
 							@HttpParam(name = "url", type = HttpParamType.COMMON, description = "轮播图片") String url,
 								@HttpParam(name = "classify", type = HttpParamType.COMMON, description = "分类") String classify,
+								@HttpParam(name = "language", type = HttpParamType.COMMON, description = " 语言") String language,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/IMessageManagementService.java

@@ -29,6 +29,7 @@ public interface IMessageManagementService{
 							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
 							@HttpParam(name = "email", type = HttpParamType.COMMON, description = "电子邮件") String email,
 							@HttpParam(name = "content", type = HttpParamType.COMMON, description = "留言内容") String content,
+								@HttpParam(name = "language", type = HttpParamType.COMMON, description = " 语言") String language,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/ArticleManagementServiceImpl.java

@@ -39,13 +39,16 @@ public class ArticleManagementServiceImpl implements IArticleManagementService {
 	}
 
 	@Override
-	public Page<ArticleManagement> list(String articleTitle,String articleIntroduction,String coverImage,String classification,String articleTemplate,String searchKeywords,String language,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<ArticleManagement> list(String articleTitle,String articleIntroduction,String articleClassify,String coverImage,String classification,String articleTemplate,String searchKeywords,String language,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ArticleManagement> wrapper = new EntityWrapper<ArticleManagement>();
 														if (!StringUtils.isEmpty(articleTitle)) {
 					wrapper.like("article_title", articleTitle);
 				}
 												if (!StringUtils.isEmpty(articleIntroduction)) {
 					wrapper.eq("article_introduction", articleIntroduction);
+				}
+				if (!StringUtils.isEmpty(articleClassify)) {
+					wrapper.eq("article_classify", articleClassify);
 				}
 												if (!StringUtils.isEmpty(coverImage)) {
 					wrapper.eq("cover_image", coverImage);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/CarouselManagementServiceImpl.java

@@ -38,7 +38,7 @@ public class CarouselManagementServiceImpl implements ICarouselManagementService
 	}
 
 	@Override
-	public Page<CarouselManagement> list(String title,String url,String classify,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<CarouselManagement> list(String title,String url,String classify,String language,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CarouselManagement> wrapper = new EntityWrapper<CarouselManagement>();
 														if (!StringUtils.isEmpty(title)) {
 					wrapper.eq("title", title);
@@ -48,6 +48,9 @@ public class CarouselManagementServiceImpl implements ICarouselManagementService
 				}
 		if (!StringUtils.isEmpty(classify)) {
 			wrapper.eq("classify", classify);
+		}
+		if (!StringUtils.isEmpty(language)) {
+			wrapper.eq("language", language);
 		}
 												if (!StringUtils.isEmpty(status)) {
 					wrapper.eq("status", status);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/MessageManagementServiceImpl.java

@@ -38,7 +38,7 @@ public class MessageManagementServiceImpl implements IMessageManagementService{
 	}
 
 	@Override
-	public Page<MessageManagement> list(String name,String phone,String email,String content,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<MessageManagement> list(String name,String phone,String email,String content,String language,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<MessageManagement> wrapper = new EntityWrapper<MessageManagement>();
 														if (!StringUtils.isEmpty(name)) {
 					wrapper.eq("name", name);
@@ -52,6 +52,9 @@ public class MessageManagementServiceImpl implements IMessageManagementService{
 												if (!StringUtils.isEmpty(content)) {
 					wrapper.eq("content", content);
 				}
+		if (!StringUtils.isEmpty(language)) {
+			wrapper.eq("language", language);
+		}
 												if (!StringUtils.isEmpty(status)) {
 					wrapper.eq("status", status);
 				}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/ArticleManagement.java

@@ -37,6 +37,11 @@ public class ArticleManagement extends SuperDO{
     @TableField("article_introduction")
     private String articleIntroduction;
 
+    /** 文章分类 */
+    @Excel(name = "文章分类")
+    @TableField("article_classify")
+    private String articleClassify;
+
     /** 封面 */
     @Excel(name = "封面")
     @TableField("cover_image")

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CarouselManagement.java

@@ -47,6 +47,11 @@ public class CarouselManagement extends SuperDO{
     @TableField("classify")
     private String classify;
 
+    /** 语言 */
+    @Excel(name = "语言")
+    @TableField("language")
+    private String language;
+
     /** 状态 */
     @Excel(name = "状态")
     @TableField("status")

unimall-data/src/main/java/com/iotechn/unimall/data/domain/MessageManagement.java

@@ -47,6 +47,11 @@ public class MessageManagement extends SuperDO{
     @TableField("content")
     private String content;
 
+    /** 语言 */
+    @Excel(name = "语言")
+    @TableField("language")
+    private String language;
+
     /** 状态 */
     @Excel(name = "状态")
     @TableField("status")