init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysFileController.java

@@ -1,4 +1,3 @@
-
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -11,12 +10,18 @@ import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 文件管理
@@ -30,69 +35,72 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/sys-file")
 public class SysFileController {
 
-	private final SysFileService sysFileService;
-	private final RedisTemplate<String,String> redisTemplate;
+    private final SysFileService sysFileService;
 
-	/**
-	 * 分页查询
-	 * @param page 分页对象
-	 * @param sysFile 文件管理
-	 * @return
-	 */
-	@GetMapping("/page")
-	public R getSysFilePage(Page page, SysFile sysFile) {
-		OrderItem orderItem=new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
-		return R.ok(sysFileService.page(page, Wrappers.query(sysFile)));
-	}
+    /**
+     * 分页查询
+     *
+     * @param page    分页对象
+     * @param sysFile 文件管理
+     * @return 分页结果
+     */
+    @GetMapping("/page")
+    public R<Page<SysFile>> getSysFilePage(Page<SysFile> page, SysFile sysFile) {
+        OrderItem orderItem = new OrderItem();
+        orderItem.setColumn("create_time");
+        orderItem.setAsc(false);
+        page.addOrder(orderItem);
+        return R.ok(sysFileService.page(page, Wrappers.query(sysFile)));
+    }
 
-	/**
-	 * 通过id删除文件管理
-	 * @param id id
-	 * @return R
-	 */
-	@SysLog("删除文件管理")
-	@DeleteMapping("/{id}")
-	@PreAuthorize("@pms.hasPermission('sys_file_del')")
-	public R removeById(@PathVariable Long id) {
-		return R.ok(sysFileService.deleteFile(id));
-	}
+    /**
+     * 通过id删除文件管理
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("删除文件管理")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sys_file_del')")
+    public R<Boolean> removeById(@PathVariable Long id) {
+        return R.ok(sysFileService.deleteFile(id));
+    }
 
-	/**
-	 * 上传文件 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
-	 * @param file 资源
-	 * @return R(/ admin / bucketName / filename)
-	 */
-	@PostMapping("/upload")
-	public R upload(@RequestParam("file") MultipartFile file) {
+    /**
+     * 上传文件 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
+     *
+     * @param file 资源
+     * @return R(/ admin / bucketName / filename)
+     */
+    @PostMapping("/upload")
+    public R<Map<String, String>> upload(@RequestParam("file") MultipartFile file) {
 
-		return sysFileService.uploadFile(file);
-	}
+        return sysFileService.uploadFile(file);
+    }
 
 
-	/**
-	 * 上传文件 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
-	 * @param file 资源
-	 * @return R(/ admin / bucketName / filename)
-	 */
-	@PostMapping("/uploadAllUrl")
-	public R uploadAllUrl(@RequestParam("file") MultipartFile file) {
-		return sysFileService.uploadFileAllUrl(file);
-	}
+    /**
+     * 上传文件 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
+     *
+     * @param file 资源
+     * @return R(/ admin / bucketName / filename)
+     */
+    @PostMapping("/uploadAllUrl")
+    public R uploadAllUrl(@RequestParam("file") MultipartFile file) {
+        return sysFileService.uploadFileAllUrl(file);
+    }
 
-	/**
-	 * 获取文件
-	 * @param bucket 桶名称
-	 * @param fileName 文件空间/名称
-	 * @param response
-	 * @return
-	 */
-	@Inner(false)
-	@GetMapping("/{bucket}/{fileName}")
-	public void file(@PathVariable String bucket, @PathVariable String fileName, HttpServletResponse response) {
-		sysFileService.getFile(bucket, fileName, response);
-	}
+    /**
+     * 获取文件
+     *
+     * @param bucket   桶名称
+     * @param fileName 文件空间/名称
+     * @param response 响应信息
+     */
+    @Inner(false)
+    @GetMapping("/{bucket}/{fileName}")
+    public void file(@PathVariable String bucket, @PathVariable String fileName, HttpServletResponse response) {
+        sysFileService.getFile(bucket, fileName, response);
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -693,7 +693,7 @@ public class WmDaAgentController {
      * @return 分页
      */
     @GetMapping("/page1")
-    public R<?> getWmDaAgentPage1(Page page, WmDaAgent wmDaAgent) {
+    public R<Page<WmDaAgent>> getWmDaAgentPage1(Page<WmDaAgent> page, WmDaAgent wmDaAgent) {
         if (SecurityUtils.getRoles().contains(19)) {
             // CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
             Integer userId = SecurityUtils.getUser().getId();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmDaAgentMapper.java

@@ -35,7 +35,7 @@ public interface WmDaAgentMapper extends DataScopeMapper<WmDaAgent> {
 
     List selectEntNameByDrugId(Integer id);
 
-    IPage<WmDaAgent> selectWmManagementPage(Page page, @Param("query") WmDaAgent wmDaAgent);
+    Page<WmDaAgent> selectWmManagementPage(Page<WmDaAgent> page, @Param("query") WmDaAgent wmDaAgent);
 
     List<WmDaAgent> selectWmManagementList(@Param("query") WmDaAgent wmDaAgent);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysFileService.java

@@ -9,6 +9,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.Map;
 
 /**
  * 文件管理
@@ -18,39 +19,43 @@ import java.io.InputStream;
  */
 public interface SysFileService extends IService<SysFile> {
 
-	/**
-	 * 上传文件
-	 * @param file
-	 * @return
-	 */
-	R uploadFile(MultipartFile file);
-
-	/**
-	 * 上传文件
-	 * @param file
-	 * @return
-	 */
-	R uploadFileAllUrl(MultipartFile file);
-
-	R uploadFileAllUrlRealName(MultipartFile file) ;
-
-	R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io);
-
-	/**
-	 * 读取文件
-	 * @param bucket 桶名称
-	 * @param fileName 文件名称
-	 * @param response 输出流
-	 */
-	void getFile(String bucket, String fileName, HttpServletResponse response);
-
-	/**
-	 * 删除文件
-	 * @param id
-	 * @return
-	 */
-	Boolean deleteFile(Long id);
-
-	public String uploadImgByByte(InputStream inputStream);
+    /**
+     * 上传文件
+     *
+     * @param file 文件
+     * @return 上传结果
+     */
+    R<Map<String, String>> uploadFile(MultipartFile file);
+
+    /**
+     * 上传文件
+     *
+     * @param file
+     * @return
+     */
+    R uploadFileAllUrl(MultipartFile file);
+
+    R uploadFileAllUrlRealName(MultipartFile file);
+
+    R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io);
+
+    /**
+     * 读取文件
+     *
+     * @param bucket   桶名称
+     * @param fileName 文件名称
+     * @param response 输出流
+     */
+    void getFile(String bucket, String fileName, HttpServletResponse response);
+
+    /**
+     * 删除文件
+     *
+     * @param id
+     * @return
+     */
+    Boolean deleteFile(Long id);
+
+    public String uploadImgByByte(InputStream inputStream);
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaAgentService.java

@@ -36,7 +36,7 @@ public interface WmDaAgentService extends IService<WmDaAgent> {
 	int updateUserByDeptId(WmDaAgent wmDaAgent);
 
 
-	IPage<WmDaAgent> selectWmManagementList(Page page, @Param("query")WmDaAgent wmDaAgent);
+	Page<WmDaAgent> selectWmManagementList(Page<WmDaAgent> page, @Param("query")WmDaAgent wmDaAgent);
 
 	R insert(WmDaAgent wmDaAgent);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysAreaEntityServiceImpl.java

@@ -57,7 +57,7 @@ public class SysAreaEntityServiceImpl extends ServiceImpl<SysAreaEntityMapper, S
             nodeList.add(treeNode);
         }
 
-        return TreeUtil.build(nodeList, 0L);
+        return TreeUtil.build(nodeList, -1L);
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysFileServiceImpl.java

@@ -1,6 +1,6 @@
-
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
@@ -22,10 +22,12 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -41,202 +43,202 @@ import java.util.Map;
 @AllArgsConstructor
 public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> implements SysFileService {
 
-	private final OssProperties ossProperties;
+    private final OssProperties ossProperties;
 
-	private final OssTemplate minioTemplate;
+    private final OssTemplate minioTemplate;
 
-	private final UpmsConfig upmsConfig;
+    private final UpmsConfig upmsConfig;
 
-	/**
-	 * 上传文件
-	 * @param file
-	 * @return
-	 */
-	@Override
-	public R uploadFile(MultipartFile file) {
+    /**
+     * 上传文件
+     *
+     * @param file 文件
+     * @return 上传结果
+     */
+    @Override
+    public R<Map<String, String>> uploadFile(MultipartFile file) {
 
-		// 判断是否有重名的操作
+        // 判断是否有重名的操作
 
 
-		String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
-		Map<String, String> resultMap = new HashMap<>(4);
-		resultMap.put("bucketName", ossProperties.getBucketName());
-		resultMap.put("fileName", fileName);
-		resultMap.put("url", String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
+        String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", DateTimeFormatter.ofPattern(DatePattern.PURE_DATE_PATTERN).format(LocalDateTime.now()) + File.separator + fileName);
+        resultMap.put("url", String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
 
-		try {
-			minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
-			// 文件管理数据记录,收集管理追踪文件
-			SysFile sysFile = fileLog(file, fileName);
-			resultMap.put("fileId", String.valueOf(sysFile.getId()));
+        try {
+            minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
+            // 文件管理数据记录,收集管理追踪文件
+            SysFile sysFile = fileLog(file, fileName);
+            resultMap.put("fileId", String.valueOf(sysFile.getId()));
 
-		}
-		catch (Exception e) {
-			log.error("上传失败", e);
-			return R.failed(e.getLocalizedMessage());
-		}
-		return R.ok(resultMap);
-	}
+        } catch (Exception e) {
+            log.error("上传失败", e);
+            return R.failed(e.getLocalizedMessage());
+        }
+        return R.ok(resultMap);
+    }
 
 
-	/**
-	 * 上传文件
-	 * @param file
-	 * @return
-	 */
-	@Override
-	public R uploadFileAllUrl(MultipartFile file) {
+    /**
+     * 上传文件
+     *
+     * @param file
+     * @return
+     */
+    @Override
+    public R uploadFileAllUrl(MultipartFile file) {
 //		String basePath="https://beijingc.yaoyi.net";
-		String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
-		Map<String, String> resultMap = new HashMap<>(4);
-		resultMap.put("bucketName", ossProperties.getBucketName());
-		resultMap.put("fileName", fileName);
-		resultMap.put("url", upmsConfig.getClientUrl()+String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
-
-		try {
-			minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
-			// 文件管理数据记录,收集管理追踪文件
-			fileLog(file, fileName);
-		}
-		catch (Exception e) {
-			log.error("上传失败", e);
-			return R.failed(e.getLocalizedMessage());
-		}
-		return R.ok(resultMap);
-	}
-
-
-	/**
-	 * 上传文件
-	 * @param file
-	 * @return
-	 */
-	@Override
-	public R uploadFileAllUrlRealName(MultipartFile file) {
+        String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", fileName);
+        resultMap.put("url", upmsConfig.getClientUrl() + String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
+
+        try {
+            minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
+            // 文件管理数据记录,收集管理追踪文件
+            fileLog(file, fileName);
+        } catch (Exception e) {
+            log.error("上传失败", e);
+            return R.failed(e.getLocalizedMessage());
+        }
+        return R.ok(resultMap);
+    }
+
+
+    /**
+     * 上传文件
+     *
+     * @param file
+     * @return
+     */
+    @Override
+    public R uploadFileAllUrlRealName(MultipartFile file) {
 //		String basePath="https://beijingc.yaoyi.net";
-		Date  date=new Date();
-		SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
-		String idStr=format.format(date);
-		String fileName =FileUtil.getName(file.getName())+"-"+ idStr + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
-		Map<String, String> resultMap = new HashMap<>(4);
-		resultMap.put("bucketName", ossProperties.getBucketName());
-		resultMap.put("fileName", fileName);
-		resultMap.put("url", upmsConfig.getClientUrl()+String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
-
-		try {
-			minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
-			// 文件管理数据记录,收集管理追踪文件
-			fileLog(file, fileName);
-		}
-		catch (Exception e) {
-			log.error("上传失败", e);
-			return R.failed(e.getLocalizedMessage());
-		}
-		return R.ok(resultMap);
-	}
-
-
-	/**
-	 * 上传文件
-	 * @return
-	 */
-	@Override
-	public R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io) {
-
-		Date  date=new Date();
-		SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
-		String idStr=format.format(date);
-
-		fileName = String.format("%s-%s.%s",fileName,idStr,suffix);
-
-		Map<String, String> resultMap = new HashMap<>(4);
-		resultMap.put("bucketName", ossProperties.getBucketName());
-		resultMap.put("fileName", fileName);
-		resultMap.put("url", String.format("%s/admin/sys-file/%s/%s",upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
-
-		try {
-			minioTemplate.putObject(ossProperties.getBucketName(), fileName, io);
-		}
-		catch (Exception e) {
-			log.error("上传失败", e);
-			return R.failed(e.getLocalizedMessage());
-		}
-		return R.ok(resultMap);
-	}
-
-	/**
-	 * 读取文件
-	 * @param bucket
-	 * @param fileName
-	 * @param response
-	 */
-	@Override
-	public void getFile(String bucket, String fileName, HttpServletResponse response) {
-		try (InputStream inputStream = minioTemplate.getObject(bucket, fileName)) {
-			response.setContentType("application/octet-stream; charset=UTF-8");
-			IoUtil.copy(inputStream, response.getOutputStream());
-		}
-		catch (Exception e) {
-			log.error("文件读取异常: {}", e.getLocalizedMessage());
-		}
-	}
-
-	/**
-	 * 删除文件
-	 * @param id
-	 * @return
-	 */
-	@Override
-	@SneakyThrows
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean deleteFile(Long id) {
-		SysFile file = this.getById(id);
-		minioTemplate.removeObject(ossProperties.getBucketName(), file.getFileName());
-		return this.removeById(id);
-	}
-
-	/**
-	 * 文件管理数据记录,收集管理追踪文件
-	 * @param file 上传文件格式
-	 * @param fileName 文件名
-	 */
-	private SysFile fileLog(MultipartFile file, String fileName) {
-		SysFile sysFile = new SysFile();
-		// 原文件名
-		String original = file.getOriginalFilename();
-		sysFile.setFileName(fileName);
-		sysFile.setOriginal(original);
-		sysFile.setFileSize(file.getSize());
-		sysFile.setType(FileUtil.extName(original));
-		sysFile.setBucketName(ossProperties.getBucketName());
-		if(null!=SecurityUtils.getUser())
-		{
-			sysFile.setCreateUser(SecurityUtils.getUser().getUsername());
-		}
-		this.save(sysFile);
-		return sysFile;
-	}
-
-
-	@Override
-	public String uploadImgByByte(InputStream inputStream) {
-		String fileName = IdUtil.simpleUUID() + StrUtil.DOT + ".jpg";
-		Map<String, String> resultMap = new HashMap<>(4);
-		resultMap.put("bucketName", ossProperties.getBucketName());
-		resultMap.put("fileName", fileName);
-		resultMap.put("url", String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
-
-		try {
-			minioTemplate.putObject(ossProperties.getBucketName(), fileName, inputStream);
-			// 文件管理数据记录,收集管理追踪文件
-			//fileLog(file, fileName);
-			return String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName);
-		}
-		catch (Exception e) {
-			log.error("上传失败", e);
-		}
-
-		return null;
-	}
+        Date date = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+        String idStr = format.format(date);
+        String fileName = FileUtil.getName(file.getName()) + "-" + idStr + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", fileName);
+        resultMap.put("url", upmsConfig.getClientUrl() + String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
+
+        try {
+            minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
+            // 文件管理数据记录,收集管理追踪文件
+            fileLog(file, fileName);
+        } catch (Exception e) {
+            log.error("上传失败", e);
+            return R.failed(e.getLocalizedMessage());
+        }
+        return R.ok(resultMap);
+    }
+
+
+    /**
+     * 上传文件
+     *
+     * @return
+     */
+    @Override
+    public R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io) {
+
+        Date date = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+        String idStr = format.format(date);
+
+        fileName = String.format("%s-%s.%s", fileName, idStr, suffix);
+
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", fileName);
+        resultMap.put("url", String.format("%s/admin/sys-file/%s/%s", upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
+
+        try {
+            minioTemplate.putObject(ossProperties.getBucketName(), fileName, io);
+        } catch (Exception e) {
+            log.error("上传失败", e);
+            return R.failed(e.getLocalizedMessage());
+        }
+        return R.ok(resultMap);
+    }
+
+    /**
+     * 读取文件
+     *
+     * @param bucket
+     * @param fileName
+     * @param response
+     */
+    @Override
+    public void getFile(String bucket, String fileName, HttpServletResponse response) {
+        try (InputStream inputStream = minioTemplate.getObject(bucket, fileName)) {
+            response.setContentType("application/octet-stream; charset=UTF-8");
+            IoUtil.copy(inputStream, response.getOutputStream());
+        } catch (Exception e) {
+            log.error("文件读取异常: {}", e.getLocalizedMessage());
+        }
+    }
+
+    /**
+     * 删除文件
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteFile(Long id) {
+        SysFile file = this.getById(id);
+        minioTemplate.removeObject(ossProperties.getBucketName(), file.getFileName());
+        return this.removeById(id);
+    }
+
+    /**
+     * 文件管理数据记录,收集管理追踪文件
+     *
+     * @param file     上传文件格式
+     * @param fileName 文件名
+     */
+    private SysFile fileLog(MultipartFile file, String fileName) {
+        SysFile sysFile = new SysFile();
+        // 原文件名
+        String original = file.getOriginalFilename();
+        sysFile.setFileName(fileName);
+        sysFile.setOriginal(original);
+        sysFile.setFileSize(file.getSize());
+        sysFile.setType(FileUtil.extName(original));
+        sysFile.setBucketName(ossProperties.getBucketName());
+        if (null != SecurityUtils.getUser()) {
+            sysFile.setCreateUser(SecurityUtils.getUser().getUsername());
+        }
+        this.save(sysFile);
+        return sysFile;
+    }
+
+
+    @Override
+    public String uploadImgByByte(InputStream inputStream) {
+        String fileName = IdUtil.simpleUUID() + StrUtil.DOT + ".jpg";
+        Map<String, String> resultMap = new HashMap<>(4);
+        resultMap.put("bucketName", ossProperties.getBucketName());
+        resultMap.put("fileName", fileName);
+        resultMap.put("url", String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName));
+
+        try {
+            minioTemplate.putObject(ossProperties.getBucketName(), fileName, inputStream);
+            // 文件管理数据记录,收集管理追踪文件
+            //fileLog(file, fileName);
+            return String.format("/admin/sys-file/%s/%s", ossProperties.getBucketName(), fileName);
+        } catch (Exception e) {
+            log.error("上传失败", e);
+        }
+
+        return null;
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -211,7 +211,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
     }
 
     @Override
-    public IPage selectWmManagementList(Page page, WmDaAgent wmDaAgent) {
+    public Page<WmDaAgent> selectWmManagementList(Page<WmDaAgent> page, WmDaAgent wmDaAgent) {
 
         QueryWrapper queryWrapper = Wrappers.query();
         if (null != wmDaAgent.getGsmc()) {
@@ -221,7 +221,16 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             queryWrapper.like("zjNamber", wmDaAgent.getZjNumber());
         }
 
-        return wmDaAgentMapper.selectWmManagementPage(page, wmDaAgent);
+        wmDaAgentMapper.selectWmManagementPage(page, wmDaAgent);
+
+        if (CollUtil.isNotEmpty(page.getRecords())){
+           page.getRecords().forEach(agent -> {
+               List<Long> areas = enterpriseAreaService.listEntAreas(Long.valueOf(agent.getDeptId()));
+               agent.setAreaCodes(areas);
+           });
+        }
+
+        return page;
     }
 
     @Override