添加

史料管理模块更新

gis_application/pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.gis</groupId>
     <artifactId>gis_application</artifactId>
     <version>1.0.0</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>gis_application</name>
     <description>项目入口</description>
 

gis_application/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=8001
+server.port=8009
 
 spring.profiles.active=dev
 

gis_domain/src/main/java/com/gis/domain/dto/MaterialDeteleDto.java

@@ -0,0 +1,19 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2021/6/3 0028 16:36
+ */
+@Data
+public class MaterialDeteleDto {
+
+
+    @NotBlank(message = "文件地址不能为空")
+    @ApiModelProperty(value = "文件地址", required = true)
+    private String path;
+
+}

gis_service/src/main/java/com/gis/service/aop/WebLogAspect.java

@@ -49,11 +49,7 @@ public class WebLogAspect {
         log.info("request Method:{}, IP:{}" , request.getMethod(),  request.getRemoteAddr());
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
 
-        // 获取token
-        String token = request.getHeader("token");
-        if (StringUtils.isBlank(token)) {
-            return;
-        }
+
 
         Map<String, Object> controllerLog = getControllerLog(joinPoint);
         if (controllerLog.size() == 0) {
@@ -64,6 +60,11 @@ public class WebLogAspect {
         boolean addDb = (boolean)controllerLog.get("addDb");
         log.info("request description:{}, addDb:{}", description, addDb);
 
+        // 获取token
+        String token = request.getHeader("token");
+        if (StringUtils.isBlank(token)) {
+            return;
+        }
 
         Long userId = null;
         if (StringUtils.isNotBlank(token)) {

gis_service/src/main/java/com/gis/service/impl/MaterialServiceImpl.java

@@ -24,6 +24,7 @@ import tk.mybatis.mapper.entity.Condition;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashMap;
 
 
 /**
@@ -59,7 +60,11 @@ public class MaterialServiceImpl extends IBaseServiceImpl<MaterialEntity, Long>
         try {
             FileUtil.writeFromStream(file.getInputStream(), savePath);
             log.info("史料文件写入完成： {}", savePath);
-            return Result.success();
+            HashMap<String, Object> result = new HashMap<>();
+            result.put("fileName", filename);
+            result.put("path", savePath);
+            log.info("result: {}", result);
+            return Result.success(result);
         } catch (IOException e) {
             e.printStackTrace();
         }

gis_web/src/main/java/com/gis/web/controller/MaterialController.java

@@ -27,14 +27,14 @@ public class MaterialController extends BaseController {
     @ApiOperation("列表")
     @PostMapping("list")
     public Result<MaterialEntity> list(@RequestBody PageDto param) {
-        return Result.success(materialService.search(param));
+        return materialService.search(param);
     }
 
     @WebControllerLog(description = "史料管理-下载史料", addDb = true)
     @ApiOperation("下载史料")
     @GetMapping("download/{id}")
     public Result<MaterialEntity> download(@PathVariable Long id) {
-        return Result.success(materialService.download(id));
+        return materialService.download(id);
     }
 
 

gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -1,8 +1,10 @@
 package com.gis.web.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.MaterialDeteleDto;
 import com.gis.domain.dto.MaterialDto;
 import com.gis.domain.po.GoodsEntity;
 import com.gis.domain.po.MaterialEntity;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -70,6 +73,16 @@ public class WebController {
         return Result.success(code);
     }
 
+    @WebControllerLog(description = "展示页-史料删除")
+    @ApiOperation(value = "史料-删除")
+    @PostMapping("material/delete")
+    public Result materialDelete(@Valid @RequestBody MaterialDeteleDto param ) {
+        String path = param.getPath();
+        log.info("删除地址：{}", path);
+        FileUtil.del(path);
+        return Result.success();
+    }
+
     @WebControllerLog(description = "展示页-史料保存", addDb = true)
     @ApiOperation(value = "史料-保存", notes = "把上传文件都放到code目录里")
     @PostMapping("material/save")