凯和修改商务端文件上传

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -238,14 +238,14 @@ public class KHTWarehousebillsController extends BaseController
         List<Map<String, Object>> goodName = itGoodsService.getGoodName();
         return AjaxResult.success(goodName);
     }
-    @Log(title = "凯和网页版订单查询详情", businessType = BusinessType.DELETE)
+   // @Log(title = "凯和网页版订单查询详情", businessType = BusinessType.DELETE)
     @PostMapping("/webVersionOrder")
     public TableDataInfo webVersionOrder(@RequestBody(required = false) TWarehouseBills tWarehouseBills){
         startPage();
         List<TWarehouseBills> warehouseBills = tWarehousebillsService.webVersionOrder(tWarehouseBills);
         return getDataTable(warehouseBills);
     }
-    @Log(title = "凯和网页版订单查询", businessType = BusinessType.DELETE)
+    //@Log(title = "凯和网页版订单查询", businessType = BusinessType.DELETE)
     @GetMapping("/webVersionOrderMessage")
     public TableDataInfo webVersionOrderMessage(TWarehouseBills tWarehouseBills){
         startPage();
@@ -253,7 +253,7 @@ public class KHTWarehousebillsController extends BaseController
         List<Map<String,Object>> warehouseBills = tWarehousebillsService.webVersionOrderMessage(loginUser,tWarehouseBills);
         return getDataTable(warehouseBills);
     }
-    @PreAuthorize("@ss.hasPermi('warehouse:warehousebills:ruoYiVersionOrderList')")
+    //@PreAuthorize("@ss.hasPermi('warehouse:warehousebills:ruoYiVersionOrderList')")
     @Log(title = "凯和若依订单查询", businessType = BusinessType.DELETE)
     @GetMapping("/ruoYiVersionOrderList")
     public TableDataInfo ruoYiVersionOrderList(TWarehouseBills tWarehouseBills){
@@ -262,7 +262,7 @@ public class KHTWarehousebillsController extends BaseController
         List<Map<String,Object>> warehouseBills = tWarehousebillsService.ruoYiVersionOrderList(loginUser,tWarehouseBills);
         return getDataTable(warehouseBills);
     }
-    @PreAuthorize("@ss.hasPermi('warehouse:warehousebills:webVersionOrderDetails')")
+    //@PreAuthorize("@ss.hasPermi('warehouse:warehousebills:webVersionOrderDetails')")
     @Log(title = "凯和若依订单详情", businessType = BusinessType.DELETE)
     @PostMapping("/webVersionOrderDetails")
     public TableDataInfo webVersionOrderDetails(@RequestBody TWarehouseBills tWarehouseBills){

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TTemporaryFileController.java

@@ -44,17 +44,17 @@ public class TTemporaryFileController extends BaseController
      */
     //@PreAuthorize("@ss.hasPermi('warehouse:file:list')")
     @GetMapping("/list")
-    public AjaxResult list(TTemporaryFile tTemporaryFile)
+    public TableDataInfo list(TTemporaryFile tTemporaryFile)
     {
-        if ("".equals(tTemporaryFile.getFileName()) || "null".equals(tTemporaryFile.getFileName())){
-            return AjaxResult.error("文件名不能为空");
-        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         tTemporaryFile.setCreateBy(loginUser.getUser().getUserName());
-        //startPage();
-        List<TTemporaryFile> list = tTemporaryFileService.selectTTemporaryFileList(tTemporaryFile);
-        //return getDataTable(list);
-        return AjaxResult.success(list);
+        List<TTemporaryFile> temporaryFileList = tTemporaryFileService.selectTTemporaryFileList(tTemporaryFile,loginUser);
+        startPage();
+        List<TTemporaryFile> list = tTemporaryFileService.selectTTemporaryFileList(tTemporaryFile,loginUser);
+        TableDataInfo dataTable = getDataTable(list);
+        dataTable.setTotal(temporaryFileList.size());
+        return dataTable;
+        //return AjaxResult.success(list);
     }
 
     /**
@@ -65,7 +65,8 @@ public class TTemporaryFileController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TTemporaryFile tTemporaryFile)
     {
-        List<TTemporaryFile> list = tTemporaryFileService.selectTTemporaryFileList(tTemporaryFile);
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        List<TTemporaryFile> list = tTemporaryFileService.selectTTemporaryFileList(tTemporaryFile,loginUser);
         ExcelUtil<TTemporaryFile> util = new ExcelUtil<TTemporaryFile>(TTemporaryFile.class);
         return util.exportExcel(list, "file");
     }
@@ -88,7 +89,8 @@ public class TTemporaryFileController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TTemporaryFile tTemporaryFile)
     {
-        return toAjax(tTemporaryFileService.insertTTemporaryFile(tTemporaryFile));
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return toAjax(tTemporaryFileService.insertTTemporaryFile(tTemporaryFile,loginUser));
     }
 
     /**
@@ -105,11 +107,12 @@ public class TTemporaryFileController extends BaseController
     /**
      * 删除凯和商务端上传箱信息暂存数据
      */
-    @PreAuthorize("@ss.hasPermi('warehouse:file:remove')")
+    //@PreAuthorize("@ss.hasPermi('warehouse:file:remove')")
     @Log(title = "凯和商务端上传箱信息暂存数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fIds}")
-    public AjaxResult remove(@PathVariable Long[] fIds)
+	@DeleteMapping("/delete/{fileName}")
+    public AjaxResult remove(@PathVariable String fileName)
     {
-        return toAjax(tTemporaryFileService.deleteTTemporaryFileByIds(fIds));
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return toAjax(tTemporaryFileService.deleteTTemporaryFilefileName(fileName,loginUser.getUser().getUserName()));
     }
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TTemporaryFile.java

@@ -1,6 +1,8 @@
 package com.ruoyi.shipping.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -58,8 +60,18 @@ public class TTemporaryFile extends BaseEntity
     /** 文件名 */
     @Excel(name = "文件名")
     private String fileName;
+    //存已有数据
+    private String tTemporaryFileList;
+
+    public String gettTemporaryFileList() {
+        return tTemporaryFileList;
+    }
+
+    public void settTemporaryFileList(String tTemporaryFileList) {
+        this.tTemporaryFileList = tTemporaryFileList;
+    }
 
-    public void setfId(Long fId) 
+    public void setfId(Long fId)
     {
         this.fId = fId;
     }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TTemporaryFileMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.shipping.mapper;
 
 import com.ruoyi.shipping.domain.TTemporaryFile;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -64,7 +66,7 @@ public interface TTemporaryFileMapper
      * @param fileName
      * @return
      */
-    public int deleteTTemporaryFilefileName(String fileName);
+    public int deleteTTemporaryFilefileName(@Param("fileName") String fileName, @Param("createBy")String createBy);
 
     /**
      * 批量删除凯和商务端上传箱信息暂存数据

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITTemporaryFileService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.shipping.service;
 
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.shipping.domain.TTemporaryFile;
 
 import java.util.List;
@@ -26,7 +27,7 @@ public interface ITTemporaryFileService
      * @param tTemporaryFile 凯和商务端上传箱信息暂存数据
      * @return 凯和商务端上传箱信息暂存数据集合
      */
-    public List<TTemporaryFile> selectTTemporaryFileList(TTemporaryFile tTemporaryFile);
+    public List<TTemporaryFile> selectTTemporaryFileList(TTemporaryFile tTemporaryFile,LoginUser loginUser);
 
     /**
      * 新增凯和商务端上传箱信息暂存数据
@@ -34,7 +35,7 @@ public interface ITTemporaryFileService
      * @param tTemporaryFile 凯和商务端上传箱信息暂存数据
      * @return 结果
      */
-    public int insertTTemporaryFile(TTemporaryFile tTemporaryFile);
+    public int insertTTemporaryFile(TTemporaryFile tTemporaryFile,LoginUser loginUser);
 
     /**
      * 修改凯和商务端上传箱信息暂存数据
@@ -59,4 +60,10 @@ public interface ITTemporaryFileService
      * @return 结果
      */
     public int deleteTTemporaryFileById(Long fId);
+    /**
+     * 根据文件名删除暂存数据
+     * @param fileName
+     * @return
+     */
+    public int deleteTTemporaryFilefileName(String fileName,String createBy);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TTemporaryFileServiceImpl.java

@@ -1,8 +1,13 @@
 package com.ruoyi.shipping.service.impl;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.shipping.domain.TTemporaryFile;
 import com.ruoyi.shipping.mapper.TTemporaryFileMapper;
 import com.ruoyi.shipping.service.ITTemporaryFileService;
@@ -40,13 +45,24 @@ public class TTemporaryFileServiceImpl implements ITTemporaryFileService
      * @return 凯和商务端上传箱信息暂存数据
      */
     @Override
-    public List<TTemporaryFile> selectTTemporaryFileList(TTemporaryFile tTemporaryFile)
+    public List<TTemporaryFile> selectTTemporaryFileList(TTemporaryFile tTemporaryFile,LoginUser loginUser)
     {
-        List<TTemporaryFile> tTemporaryFiles = tTemporaryFileMapper.selectTTemporaryFileMessage(tTemporaryFile);
-        if (CollectionUtils.isNotEmpty(tTemporaryFiles)){
-            int i = tTemporaryFileMapper.deleteTTemporaryFilefileName(tTemporaryFile.getFileName());
-        }
-        return tTemporaryFiles;
+        List<TTemporaryFile> tTemporaryFiles = new ArrayList<>();
+        tTemporaryFiles = tTemporaryFileMapper.selectTTemporaryFileMessage(tTemporaryFile);
+        /*if (StringUtils.isNotEmpty(tTemporaryFile.gettTemporaryFileList()) && !"[]".equals(tTemporaryFile.gettTemporaryFileList())){
+            JSONArray jsonCrArray = JSONArray.parseArray(tTemporaryFile.gettTemporaryFileList());
+            List<TTemporaryFile> fileList = JSONObject.parseArray(jsonCrArray.toJSONString(), TTemporaryFile.class);
+            if (CollectionUtils.isNotEmpty(fileList)){
+                for (TTemporaryFile temporaryFile : fileList) {
+                    temporaryFile.setCreateBy(loginUser.getUser().getUserName());
+                    temporaryFile.setCreateTime(new Date());
+                    tTemporaryFileMapper.insertTTemporaryFile(tTemporaryFile);
+                }
+            }*/
+            ArrayList<TTemporaryFile> collect = tTemporaryFiles.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TTemporaryFile -> TTemporaryFile.getfCntrno()
+            ))), ArrayList::new));
+        /*}*/
+        return collect;
     }
 
     /**
@@ -56,9 +72,21 @@ public class TTemporaryFileServiceImpl implements ITTemporaryFileService
      * @return 结果
      */
     @Override
-    public int insertTTemporaryFile(TTemporaryFile tTemporaryFile)
+    public int insertTTemporaryFile(TTemporaryFile tTemporaryFile,LoginUser loginUser)
     {
-        return tTemporaryFileMapper.insertTTemporaryFile(tTemporaryFile);
+        int i = 0;
+        if (StringUtils.isNotEmpty(tTemporaryFile.gettTemporaryFileList()) && !"[]".equals(tTemporaryFile.gettTemporaryFileList())) {
+            JSONArray jsonCrArray = JSONArray.parseArray(tTemporaryFile.gettTemporaryFileList());
+            List<TTemporaryFile> fileList = JSONObject.parseArray(jsonCrArray.toJSONString(), TTemporaryFile.class);
+            if (CollectionUtils.isNotEmpty(fileList)) {
+                for (TTemporaryFile temporaryFile : fileList) {
+                    temporaryFile.setCreateBy(loginUser.getUser().getUserName());
+                    temporaryFile.setCreateTime(new Date());
+                    i = tTemporaryFileMapper.insertTTemporaryFile(tTemporaryFile);
+                }
+            }
+        }
+        return i;
     }
 
     /**
@@ -96,4 +124,9 @@ public class TTemporaryFileServiceImpl implements ITTemporaryFileService
     {
         return tTemporaryFileMapper.deleteTTemporaryFileById(fId);
     }
+
+    @Override
+    public int deleteTTemporaryFilefileName(String fileName,String createBy) {
+        return tTemporaryFileMapper.deleteTTemporaryFilefileName(fileName,createBy);
+    }
 }

ruoyi-shipping/src/main/resources/mapper/shipping/TTemporaryFileMapper.xml

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_temporary_file where f_id = #{fId}
     </delete>
     <delete id="deleteTTemporaryFilefileName" parameterType="string">
-        delete from t_temporary_file where file_name = #{fileName}
+        delete from t_temporary_file where file_name = #{fileName} and create_by = #{createBy}
     </delete>
 
     <delete id="deleteTTemporaryFileByIds" parameterType="String">
@@ -158,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileName != null  and fileName != ''"> and tf.file_name = #{fileName}</if>
             <if test="createBy != null  and createBy != ''">and tf.create_by = #{createBy}</if>
         </where>
+        ORDER BY tf.f_cntrno
     </select>
     
 </mapper>