工程现场 问题相关接口修改

project-admin/src/main/resources/application-dev.yml

@@ -17,6 +17,9 @@ change:
   # 当前项目 redis cookie等 变量后缀
   projectSuffix: _sxgw24
 
+upload:
+  directory: "D:/path/to/upload/directory"  # 问题上报附件存储的本地目录
+
 # 接口地址配置
 apiurl:
   # 服务保障中心接口地址

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -9,8 +9,14 @@ import com.project.zcustom.service.unit.ILargePlanService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Date;
 
 @RestController
@@ -24,6 +30,9 @@ public class PlatProjectCheckController extends BaseController {
 
     private final ILargePlanService largePlanService;
 
+    @Value("${upload.directory}")
+    private String uploadDirectory;
+
     /**
      * 问题数量
      */
@@ -52,8 +61,8 @@ public class PlatProjectCheckController extends BaseController {
      * 近一周问题列表
      */
     @GetMapping("/getIssueListLastWeek/{appOrg}")
-    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false) Date date) {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, date));
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false, name = "day") Date day) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day));
     }
 
     /**
@@ -76,7 +85,21 @@ public class PlatProjectCheckController extends BaseController {
      * 新增问题
      * */
     @PostMapping("add")
-    public AjaxResult add(@RequestBody LargeIssue entity) {
+    public AjaxResult add(@RequestBody LargeIssue entity, @RequestParam("file") MultipartFile multipartFile) {
+        if (!multipartFile.isEmpty()) {
+            try {
+                String originalFilename = multipartFile.getOriginalFilename();
+                Path path = Paths.get(uploadDirectory, originalFilename);
+
+                Files.createDirectories(path.getParent());
+                multipartFile.transferTo(path);
+                entity.setImagePath(path.toString());
+
+            } catch (IOException e) {
+                e.printStackTrace();
+                return AjaxResult.error("文件上传失败");
+            }
+        }
         return toAjax(largeIssueService.save(entity));
     }
 

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java

@@ -43,6 +43,12 @@ public class LargeIssue extends CustomBaseEntity {
     private String title;
 
     /**
+     * 附件地址
+     */
+
+    private String imagePath;
+
+    /**
      * 问题描述
      */
     @Excel(name = "问题描述")
@@ -50,6 +56,12 @@ public class LargeIssue extends CustomBaseEntity {
     private String description;
 
     /**
+     * 要求
+     */
+
+    private String need;
+
+    /**
      * 发起人
      */
 

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DATE( a.create_time ) BETWEEN DATE( #{arg1} )
         AND CURDATE()
         )
-        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
+        <if test="arg0 != '10001'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
         order by a.create_time desc
     </select>
 </mapper>