修改分页问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/BomanMaterialController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.material;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -90,7 +92,16 @@ public class BomanMaterialController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BomanMaterial bomanMaterial)
     {
-        return toAjax(bomanMaterialService.insertBomanMaterial(bomanMaterial));
+        List<BomanMaterial> bomanMaterialList = bomanMaterial.getBomanMaterialList();
+        if (bomanMaterialList != null && bomanMaterialList.size() > 0){
+            for (BomanMaterial material : bomanMaterialList) {
+                material.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+                material.setKeywords(bomanMaterial.getKeywords());
+                material.setReleaseTime(bomanMaterial.getReleaseTime());
+                material.setType(bomanMaterial.getType());
+            }
+        }
+        return toAjax(bomanMaterialService.insertBomanMaterial(bomanMaterialList));
     }
 
     /**
@@ -98,7 +109,7 @@ public class BomanMaterialController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:material:edit')")
     @Log(title = "素材库", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody BomanMaterial bomanMaterial)
     {
         return toAjax(bomanMaterialService.updateBomanMaterial(bomanMaterial));
@@ -109,7 +120,7 @@ public class BomanMaterialController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:material:remove')")
     @Log(title = "素材库", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{materialIds}")
+	@GetMapping("/delete/{materialIds}")
     public AjaxResult remove(@PathVariable Long[] materialIds)
     {
         return toAjax(bomanMaterialService.deleteBomanMaterialByMaterialIds(materialIds));

ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanMaterial.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -42,8 +44,17 @@ public class BomanMaterial extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date releaseTime;
+    private List<BomanMaterial> bomanMaterialList;
+
+    public List<BomanMaterial> getBomanMaterialList() {
+        return bomanMaterialList;
+    }
+
+    public void setBomanMaterialList(List<BomanMaterial> bomanMaterialList) {
+        this.bomanMaterialList = bomanMaterialList;
+    }
 
-    public void setMaterialId(Long materialId) 
+    public void setMaterialId(Long materialId)
     {
         this.materialId = materialId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BomanMaterialMapper.java

@@ -58,4 +58,6 @@ public interface BomanMaterialMapper
      * @return 结果
      */
     public int deleteBomanMaterialByMaterialIds(Long[] materialIds);
+
+    public int batchBomanMaterial(List<BomanMaterial> bomanMaterial);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBomanMaterialService.java

@@ -33,7 +33,7 @@ public interface IBomanMaterialService
      * @param bomanMaterial 素材库
      * @return 结果
      */
-    public int insertBomanMaterial(BomanMaterial bomanMaterial);
+    public int insertBomanMaterial(List<BomanMaterial> bomanMaterial);
 
     /**
      * 修改素材库

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanMaterialServiceImpl.java

@@ -46,15 +46,15 @@ public class BomanMaterialServiceImpl implements IBomanMaterialService
 
     /**
      * 新增素材库
-     * 
+     *
      * @param bomanMaterial 素材库
      * @return 结果
      */
     @Override
-    public int insertBomanMaterial(BomanMaterial bomanMaterial)
+    public int insertBomanMaterial(List<BomanMaterial> bomanMaterial)
     {
-        bomanMaterial.setCreateTime(DateUtils.getNowDate());
-        return bomanMaterialMapper.insertBomanMaterial(bomanMaterial);
+
+        return bomanMaterialMapper.batchBomanMaterial(bomanMaterial);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InvestigateTableServiceImpl.java

@@ -2,10 +2,8 @@ package com.ruoyi.system.service.impl;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.aliyun.dysmsapi20170525.models.SendBatchSmsRequest;
@@ -109,6 +107,7 @@ public class InvestigateTableServiceImpl implements IInvestigateTableService {
                     table.setType("已结束");
                 }
             }
+            investigateTablesAll = investigateTablesAll.stream().sorted(Comparator.comparing(InvestigateTable::getCreateTime).reversed()).collect(Collectors.toList());
         }
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);

ruoyi-system/src/main/resources/mapper/system/BomanMaterialMapper.xml

@@ -92,4 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{materialId}
         </foreach>
     </delete>
+
+    <insert id="batchBomanMaterial">
+        insert into boman_material(material_url, material_name,type,keywords,is_lunbo,release_time,create_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.materialUrl},#{item.materialName},#{item.type},#{item.keywords},#{item.isLunbo},#{item.releaseTime},sysdate())
+        </foreach>
+    </insert>
 </mapper>