技术方案加字段

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesAchievementController.java

@@ -15,7 +15,6 @@ import com.ruoyi.file.service.IFilesProjectService;
 import com.ruoyi.file.service.IFilesStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,12 +43,11 @@ public class FilesAchievementController extends BaseController
     @Autowired
     private IFilesStorageService filesStorageService;
 
-    @Value("${ruoyi.profile}")
+    @Value("${cmc.profile}")
     private String profile;
     /**
      * 查询成果表列表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:list')")
     @GetMapping("/list")
     public TableDataInfo list(FilesAchievement filesAchievement)
     {
@@ -75,7 +73,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 导出成果表列表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:export')")
     @Log(title = "成果表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, FilesAchievement filesAchievement)
@@ -88,7 +85,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 导出选中成果表列表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:export')")
     @Log(title = "成果表", businessType = BusinessType.EXPORT)
     @PostMapping("/exportBatch/{ids}")
     public void exportBatch(HttpServletResponse response, FilesAchievement filesAchievement, @PathVariable("ids") String[] ids)
@@ -110,7 +106,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 获取成果表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -120,7 +115,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 获取项目对应成果列表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
     @GetMapping( "/getAchievementByProject")
     public AjaxResult getAchievementByProject(String projectId)
     {
@@ -132,7 +126,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 上传成果excel文件
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
     @PostMapping("/uploadSheet")
     public AjaxResult uploadAchievementSheet(MultipartFile file) throws Exception {
         if (file.isEmpty()) {
@@ -177,67 +170,6 @@ public class FilesAchievementController extends BaseController
                 else
                     filesAchievementService.insertFilesAchievement(filesAchievement);
             }
-//            File profilePath = new File(profile);
-//            if (!profilePath.exists())//若此目录不存在，则创建之
-//                profilePath.mkdirs();
-//            File transferFile = new File( profilePath + "\\" + file.getOriginalFilename());
-//            file.transferTo(transferFile);
-//            InputStream in = new FileInputStream(transferFile);
-//            XSSFSheet sheetAt = null;
-//            HSSFSheet sheetAt1 = null;
-//            int rowNumber = 0;
-//            boolean xlsx = Objects.requireNonNull(file.getOriginalFilename()).endsWith("xlsx");
-//            if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xlsx")) {
-//                sheetAt = new XSSFWorkbook(in).getSheetAt(0);
-//                rowNumber = sheetAt.getPhysicalNumberOfRows();
-//            }
-//            else if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xls")) {
-//                sheetAt1 = new HSSFWorkbook(in).getSheetAt(0);
-//                rowNumber = sheetAt1.getPhysicalNumberOfRows();
-//            }
-//            FilesAchievement filesAchievement = new FilesAchievement();
-//            for (int i = 0; i < rowNumber - 1;) {
-//                i++;
-//                String column0 = xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(0));
-//                if (column0 != null && !column0.equals("")) {
-//                    filesAchievement.setId(new SnowFlake().generateId());
-//                    FilesProject filesProject = new FilesProject();
-//                    filesProject.setProjectNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(0)));
-//                    filesAchievement.setProjectId(null);
-//                    if (filesProjectService.selectFilesProjectList(filesProject).size() > 0)
-//                        filesAchievement.setProjectId(filesProjectService.selectFilesProjectList(filesProject).get(0).getId());
-//                    filesAchievement.setDataYear(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(1)).substring(0,4): ExcelUtils.getString(sheetAt1.getRow(i).getCell(1)).substring(0,4));
-//                    filesAchievement.setAchiName(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(2)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(2)));
-//                    filesAchievement.setScaleOrder(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(3)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(3)));
-//                    filesAchievement.setResultType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(4)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(4)));
-//                    filesAchievement.setFileType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(5)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(5)));
-//                    String storageAddress = xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(6));
-//                    filesAchievement.setStorageId(null);
-//                    if (storageAddress != null && !storageAddress.equals("")) {
-//                        filesAchievement.setStorageId(new SnowFlake().generateId());
-//                        FilesStorage storage = new FilesStorage();
-//                        storage.setStorageAddress(storageAddress);
-//                        if (filesStorageService.selectFilesStorageListE(storage).size() > 0)
-//                            filesAchievement.setStorageId(filesStorageService.selectFilesStorageListE(storage).get(0).getId());
-//                        else {
-//                            FilesStorage filesStorage = new FilesStorage();
-//                            filesStorage.setId(filesAchievement.getStorageId());
-//                            filesStorage.setStorageAddress(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(6)));
-//                            filesStorage.setAdministrator(getLoginUser().getUsername());
-//                            filesStorage.setRemark("");
-//                            filesStorageService.insertFilesStorage(filesStorage);
-//                        }
-//                    }
-////                    filesAchievement.setKmlUrl(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
-//                    filesAchievement.setWorkLoad(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
-//                    filesAchievement.setUnit(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(8)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(8)));
-//                    filesAchievement.setDataSource(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(9)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(9)));
-//                    filesAchievement.setProductionTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(10)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(10)));
-////                    filesAchievement.setSubmitDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(11)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(11)));
-//                    filesAchievement.setRemark(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(12)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(12)));
-//                    filesAchievementService.insertFilesAchievement(filesAchievement);
-//                }
-//            }
             return AjaxResult.success("上传成功");
         }
     }
@@ -245,7 +177,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 新增成果表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:add')")
     @Log(title = "成果表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(FilesAchievement filesAchievement, MultipartFile uploadKmlFile) throws IOException {
@@ -278,7 +209,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 修改成果表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:edit')")
     @Log(title = "成果表", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(FilesAchievement filesAchievement, MultipartFile uploadKmlFile) throws IOException {
@@ -314,7 +244,6 @@ public class FilesAchievementController extends BaseController
     /**
      * 删除成果表
      */
-    @PreAuthorize("@ss.hasPermi('file:achievement:remove')")
     @Log(title = "成果表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -15,7 +15,6 @@ import com.ruoyi.file.service.IFilesStorageService;
 import com.ruoyi.file.service.IFilesTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -43,13 +42,12 @@ public class FilesProjectController extends BaseController {
     @Autowired
     private IFilesStorageService filesStorageService;
 
-    @Value("${ruoyi.profile}")
+    @Value("${cmc.profile}")
     private String profile;
 
     /**
      * 查询项目管理列表
      */
-    @PreAuthorize("@ss.hasPermi('file:project:list')")
     @GetMapping("/list")
     public TableDataInfo list(FilesProject filesProject) {
         List<FilesProject> list = filesProjectService.selectFilesProjectList(filesProject);
@@ -71,7 +69,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 导出项目管理列表
      */
-    @PreAuthorize("@ss.hasPermi('file:project:export')")
     @Log(title = "项目管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, FilesProject filesProject) {
@@ -83,7 +80,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 导出选中项目管理列表
      */
-    @PreAuthorize("@ss.hasPermi('file:project:export')")
     @Log(title = "成果表", businessType = BusinessType.EXPORT)
     @PostMapping("/exportBatch/{ids}")
     public void exportBatch(HttpServletResponse response, FilesProject filesProject, @PathVariable("ids") String[] ids)
@@ -108,7 +104,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 获取项目管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('file:project:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
         return AjaxResult.success(filesProjectService.selectFilesProjectById(id));
@@ -117,7 +112,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 获取专题对应项目列表
      */
-    @PreAuthorize("@ss.hasPermi('file:project:query')")
     @GetMapping("/topicName")
     public AjaxResult getProjectByTopic(String topicName) {
         FilesTopic filesTopic = new FilesTopic();
@@ -131,29 +125,11 @@ public class FilesProjectController extends BaseController {
     /**
      * 上传项目excel文件
      */
-    @PreAuthorize("@ss.hasPermi('file:project:add')")
     @PostMapping("/uploadSheet")
     public AjaxResult uploadProjectSheet(MultipartFile file) throws Exception {
         if (file.isEmpty()) {
             return AjaxResult.error("文件内容为空！");
         } else {
-//            File profilePath = new File(profile);
-//            if (!profilePath.exists())//若此目录不存在，则创建之
-//                profilePath.mkdirs();
-//            File transferFile = new File(profilePath + "\\" + file.getOriginalFilename());
-//            file.transferTo(transferFile);
-//            InputStream in = new FileInputStream(transferFile);
-//            XSSFSheet sheetAt = null;
-//            HSSFSheet sheetAt1 = null;
-//            int rowNumber = 0;
-//            boolean xlsx = Objects.requireNonNull(file.getOriginalFilename()).endsWith("xlsx");
-//            if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xlsx")) {
-//                sheetAt = new XSSFWorkbook(in).getSheetAt(0);
-//                rowNumber = sheetAt.getLastRowNum();
-//            } else if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xls")) {
-//                sheetAt1 = new HSSFWorkbook(in).getSheetAt(0);
-//                rowNumber = sheetAt1.getLastRowNum();
-//            }
             ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
             List<FilesProject> filesProjectList = util.importExcel(file.getInputStream());
             List<String> IdList = new ArrayList<>();
@@ -169,46 +145,6 @@ public class FilesProjectController extends BaseController {
                 else
                     filesProjectService.insertFilesProject(fileProject);
             }
-//            FilesProject filesProject = new FilesProject();
-//            for (int i = 0; i < rowNumber - 1; ) {
-//                i++;
-//                filesProject.setId(new SnowFlake().generateId());
-//                filesProject.setProjectNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(0)));
-//                filesProject.setProjectName(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(1)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(1)));
-//                filesProject.setCurrentProgress(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(2)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(2)));
-//                filesProject.setProjectSource(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(3)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(3)));
-//                filesProject.setPartyA(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(4)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(4)));
-//                filesProject.setContactPerson(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(5)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(5)));
-//                filesProject.setTelephone(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(6)));
-//                filesProject.setContractCode(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
-//                filesProject.setContractNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(8)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(8)));
-//                filesProject.setProjectType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(9)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(9)));
-//                filesProject.setExpectedPrice(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(10)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(10)));
-//                filesProject.setProjectLevel(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(11)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(11)));
-//                filesProject.setTechnicalDirector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(12)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(12)));
-//                filesProject.setTechinicalDesigner(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(13)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(13)));
-//                filesProject.setQualityInspector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(14)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(14)));
-//                filesProject.setUndertakingSector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(15)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(15)));
-//                filesProject.setProjectLeader(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(16)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(16)));
-//                filesProject.setFund(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(17)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(17)));
-//                filesProject.setApprovalDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(18)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(18)));
-//                filesProject.setApproachTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(19)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(19)));
-//                filesProject.setWithdrawalTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(20)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(20)));
-//                filesProject.setRequiredCompletionDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(21)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(21)));
-//                filesProject.setSubmissionDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(22)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(22)));
-//                filesProject.setLicensePlateNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(23)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(23)));
-//                filesProject.setMileage(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(24)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(24)));
-//                filesProject.setFuelExpense(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(25)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(25)));
-//                filesProject.setMainEquipment(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(26)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(26)));
-//                filesProject.setProjectParticipants(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(27)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(27)));
-//                filesProject.setCurrentProcessing(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(28)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(28)));
-//                filesProject.setCurrentHandler(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(29)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(29)));
-//                filesProject.setProjectRegistrant(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(30)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(30)));
-//                filesProject.setRegistrationDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(31)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(31)));
-//                filesProject.setLeadingSector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(32)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(32)));
-//                filesProject.setYear(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(33)).substring(0,4) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(33)).substring(0,4));
-//                filesProjectService.insertFilesProject(filesProject);
-//            }
             return AjaxResult.success("上传成功");
         }
     }
@@ -216,7 +152,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 新增项目管理
      */
-    @PreAuthorize("@ss.hasPermi('file:project:add')")
     @Log(title = "项目管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(FilesProject filesProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
@@ -297,7 +232,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 修改项目管理
      */
-    @PreAuthorize("@ss.hasPermi('file:project:edit')")
     @Log(title = "项目管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(FilesProject filesProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
@@ -312,7 +246,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 删除项目管理
      */
-    @PreAuthorize("@ss.hasPermi('file:project:remove')")
     @Log(title = "项目管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
@@ -321,7 +254,6 @@ public class FilesProjectController extends BaseController {
     /**
      * 根据项目编号查询项目信息
      */
-    @PreAuthorize("@ss.hasPermi('file:project:query')")
     @GetMapping("/query/{projectNumbers}")
     public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers){
         return AjaxResult.success(filesProjectService.selectFilesProjectByNumbers(projectNumbers));

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesStorageController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.file.domain.FilesStorage;
 import com.ruoyi.file.service.IFilesStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,7 +31,6 @@ public class FilesStorageController extends BaseController
     /**
      * 查询存放表列表
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:list')")
     @GetMapping("/list")
     public TableDataInfo list(FilesStorage filesStorage)
     {
@@ -43,7 +41,6 @@ public class FilesStorageController extends BaseController
     /**
      * 导出存放表列表
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:export')")
     @Log(title = "存放表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, FilesStorage filesStorage)
@@ -56,7 +53,6 @@ public class FilesStorageController extends BaseController
     /**
      * 获取存放表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -66,7 +62,6 @@ public class FilesStorageController extends BaseController
     /**
      * 新增存放表
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:add')")
     @Log(title = "存放表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FilesStorage filesStorage)
@@ -78,7 +73,6 @@ public class FilesStorageController extends BaseController
     /**
      * 修改存放表
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:edit')")
     @Log(title = "存放表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FilesStorage filesStorage)
@@ -89,7 +83,6 @@ public class FilesStorageController extends BaseController
     /**
      * 删除存放表
      */
-    @PreAuthorize("@ss.hasPermi('file:storage:remove')")
     @Log(title = "存放表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesTopicController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.file.domain.FilesTopic;
 import com.ruoyi.file.service.IFilesTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,7 +31,6 @@ public class FilesTopicController extends BaseController
     /**
      * 查询专题管理列表
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:list')")
     @GetMapping("/list")
     public TableDataInfo list(FilesTopic filesTopic)
     {
@@ -43,7 +41,6 @@ public class FilesTopicController extends BaseController
     /**
      * 导出专题管理列表
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:export')")
     @Log(title = "专题管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, FilesTopic filesTopic)
@@ -56,7 +53,6 @@ public class FilesTopicController extends BaseController
     /**
      * 获取专题管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -66,7 +62,6 @@ public class FilesTopicController extends BaseController
     /**
      * 新增专题管理
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:add')")
     @Log(title = "专题管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FilesTopic filesTopic)
@@ -78,7 +73,6 @@ public class FilesTopicController extends BaseController
     /**
      * 修改专题管理
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:edit')")
     @Log(title = "专题管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FilesTopic filesTopic)
@@ -89,7 +83,6 @@ public class FilesTopicController extends BaseController
     /**
      * 删除专题管理
      */
-    @PreAuthorize("@ss.hasPermi('file:topic:remove')")
     @Log(title = "专题管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTechnical.java

@@ -60,6 +60,14 @@ public class CmcTechnical extends BaseEntity
     @Excel(name = "技术方案")
     private String technicalDocument;
 
+    /** 修改技术方案 */
+    @Excel(name = "修改技术方案")
+    private String modifyDocument;
+
+    /** 最终技术方案 */
+    @Excel(name = "最终技术方案")
+    private String finalDocument;
+
     /** 方案说明 */
     @Excel(name = "方案说明")
     private String designDescription;
@@ -186,6 +194,24 @@ public class CmcTechnical extends BaseEntity
     {
         return technicalDocument;
     }
+    public void setModifyDocument(String modifyDocument)
+    {
+        this.modifyDocument = modifyDocument;
+    }
+
+    public String getModifyDocument()
+    {
+        return modifyDocument;
+    }
+    public void setFinalDocument(String finalDocument)
+    {
+        this.finalDocument = finalDocument;
+    }
+
+    public String getFinalDocument()
+    {
+        return finalDocument;
+    }
     public void setDesignDescription(String designDescription)
     {
         this.designDescription = designDescription;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml

@@ -14,6 +14,8 @@
         <result property="qualityInspector"    column="quality_inspector"    />
         <result property="technicalTime"    column="technical_time"    />
         <result property="technicalDocument"    column="technical_document"    />
+        <result property="modifyDocument"    column="modify_document"    />
+        <result property="finalDocument"    column="final_document"    />
         <result property="designDescription"    column="design_description"    />
         <result property="technicalComment"    column="technical_comment"    />
         <result property="manageComment"    column="manage_comment"    />
@@ -36,8 +38,8 @@
 
     <sql id="selectCmcTechnicalVo">
         select t.technical_id, t.project_id, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
-               t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.design_description, t.technical_comment, t.manage_comment, t.technical_upload_time,
-               t.tech_approval_time, t.manage_approval_time from cmc_technical as t
+               t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document, t.design_description, t.technical_comment,
+               t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
          left join sys_user as u on u.user_id = t.technical_designer
          left join sys_user as u1 on u1.user_id = t.technical_planner
     </sql>
@@ -79,6 +81,8 @@
             <if test="qualityInspector != null">quality_inspector,</if>
             <if test="technicalTime != null">technical_time,</if>
             <if test="technicalDocument != null">technical_document,</if>
+            <if test="modifyDocument != null">modify_document,</if>
+            <if test="finalDocument != null">final_document,</if>
             <if test="designDescription != null">design_description,</if>
             <if test="technicalComment != null">technical_comment,</if>
             <if test="manageComment != null">manage_comment,</if>
@@ -96,6 +100,8 @@
             <if test="qualityInspector != null">#{qualityInspector},</if>
             <if test="technicalTime != null">#{technicalTime},</if>
             <if test="technicalDocument != null">#{technicalDocument},</if>
+            <if test="modifyDocument != null">#{modifyDocument},</if>
+            <if test="finalDocument != null">#{finalDocument},</if>
             <if test="designDescription != null">#{designDescription},</if>
             <if test="technicalComment != null">#{technicalComment},</if>
             <if test="manageComment != null">#{manageComment},</if>
@@ -116,6 +122,8 @@
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="technicalTime != null">technical_time = #{technicalTime},</if>
             <if test="technicalDocument != null">technical_document = #{technicalDocument},</if>
+            <if test="modifyDocument != null">modify_document = #{modifyDocument},</if>
+            <if test="finalDocument != null">final_document = #{finalDocument},</if>
             <if test="designDescription != null">design_description = #{designDescription},</if>
             <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
             <if test="manageComment != null">manage_comment = #{manageComment},</if>