bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java

@@ -5,10 +5,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ImportExcelUtil {
 
@@ -44,8 +41,7 @@ public class ImportExcelUtil {
         List<Map<String, String>> list = new ArrayList<>();
 
         for (int i = 1; i <= lastRowNum; i++) {
-            ArrayList<String> list1 = new ArrayList<>();
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, String> map = new LinkedHashMap<>();
             //获取行数据
             Row row = sheet.getRow(i);
             for (int j = 0; j < lastCellNum; j++) {
@@ -53,8 +49,7 @@ public class ImportExcelUtil {
                 Cell cell = row.getCell(j);
                 if (cell != null) {
                     cell.setCellType(CellType.STRING);
-                    //获取单元格数据
-                    list1.add(cell.getStringCellValue());
+                    //cell.setCellFormula(CellType.STRING.name());
                     //列名 ：数据
                     map.put(titleRow.getCell(j).getStringCellValue(), cell.getStringCellValue());
                 }

src/main/java/cn/wisenergy/chnmuseum/party/conf/MybatisPlusConfig.java

@@ -21,14 +21,13 @@ public class MybatisPlusConfig {
      * mybatis-plus乐观锁插件
      */
     @Bean
-    public OptimisticLockerInnerInterceptor optimisticLockerInterceptor() {
-        return new OptimisticLockerInnerInterceptor();
-    }
+    public OptimisticLockerInnerInterceptor optimisticLockerInterceptor() { return new OptimisticLockerInnerInterceptor(); }
 
+    /**
+     * 攻击SQL阻断解析器,防止全表更新与删除
+     */
     @Bean
-    public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
-        return new BlockAttackInnerInterceptor();
-    }
+    public BlockAttackInnerInterceptor blockAttackInnerInterceptor() { return new BlockAttackInnerInterceptor(); }
 
     /**
      * 自定义 SqlInjector

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -49,13 +49,11 @@ public class TOrganController extends BaseController {
     @Resource
     private TAreaService tAreaService;
 
-
     @PostMapping("/add")
     @RequiresAuthentication  //@RequiresPermissions("/organ/add")
     @ApiOperation(value = "添加机构", notes = "添加机构")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.ADD)
     public Map<String, Object> add(TOrgan organ) {
-
         QueryWrapper<TOrgan> ew = new QueryWrapper<>();
         if (StringUtils.isNoneBlank(organ.getName())) {
             organ.setName(organ.getName().trim());
@@ -96,7 +94,6 @@ public class TOrganController extends BaseController {
     @ApiOperation(value = "update", notes = "修改机构信息")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.UPDATE)
     public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
-
         try {
             TOrgan byId = tOrganService.selectById(tOrgan.getId());
             if (StringUtils.isNotBlank(tOrgan.getParentId())) {
@@ -121,7 +118,7 @@ public class TOrganController extends BaseController {
                 }
             }
             tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
-            boolean flag = false;
+            boolean flag;
             flag = tOrganService.updateById(tOrgan);
             if (!flag) {
                 return getFailResult();
@@ -134,7 +131,6 @@ public class TOrganController extends BaseController {
         return getFailResult();
     }
 
-
     @DeleteMapping("/delete")
     @RequiresAuthentication  //@RequiresPermissions("/organ/delete")
     @ApiOperation(value = "根据ID删除机构", notes = "根据ID删除机构")
@@ -143,7 +139,7 @@ public class TOrganController extends BaseController {
     })
     @MethodLog(operModule = OperModule.ORG, operType = OperType.DELETE)
     public Map<String, Object> deleteTOrgan(String id) {
-        boolean result = false;
+        boolean result;
         try {
             TOrgan tOrgan = tOrganService.getById(id);
             tOrgan.setIsDeleted(true);
@@ -164,11 +160,11 @@ public class TOrganController extends BaseController {
     @ApiOperation(value = "获取机构全部列表(无分页)", notes = "获取机构全部列表(无分页)")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.SELECT)
     public Map<String, Object> getTOrganList() {
-        TUser user = null;
+        TUser user;
         try {
             user = getcurUser();
             TOrgan tOrgan = new TOrgan();
-            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+            if (user.getRoleList().size() > 0 && !user.getRoleList().contains("1")) {
                 //设置用户数据权限
                 tOrgan.setCode(user.getOrgCode());
             }
@@ -178,10 +174,8 @@ public class TOrganController extends BaseController {
             e.printStackTrace();
         }
         return getFailResult();
-
     }
 
-
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@@ -195,7 +189,7 @@ public class TOrganController extends BaseController {
     @MethodLog(operModule = OperModule.ORG, operType = OperType.SELECT)
     public Map<String, Object> getTOrganPageList(GenericPageParam genericPageParam) {
         TUser user = getcurUser();
-        Page<TOrgan> page = null;
+        Page<TOrgan> page;
         try {
             LambdaQueryWrapper<TOrgan> queryWrapper = new LambdaQueryWrapper<>();
             // 对名称或编码模糊查询
@@ -207,7 +201,7 @@ public class TOrganController extends BaseController {
                 queryWrapper.ge(TOrgan::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
                         .le(TOrgan::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
             }
-            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+            if (user.getRoleList().size() > 0 && !user.getRoleList().contains("1")) {
                 //设置用户数据权限
                 queryWrapper.likeRight(TOrgan::getCode, user.getOrgCode());
             }
@@ -227,7 +221,7 @@ public class TOrganController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("/organ/getById")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.SELECT)
     public Map<String, Object> getById(String id) {
-        TOrgan tOrgan = null;
+        TOrgan tOrgan;
         try {
             tOrgan = tOrganService.selectById(id);
             return getResult(tOrgan);
@@ -244,13 +238,13 @@ public class TOrganController extends BaseController {
     @MethodLog(operModule = OperModule.ORG, operType = OperType.SELECT)
     public Map<String, Object> getTree(String name) {
         TUser user = getcurUser();
-        List<TOrgan> list = new ArrayList<>();
+        List<TOrgan> list;
         UpdateWrapper<TOrgan> wrapper = new UpdateWrapper<>();
         try {
-            if (user.getRoleList().size()>0&&!user.getRoleList().contains("1")) {
+            if (user.getRoleList().size() > 0 && !user.getRoleList().contains("1")) {
                 //设置用户数据权限
                 wrapper.likeRight("code", user.getOrgCode());
-            }else {
+            } else {
                 user.setOrgCode("");
             }
             if (StringUtils.isBlank(name)) {
@@ -271,7 +265,7 @@ public class TOrganController extends BaseController {
     @ApiOperation(value = "获取区域树", notes = "获取区域树")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.SELECT)
     public Map<String, Object> getAreaTree() {
-        List<TArea> list = null;
+        List<TArea> list;
         try {
             list = tAreaService.getAreaTree();
             return getResult(list);
@@ -288,11 +282,11 @@ public class TOrganController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("/organ/import")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.IMPORT)
     public Map<String, Object> upload(MultipartFile file) {
-        Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
+        Map<String, Object> resultMap = new LinkedHashMap<>();
         try {
-            boolean flag = false;
+            boolean flag;
             //使用工具类从文件中读取数据
-            List excelList = ImportExcelUtil.readExcel(file.getOriginalFilename(), file.getInputStream());
+            final List<Map<String, String>> excelList = ImportExcelUtil.readExcel(file.getOriginalFilename(), file.getInputStream());
             flag = tOrganService.batchUpload(excelList);
             if (!flag) {
                 resultMap.put("resultCode", "500");
@@ -314,21 +308,20 @@ public class TOrganController extends BaseController {
         TOrgan byId = tOrganService.getById(parentId);
         if (max == null) {
             if (byId != null) {
-                String s = byId.getCode() + "001";
-                return s;
-            }else {
+                return byId.getCode() + "001";
+            } else {
                 return "001";
             }
         }
         String s = max.getCode().substring(max.getCode().length() - 3);
         String s1 = max.getCode().substring(0, max.getCode().length() - 3);
-        Integer integer = Integer.valueOf(s) + 1;
+        int integer = Integer.parseInt(s) + 1;
         if (integer < 10) {
-            s1 = s1 + "00" + integer.toString();
+            s1 = s1 + "00" + integer;
         } else if (integer < 100) {
-            s1 = s1 + "0" + integer.toString();
+            s1 = s1 + "0" + integer;
         } else {
-            s1 = s1 + integer.toString();
+            s1 = s1 + integer;
         }
         return s1;
     }