zhangyuewww 1 year ago
parent
commit
243be351ff

+ 1 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/IImageManagementService.java

@@ -27,6 +27,7 @@ public interface IImageManagementService{
 								@HttpParam(name = "imageUrl", type = HttpParamType.COMMON, description = "图片地址") String imageUrl,
 							@HttpParam(name = "imageTitle", type = HttpParamType.COMMON, description = "图片标题") String imageTitle,
 							@HttpParam(name = "language", type = HttpParamType.COMMON, description = "语言") String language,
+								@HttpParam(name = "classify", type = HttpParamType.COMMON, description = "分类") String classify,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
 							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/AboutUsInfoServiceImpl.java

@@ -76,7 +76,7 @@ public class AboutUsInfoServiceImpl implements IAboutUsInfoService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<AboutUsInfo> list = aboutUsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = aboutUsInfoMapper.selectCount(wrapper);
 		return new Page<AboutUsInfo>(list, page, limit, count);

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

@@ -77,7 +77,7 @@ public class ArticleManagementServiceImpl implements IArticleManagementService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<ArticleManagement> list = articleManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = articleManagementMapper.selectCount(wrapper);
 		return new Page<ArticleManagement>(list, page, limit, count);

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

@@ -64,7 +64,7 @@ public class CarouselManagementServiceImpl implements ICarouselManagementService
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<CarouselManagement> list = carouselManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = carouselManagementMapper.selectCount(wrapper);
 		return new Page<CarouselManagement>(list, page, limit, count);

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/CloudClassifyInfoServiceImpl.java

@@ -58,7 +58,7 @@ public class CloudClassifyInfoServiceImpl implements ICloudClassifyInfoService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<CloudClassifyInfo> list = cloudClassifyInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = cloudClassifyInfoMapper.selectCount(wrapper);
 		return new Page<CloudClassifyInfo>(list, page, limit, count);

+ 5 - 2
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/ImageManagementServiceImpl.java

@@ -38,7 +38,7 @@ public class ImageManagementServiceImpl implements IImageManagementService{
 	}
 
 	@Override
-	public Page<ImageManagement> list(String imageUrl,String imageTitle,String language,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<ImageManagement> list(String imageUrl,String imageTitle,String language,String classify,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ImageManagement> wrapper = new EntityWrapper<ImageManagement>();
 														if (!StringUtils.isEmpty(imageUrl)) {
 					wrapper.eq("image_url", imageUrl);
@@ -48,6 +48,9 @@ public class ImageManagementServiceImpl implements IImageManagementService{
 				}
 												if (!StringUtils.isEmpty(language)) {
 					wrapper.eq("language", language);
+				}
+												if (!StringUtils.isEmpty(classify)) {
+					wrapper.eq("classify", classify);
 				}
 												if (!StringUtils.isEmpty(gmtCreate)) {
 					wrapper.eq("gmt_create", gmtCreate);
@@ -58,7 +61,7 @@ public class ImageManagementServiceImpl implements IImageManagementService{
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<ImageManagement> list = imageManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = imageManagementMapper.selectCount(wrapper);
 		return new Page<ImageManagement>(list, page, limit, count);

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

@@ -67,7 +67,7 @@ public class MessageManagementServiceImpl implements IMessageManagementService{
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<MessageManagement> list = messageManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = messageManagementMapper.selectCount(wrapper);
 		return new Page<MessageManagement>(list, page, limit, count);

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/ProductManagementServiceImpl.java

@@ -74,7 +74,7 @@ public class ProductManagementServiceImpl implements IProductManagementService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<ProductManagement> list = productManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = productManagementMapper.selectCount(wrapper);
 		return new Page<ProductManagement>(list, page, limit, count);

+ 5 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/ImageManagement.java

@@ -37,6 +37,11 @@ public class ImageManagement extends SuperDO{
     @TableField("image_title")
     private String imageTitle;
 
+    /** 图片分类 */
+    @Excel(name = "图片分类")
+    @TableField("classify")
+    private String classify;
+
     /** 语言 */
     @Excel(name = "语言")
     @TableField("language")