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

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

+package com.upyuns.platform.rs.website.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName : ImageStorageImgDto
+ * @Description : 批量上下架以及删除
+ * @Author : jiaoruizhen
+ * @Date: 2021-01-13 15:53
+ */
+@Data
+public class ImageStorageImgDto {
+	String ids;
+	Integer status;
+	Integer isDel;
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageImgStorageBiz.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.ImageInformationStorageDto;
+import com.upyuns.platform.rs.website.dto.ImageStorageImgDto;
 import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -214,4 +216,33 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 		return mapper.selectByExample(example);
 	}
 
+	/**
+	 * 批量更新或者批量删除
+	 * @param imageStorageImgDto
+	 * @return
+	 */
+	public ObjectRestResponse updateBatch(ImageStorageImgDto imageStorageImgDto) {
+		if (imageStorageImgDto == null || StringUtils.isBlank(imageStorageImgDto.getIds())) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		String[] arr = imageStorageImgDto.getIds().split(",");
+		if (arr != null) {
+			Example example = new Example(ImageImgStorage.class);
+			example.createCriteria().andIn("id", Arrays.asList(arr)).andEqualTo("isDel", 0);
+			List<ImageImgStorage> imageImgStorageList = mapper.selectByExample(example);
+			if (imageImgStorageList != null && imageImgStorageList.size() > 0) {
+				imageImgStorageList.parallelStream().forEach(imageImgStorage -> {
+					if (imageStorageImgDto.getStatus() != null) {
+						imageImgStorage.setStatus(imageStorageImgDto.getStatus());
+					}
+					if (imageStorageImgDto.getIsDel() != null) {
+						imageImgStorage.setIsDel(imageStorageImgDto.getIsDel());
+					}
+				});
+				mapper.batchSave(imageImgStorageList);
+			}
+		}
+		return ObjectRestResponse.succ();
+	}
+
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
 import com.upyuns.platform.rs.website.dto.ImageInformationDto;
 import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
+import com.upyuns.platform.rs.website.dto.ImageStorageImgDto;
 import com.upyuns.platform.rs.website.entity.ImageImgStorage;
 import com.upyuns.platform.rs.website.entity.ImageInformation;
 import org.springframework.web.bind.annotation.*;
@@ -33,4 +34,9 @@ public class ImageImgStorageController extends BaseController<ImageImgStorageBiz
 	public ObjectRestResponse updateStatus(@RequestBody ImageImgStorage imageImgStorage) {
 		return baseBiz.updateStatus(imageImgStorage);
 	}
+
+	@PostMapping(value = "updateBatch")
+	public ObjectRestResponse updateBatch(@RequestBody ImageStorageImgDto imageStorageImgDto) {
+		return baseBiz.updateBatch(imageStorageImgDto);
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/ImageImgStorageMapper.java

@@ -3,6 +3,8 @@ package com.upyuns.platform.rs.website.mapper;
 import com.upyuns.platform.rs.website.entity.ImageImgStorage;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 影像图库
  * 
@@ -11,5 +13,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2020-11-28 14:15:32
  */
 public interface ImageImgStorageMapper extends Mapper<ImageImgStorage> {
-	
+	void batchSave(List<ImageImgStorage> list);
 }

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

@@ -2,5 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.upyuns.platform.rs.website.mapper.ImageImgStorageMapper">
+    <insert id="batchSave" parameterType="list">
+        insert into image_img_storage (id, is_del,status)
+        VALUES
+        <foreach collection="list" item="emp" index="index" separator=",">
+            (
+            #{emp.id, jdbcType=INTEGER},
+            #{emp.isDel,jdbcType=INTEGER},
+            #{emp.status,jdbcType=INTEGER})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        is_del = values(is_del),
+        status = values(amount)
+    </insert>
 
 </mapper>
\ No newline at end of file