Merge remote-tracking branch 'origin/dev' into dev

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

@@ -109,6 +109,8 @@ public class NewsInfo implements Serializable {
 	 */
 	private Integer isHot;
 
+	private Integer rank;
+
     @Transient
 	String typeName;
 

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

@@ -131,4 +131,16 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 		}
 		return ObjectRestResponse.succ(imageImgStorage);
 	}
+
+	public ObjectRestResponse getAll(Integer type) {
+		Example example = new Example(ImageImgStorage.class);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andEqualTo("isDel", 0).andEqualTo("status", 1);
+		if (type != null) {
+			criteria.andEqualTo("type", type);
+		}
+		example.orderBy("updTime").desc();
+		return ObjectRestResponse.succ(mapper.selectByExample(example));
+	}
+
 }
\ No newline at end of file

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

@@ -93,7 +93,7 @@ public class IndustryApplicationInfoBiz extends BaseBiz<IndustryApplicationInfoM
 				Map<Integer, List<IndustryApplicationType>> map = industryApplicationTypeList.stream().collect(Collectors.groupingBy(IndustryApplicationType::getId));
 			Example example = new Example(IndustryApplicationInfo.class);
 			example.createCriteria().andEqualTo("isDel", 0).andEqualTo("status", 1).andEqualTo("indexShow", 1).andIn("firstTypeId", map.keySet());
-			example.orderBy("updTime").desc();
+			example.orderBy("rank");
 			List<IndustryApplicationInfo> industryApplicationInfoList = mapper.selectByExample(example);
 			if (industryApplicationInfoList != null && industryApplicationInfoList.size() > 0) {
 				industryApplicationInfoList.parallelStream().forEach(industryApplicationInfo -> {

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

@@ -81,7 +81,7 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 			criteria.andEqualTo("taxCode", "%" + userInvoiceDto.getTaxCode() + "%");
 		}
 		criteria.andEqualTo("isDel", 0);
-		example.orderBy("updTime");
+		example.orderBy("updTime").desc();
 		Query query = new Query(userInvoiceDto);
 		PageDataVO<UserInvoice> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 		return ObjectRestResponse.succ(pageDataVO);

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

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
+import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
+import com.upyuns.platform.rs.website.entity.ImageImgStorage;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("imageImgStorage/web")
+public class ImageImgStorageWebController extends BaseController<ImageImgStorageBiz,ImageImgStorage> {
+
+	@GetMapping(value = "/app/unauth/getDetail/{id}")
+	public ObjectRestResponse getDetail(@PathVariable Integer id) {
+		return baseBiz.getDetail(id);
+	}
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse getAll(Integer type) {
+		return baseBiz.getAll(type);
+	}
+}
\ No newline at end of file

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

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.ImageInformationBiz;
+import com.upyuns.platform.rs.website.dto.ImageInformationDto;
+import com.upyuns.platform.rs.website.entity.ImageInformation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("imageInformation/web")
+public class ImageInformationWebController extends BaseController<ImageInformationBiz,ImageInformation> {
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse getAll(ImageInformationDto imageInformationDto) {
+		return ObjectRestResponse.succ(baseBiz.selectList(imageInformationDto));
+	}
+
+	@GetMapping(value = "/app/unauth/getDetail/{id}")
+	public ObjectRestResponse getDetail(@PathVariable Integer id) {
+		return ObjectRestResponse.succ(baseBiz.selectById(id));
+	}
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/resources/mapper/NewsInfoMapper.xml

@@ -11,7 +11,7 @@
                 and ni.type_id = #{typeId}
             </if>
         </where>
-        order by ni.upd_time DESC
+        order by ni.rank
     </select>
 
 </mapper>
\ No newline at end of file