From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 src/main/java/com/ots/project/exam/controller/TLibraryCodeController.java |   53 +++++++++--------------------------------------------
 1 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/controller/TLibraryCodeController.java b/src/main/java/com/ots/project/exam/controller/TLibraryCodeController.java
index 9cd2c97..83ba114 100644
--- a/src/main/java/com/ots/project/exam/controller/TLibraryCodeController.java
+++ b/src/main/java/com/ots/project/exam/controller/TLibraryCodeController.java
@@ -1,5 +1,4 @@
 package com.ots.project.exam.controller;
-
 import com.ots.common.utils.file.FileUploadUtils;
 import com.ots.common.utils.poi.ExcelUtil;
 import com.ots.framework.aspectj.lang.annotation.Log;
@@ -23,43 +22,31 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-/**
- * 鎶ュ憡瀛楀吀Controller
- *
- * @author ots
- * @date 2020-03-24
- */
 @Controller
 @Slf4j
 @RequestMapping("/exam/librarycode")
 public class TLibraryCodeController extends BaseController {
     private String prefix = "exam/librarycode";
-
     @Autowired
     private ITLibraryCodeService tLibraryCodeService;
-
     @RequiresPermissions("exam:librarycode:view")
     @GetMapping()
     public String librarycode() {
         return prefix + "/librarycode";
     }
-
-    /**
-     * 鏌ヨ鎶ュ憡瀛楀吀鍒楄〃
-     */
+    
     @RequiresPermissions("exam:librarycode:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(TLibraryCode tLibraryCode) {
         startPage();
         List<TLibraryCode> list = tLibraryCodeService.selectTLibraryCodeList(tLibraryCode);
-        // 灞曠ず鍥剧墖
+        
         for (TLibraryCode tLibraryCodeTemp : list) {
             if (StringUtils.isNotEmpty(tLibraryCodeTemp.getIcon())) {
                 tLibraryCodeTemp.setIcon(EssConfig.getHttpProfilePath() +"/upload" + tLibraryCodeTemp.getIcon());
@@ -67,10 +54,7 @@
         }
         return getDataTable(list);
     }
-
-    /**
-     * 瀵煎嚭鎶ュ憡瀛楀吀鍒楄〃
-     */
+    
     @RequiresPermissions("exam:librarycode:export")
     @PostMapping("/export")
     @ResponseBody
@@ -79,18 +63,12 @@
         ExcelUtil<TLibraryCode> util = new ExcelUtil<TLibraryCode>(TLibraryCode.class);
         return util.exportExcel(list, "librarycode");
     }
-
-    /**
-     * 鏂板鎶ュ憡瀛楀吀
-     */
+    
     @GetMapping("/add")
     public String add() {
         return prefix + "/add";
     }
-
-    /**
-     * 鏂板淇濆瓨鎶ュ憡瀛楀吀
-     */
+    
     @RequiresPermissions("exam:librarycode:add")
     @Log(title = "鎶ュ憡瀛楀吀", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -104,10 +82,7 @@
         CacheServiceFactory.getInstance().reLoad();
         return result;
     }
-
-    /**
-     * 淇敼鎶ュ憡瀛楀吀
-     */
+    
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         TLibraryCode tLibraryCode = tLibraryCodeService.selectTLibraryCodeById(id);
@@ -115,10 +90,7 @@
         mmap.put("tLibraryCode", tLibraryCode);
         return prefix + "/edit";
     }
-
-    /**
-     * 淇敼淇濆瓨鎶ュ憡瀛楀吀
-     */
+    
     @RequiresPermissions("exam:librarycode:edit")
     @Log(title = "鎶ュ憡瀛楀吀", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -128,15 +100,11 @@
             String ufi = FileUploadUtils.upload(EssConfig.getUploadPath(), tLibraryCode.getIconFile());
             tLibraryCode.setIcon(ufi.split("profile/upload")[1]);
         }
-
         AjaxResult result = toAjax(tLibraryCodeService.updateTLibraryCode(tLibraryCode));
         CacheServiceFactory.getInstance().reLoad();
         return result;
     }
-
-    /**
-     * 鍒犻櫎鎶ュ憡瀛楀吀
-     */
+    
     @RequiresPermissions("exam:librarycode:remove")
     @Log(title = "鎶ュ憡瀛楀吀", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
@@ -144,7 +112,6 @@
     public AjaxResult remove(String ids) {
         return toAjax(tLibraryCodeService.deleteTLibraryCodeByIds(ids));
     }
-
     @Log(title = "鎶ュ憡瀛楀吀瀵煎叆", businessType = BusinessType.IMPORT)
     @RequiresPermissions("exam:librarycode:import")
     @PostMapping("/importData")
@@ -167,18 +134,16 @@
         List<TLibraryCode> list = libraryCodes.stream().filter(item -> {
             return StringUtils.isNotBlank(item.getLibraryCode());
         }).collect(Collectors.toList());
-
         String message = tLibraryCodeService.importLibraryCodes(list, updateSupport);
         CacheServiceFactory.getInstance().reLoad();
         return AjaxResult.success(message);
     }
-
     @RequiresPermissions("exam:librarycode:import")
     @GetMapping("/importTemplate")
     @ResponseBody
     public AjaxResult importTemplate() {
         ExcelUtil<TLibraryCode> util = new ExcelUtil<>(TLibraryCode.class);
-        AjaxResult result = util.importTemplateExcel("鎶ュ憡瀛楀吀鏁版嵁");
+        AjaxResult result = util.importTemplateExcel("鎶ュ憡瀛楀吀鍐呭(Report Library Entries)");
         CacheServiceFactory.getInstance().reLoad();
         return result;
     }

--
Gitblit v1.9.1