Browse Source

各个文件的层级移动, 项目实体类增加字段

zhanghao 1 month ago
parent
commit
ce97a9a935
17 changed files with 88 additions and 21 deletions
  1. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/LargeEmailController.java
  2. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeCameraController.java
  3. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeIssueController.java
  4. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlanController.java
  5. 2 2
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlatAppOrgController.java
  6. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeProjectController.java
  7. 1 3
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarDetailController.java
  8. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarRankController.java
  9. 1 4
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargePublicCarController.java
  10. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeUnitRankController.java
  11. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeWarnDetailController.java
  12. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildControlController.java
  13. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildOfficeController.java
  14. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildProtectController.java
  15. 68 0
      project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java
  16. 1 1
      project-zcustom/src/main/java/com/project/zcustom/controller/officalCar/PlatCarController.java
  17. 4 0
      project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeEmailController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/LargeEmailController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager;
 
 
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.domain.addional.ManagerEmail;
 import com.project.zcustom.domain.addional.ManagerEmail;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCameraController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeCameraController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.engineering;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeIssueController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeIssueController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.engineering;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePlanController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlanController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.engineering;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 2 - 2
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlatAppOrgController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.engineering;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;
@@ -24,7 +24,7 @@ import java.util.List;
 @RestController
 @RestController
 @RequestMapping("/zcustom/platAppOrg")
 @RequestMapping("/zcustom/platAppOrg")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class LargeUnitController extends BaseController {
+public class LargePlatAppOrgController extends BaseController {
 
 
     private final IPlatAppOrgService largeUnitService;
     private final IPlatAppOrgService largeUnitService;
 
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeProjectController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/engineering/LargeProjectController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.engineering;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 3
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarDetailController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarDetailController.java

@@ -1,14 +1,12 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.officialCar;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
 import com.project.common.utils.poi.ExcelUtil;
-import com.project.zcustom.domain.addional.LargeCar;
 import com.project.zcustom.domain.addional.LargeCarDetail;
 import com.project.zcustom.domain.addional.LargeCarDetail;
 import com.project.zcustom.service.unit.ILargeCarDetailService;
 import com.project.zcustom.service.unit.ILargeCarDetailService;
-import com.project.zcustom.service.unit.ILargePublicCarService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeCarRankController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarRankController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.officialCar;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 4
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePublicCarController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargePublicCarController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.officialCar;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;
@@ -10,10 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Map;
 
 

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitRankController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeUnitRankController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.officialCar;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeWarnDetailController.java → project-zcustom/src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeWarnDetailController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.unit;
+package com.project.zcustom.controller.backManager.officialCar;
 
 
 import com.project.common.annotation.Log;
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildControlController.java → project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildControlController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.build;
+package com.project.zcustom.controller.building;
 
 
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.service.smart.IPlatBuildingService;
 import com.project.zcustom.service.service.smart.IPlatBuildingService;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildOfficeController.java → project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildOfficeController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.build;
+package com.project.zcustom.controller.building;
 
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildProtectController.java → project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildProtectController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.build;
+package com.project.zcustom.controller.building;
 
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;

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

@@ -10,9 +10,14 @@ import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
+import javax.mail.internet.MimeMessage;
+import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
@@ -34,6 +39,18 @@ public class PlatProjectCheckController extends BaseController {
     private String uploadDirectory;
     private String uploadDirectory;
 
 
     /**
     /**
+     * 邮件发送接口
+     */
+    @Autowired
+    private JavaMailSender mailSender;
+
+    /**
+     * 邮件发送人
+     */
+    @Value("${spring.mail.username}")
+    private String sender;
+
+    /**
      * 问题数量
      * 问题数量
      */
      */
     @GetMapping("/getIssueNum/{appOrg}")
     @GetMapping("/getIssueNum/{appOrg}")
@@ -99,10 +116,61 @@ public class PlatProjectCheckController extends BaseController {
                 e.printStackTrace();
                 e.printStackTrace();
                 return AjaxResult.error("文件上传失败");
                 return AjaxResult.error("文件上传失败");
             }
             }
+
+            enclosureEmail(multipartFile, entity.getDescription() + "\n" + entity.getNeed());
         }
         }
         return toAjax(largeIssueService.save(entity));
         return toAjax(largeIssueService.save(entity));
     }
     }
 
 
+    public AjaxResult enclosureEmail(MultipartFile multipartFile, String content) {
+        //创建一个MINE消息
+        MimeMessage message = mailSender.createMimeMessage();
+        try {
+            MimeMessageHelper helper = new MimeMessageHelper(message, true);
+            //谁发
+            helper.setFrom(sender);
+            //谁接收
+            helper.setTo("qwer20030522@163.com");
+            //邮件主题
+            helper.setSubject("问题上报");
+            //邮件内容   true 表示带有附件或html
+            helper.setText(content, true);
+            File multipartFileToFile = MultipartFileToFile(multipartFile);
+            if (multipartFileToFile == null) {
+                return AjaxResult.error("文件转换失败");
+            }
+            FileSystemResource file = new FileSystemResource(multipartFileToFile);
+            String filename = file.getFilename();
+            //添加附件
+            if (filename == null) {
+                return AjaxResult.error("文件名称获取失败");
+            }
+            helper.addAttachment(filename, file);
+            mailSender.send(message);
+            return AjaxResult.success("发送邮件成功");
+        }  catch (javax.mail.MessagingException e) {
+            e.printStackTrace();
+            return AjaxResult.error("发送邮件失败");
+        }
+    }
+
+    private File MultipartFileToFile(MultipartFile multiFile) {
+        // 获取文件名
+        String fileName = multiFile.getOriginalFilename();
+        // 获取文件后缀
+        String prefix = fileName.substring(fileName.lastIndexOf("."));
+        // 若需要防止生成的临时文件重复,可以在文件名后添加随机码
+
+        try {
+            File file = File.createTempFile(fileName, prefix);
+            multiFile.transferTo(file);
+            return file;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     /**
     /**
      * 本周检查计划
      * 本周检查计划
      * */
      * */

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/car/PlatCarController.java → project-zcustom/src/main/java/com/project/zcustom/controller/officalCar/PlatCarController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.car;
+package com.project.zcustom.controller.officalCar;
 
 
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.car.ILargePlatCarService;
 import com.project.zcustom.service.car.ILargePlatCarService;

+ 4 - 0
project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java

@@ -42,6 +42,10 @@ public class LargeProject extends CustomBaseEntity {
 
 
     private String projectName;
     private String projectName;
 
 
+    private String constructionUnit;
+
+    private String supervisionUnit;
+
     /**
     /**
      * 横坐标
      * 横坐标
      */
      */