新增影像信息，收货地址，影像图框模块接口

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationDto.java

@@ -11,4 +11,7 @@ import lombok.Data;
  */
 @Data
 public class ImageInformationDto extends PageParam {
+
+	String name;
+
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageImgStorage.java

@@ -112,4 +112,7 @@ public class ImageImgStorage implements Serializable {
     private String relatedIds;
 
 
+	private Date crtTime;
+
+	private Date updTime;
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageInformation.java

@@ -91,5 +91,8 @@ public class ImageInformation implements Serializable {
 	@ApiModelProperty(value = "是否启用：1、启用，2、禁用")
 	private Integer status;
 
+	private Date crtTime;
+
+	private Date updTime;
 
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageInformationBiz.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.website.dto.ImageInformationDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.upyuns.platform.rs.website.entity.ImageInformation;
@@ -14,6 +15,8 @@ import com.upyuns.platform.rs.website.mapper.ImageInformationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.List;
+
 /**
  * 影像信息介绍信息表
  *
@@ -56,8 +59,23 @@ public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInf
 		Example example = new Example(ImageInformation.class);
 		Example.Criteria criteria = example.createCriteria();
 		criteria.andEqualTo("isDel", 0);
+		if (StringUtils.isNotBlank(imageInformationDto.getName())) {
+			criteria.andLike("name", "%" + imageInformationDto.getName() + "%");
+		}
+		example.orderBy("updTime");
 		Query query = new Query(imageInformationDto);
 		PageDataVO<ImageInformation> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 		return ObjectRestResponse.succ(pageDataVO);
 	}
+
+	/**
+	 * 获取所有影像信息
+	 * @return
+	 */
+	public List<ImageInformation> getAll() {
+		Example example = new Example(ImageInformation.class);
+		example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1);
+		example.orderBy("rank");
+		return mapper.selectByExample(example);
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageInformationController.java

@@ -23,4 +23,9 @@ public class ImageInformationController extends BaseController<ImageInformationB
 		return baseBiz.addUpdate(imageInformation);
 	}
 
+	@GetMapping(value = "getAll")
+	public ObjectRestResponse getAll() {
+		return ObjectRestResponse.succ(baseBiz.getAll());
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/IndustryApplicationInfoController.java

@@ -25,4 +25,5 @@ public class IndustryApplicationInfoController extends BaseController<IndustryAp
 	public ObjectRestResponse getAll() {
 		return baseBiz.getAllIndexShow();
 	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/IndustryApplicationTypeController.java

@@ -26,6 +26,7 @@ public class IndustryApplicationTypeController extends BaseController<IndustryAp
 		return baseBiz.getAll(indexShow);
 	}
 
+
 	@GetMapping(value = "getDetail")
 	public ObjectRestResponse getDetail(Integer id) {
 		return baseBiz.getDetail(id);