Răsfoiți Sursa

feature(人员机构关系改造): 人员机构关系改造

马志强 3 ani în urmă
părinte
comite
df25ef0f36

+ 3 - 1
README.md

@@ -16,4 +16,6 @@
   - 应用资源管理
   - 去除老的审计埋点
 ### 2.2.2 
-  - 权限自助申请提供facade接口
+  - 权限自助申请提供facade接口
+### 2.2.3
+  - 删除数据分级分类导入功能

+ 1 - 1
dcuc-app-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.2-tjdsj-SNAPSHOT</version>
+        <version>2.2.3-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 8
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataLevelFacade.java

@@ -54,12 +54,4 @@ public interface IDataLevelFacade {
      */
     @PostMapping("search")
     Page<DataLevelDTO> pageSearch(@RequestBody SearchDTO searchDTO);
-
-    /**
-     * 文件导入
-     * @param fileId 文件id
-     * @return
-     */
-    @GetMapping("impExcel")
-    ResponseStatus impExcel(@RequestParam("fileId") String fileId);
 }

+ 0 - 7
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataSecFacade.java

@@ -55,11 +55,4 @@ public interface IDataSecFacade {
     @PostMapping("search")
     Page<DataSecDTO> pageSearch(@RequestBody SearchDTO searchDTO);
 
-    /**
-     * 文件导入
-     * @param fileId 文件id
-     * @return
-     */
-    @GetMapping("impExcel")
-    ResponseStatus impExcel(@RequestParam("fileId") String fileId);
 }

+ 1 - 1
dcuc-app-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.2-tjdsj-SNAPSHOT</version>
+        <version>2.2.3-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 3 - 3
dcuc-app-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.2-tjdsj-SNAPSHOT</version>
+        <version>2.2.3-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-org-api</artifactId>
-            <version>2.0.2-tjdsj-SNAPSHOT</version>
+            <version>2.0.3-tjdsj-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.4.0-tjdsj-SNAPSHOT</version>
+            <version>2.4.1-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--配置 dcuc 结束-->
 

+ 0 - 5
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/sub/DataLevelFacade.java

@@ -51,10 +51,5 @@ public class DataLevelFacade implements IDataLevelFacade {
         return dataLevelService.pageSearch(searchDTO);
     }
 
-    @Override
-    public ResponseStatus impExcel(String fileId) {
-        return dataLevelService.impExcel(fileId);
-    }
-
 
 }

+ 0 - 5
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/sub/DataSecFacade.java

@@ -52,10 +52,5 @@ public class DataSecFacade implements IDataSecFacade {
         return dataSecService.pageSearch(searchDTO);
     }
 
-    @Override
-    public ResponseStatus impExcel(String fileId) {
-        return dataSecService.impExcel(fileId);
-    }
-
 
 }

+ 0 - 7
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IDataLevelService.java

@@ -71,13 +71,6 @@ public interface IDataLevelService {
      */
     void sync(List<DataLevelVo> list);
 
-    /**
-     * 文件导入
-     * @param fileId
-     * @return
-     */
-    ResponseStatus impExcel(String fileId);
-
     /**
      * 根据code获取集合
      * @param codes

+ 0 - 7
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IDataSecService.java

@@ -71,13 +71,6 @@ public interface IDataSecService {
      */
     void sync(List<DataLevelVo> list);
 
-    /**
-     * 导入数据
-     * @param fileId
-     * @return
-     */
-    ResponseStatus impExcel(String fileId);
-
     /**
      * 根据codes查询集合
      * @param codes

+ 0 - 116
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/DataLevelServiceImpl.java

@@ -45,14 +45,9 @@ import java.util.stream.Collectors;
 @Service
 public class DataLevelServiceImpl implements IDataLevelService {
 
-    private List<String> excelTitle = Arrays.asList("代码","数据分级","说明");
-
     @Autowired
     private DataLevelMapper dataLevelMapper;
 
-    @Autowired
-    private IDuceapUploadFacade uploadFacade;
-
     @Override
     public ResponseStatus dataLevelAdd(DataLevelDTO dto) {
         String id = dto.getId();
@@ -153,80 +148,6 @@ public class DataLevelServiceImpl implements IDataLevelService {
 
     }
 
-    @Override
-    public ResponseStatus impExcel(String fileId) {
-        DocContentDTO fileContent = uploadFacade.getFileContent(fileId);
-        InputStream inputStream = new ByteArrayInputStream(fileContent.getFileData());
-        try {
-            List<ExcelDataLevel> list = loadDataLevelFromExcel(inputStream);
-            verifyImport(list);
-            saveImport(list);
-        } catch (IOException e){
-            return ResponseStatus.fail("文件格式不正确");
-        } catch (NumberFormatException e) {
-            return ResponseStatus.fail(e.getMessage());
-        }
-        return ResponseStatus.success();
-    }
-
-    private void saveImport(List<ExcelDataLevel> list) {
-        Date date = new Date();
-        list.forEach(item->{
-            DataLevel dataLevel = new DataLevel();
-            BeanUtils.copyProperties(item, dataLevel);
-            dataLevel.setDeleted(BooleanEnum.FALSE.value);
-            dataLevel.setCreateTime(date);
-            dataLevel.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_LEVEL.value);
-            dataLevelMapper.insert(dataLevel);
-        });
-    }
-
-    private void verifyImport(List<ExcelDataLevel> list) {
-        if(list.size() > 1000) {
-            throw new NumberFormatException("导入条数超过1000条!!!");
-        }
-
-        String codeEmpRows = list.stream().filter(item -> StringUtils.isBlank(item.getLevelCode()))
-                .map(item -> item.getRowNum().toString())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(codeEmpRows)) {
-            throw new NumberFormatException("第【"+ codeEmpRows +"】行【代码】列为空");
-        }
-
-        String nameEmpRows = list.stream().filter(item -> StringUtils.isBlank(item.getLevelName()))
-                .map(item -> item.getRowNum().toString())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(nameEmpRows)) {
-            throw new NumberFormatException("第【"+ nameEmpRows +"】行【数据分级】列为空");
-        }
-
-        String remarkLengthRows = list.stream().filter(item -> {
-            String remark = item.getRemark();
-            return StringUtils.isNotBlank(remark) && remark.length() > 500;
-        }).map(item -> item.getRowNum().toString()).collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(remarkLengthRows)) {
-            throw new NumberFormatException("第【"+ remarkLengthRows +"】行【说明】列超过500个字符!!!");
-        }
-        //校验导入的数据中是否存在重复
-        Map<String, List<ExcelDataLevel>> map = list.stream()
-                .collect(Collectors.groupingBy(ExcelDataLevel::getLevelCode));
-        String dupCodes = map.values().stream()
-                .filter(item -> item.size() >= 2)
-                .map(item -> item.get(0).getLevelCode())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(dupCodes)) {
-            throw new NumberFormatException("导入的数据中存在重复代码:【"+ dupCodes +"】");
-        }
-
-        //校验编码是否存在
-        List<String> codes = list.stream().map(ExcelDataLevel::getLevelCode).distinct().collect(Collectors.toList());
-        List<DataLevel> existList = getByCodes(codes);
-        if (CollectionUtils.isNotEmpty(existList)) {
-            String existCodes = existList.stream().map(DataLevel::getLevelCode).collect(Collectors.joining(","));
-            throw new NumberFormatException("【"+ existCodes +"】代码已被使用");
-        }
-    }
-
     @Override
     public List<DataLevel> getByCodes(List<String> codes) {
         LambdaQueryWrapper<DataLevel> queryWrapper = new LambdaQueryWrapper<>();
@@ -249,43 +170,6 @@ public class DataLevelServiceImpl implements IDataLevelService {
         return dataLevelMapper.selectList(queryWrapper);
     }
 
-    private List<ExcelDataLevel> loadDataLevelFromExcel(InputStream inputStream) throws IOException {
-        List<ExcelDataLevel> list = new ArrayList<>();
-        Workbook wb0 = new HSSFWorkbook(inputStream);
-        //获取Excel文档中的第一个表单
-        Sheet sht0 = wb0.getSheetAt(0);
-        for (Row r : sht0) {
-            if (r.getRowNum() == 0) {
-                ImportUtil.checkTitle(r, excelTitle);
-            }else {
-                if(ImportUtil.checkIsEmpty(r, 2)) {
-                    continue;
-                }
-                ExcelDataLevel dataLevel = getDataLevelFromRow(r);
-                list.add(dataLevel);
-            }
-        }
-        return list;
-    }
-
-    private ExcelDataLevel getDataLevelFromRow(Row r) {
-        ExcelDataLevel dataLevel = new ExcelDataLevel();
-        dataLevel.setRowNum(r.getRowNum());
-        Cell cell;
-        //码值
-        cell = r.getCell(0);
-        String code = ImportUtil.getCellStringValue(cell);
-        dataLevel.setLevelCode(code);
-        //数据分级
-        cell = r.getCell(1);
-        String name = ImportUtil.getCellStringValue(cell);
-        dataLevel.setLevelName(name);
-        //说明
-        cell = r.getCell(2);
-        String remark = ImportUtil.getCellStringValue(cell);
-        dataLevel.setRemark(remark);
-        return dataLevel;
-    }
 
     private void saveByCode(DataLevel dataLevel) {
         DataLevel exist = this.getByCode(dataLevel.getLevelCode());

+ 0 - 110
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/DataSecServiceImpl.java

@@ -45,15 +45,9 @@ import java.util.stream.Collectors;
 @Service
 public class DataSecServiceImpl implements IDataSecService {
 
-    private List<String> excelTitle = Arrays.asList("代码","数据安全级别","说明");
-
     @Autowired
     private DataSecMapper dataSecMapper;
 
-    @Autowired
-    private IDuceapUploadFacade uploadFacade;
-
-
     @Override
     public ResponseStatus dataLevelAdd(DataSecDTO dto) {
         String id = dto.getId();
@@ -156,71 +150,6 @@ public class DataSecServiceImpl implements IDataSecService {
 
     }
 
-    @Override
-    public ResponseStatus impExcel(String fileId) {
-        DocContentDTO fileContent = uploadFacade.getFileContent(fileId);
-        InputStream inputStream = new ByteArrayInputStream(fileContent.getFileData());
-        try {
-            List<ExcelDataSec> list = loadDataSecFromExcel(inputStream);
-            verifyImport(list);
-            saveImport(list);
-        } catch (IOException e){
-            return ResponseStatus.fail("文件格式不正确");
-        } catch (NumberFormatException e) {
-            return ResponseStatus.fail(e.getMessage());
-        }
-        return ResponseStatus.success();
-    }
-
-    private void saveImport(List<ExcelDataSec> list) {
-
-    }
-
-    private void verifyImport(List<ExcelDataSec> list) {
-        if(list.size() > 1000) {
-            throw new NumberFormatException("导入条数超过1000条!!!");
-        }
-
-        String codeEmpRows = list.stream().filter(item -> StringUtils.isBlank(item.getSecCode()))
-                .map(item -> item.getRowNum().toString())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(codeEmpRows)) {
-            throw new NumberFormatException("第【"+ codeEmpRows +"】行【代码】列为空");
-        }
-
-        String nameEmpRows = list.stream().filter(item -> StringUtils.isBlank(item.getSecName()))
-                .map(item -> item.getRowNum().toString())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(nameEmpRows)) {
-            throw new NumberFormatException("第【"+ nameEmpRows +"】行【数据安全级别】列为空");
-        }
-
-        String remarkLengthRows = list.stream().filter(item -> {
-            String remark = item.getRemark();
-            return StringUtils.isNotBlank(remark) && remark.length() > 500;
-        }).map(item -> item.getRowNum().toString()).collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(remarkLengthRows)) {
-            throw new NumberFormatException("第【"+ remarkLengthRows +"】行【说明】列超过500个字符!!!");
-        }
-        //校验导入的数据中是否存在重复
-        Map<String, List<ExcelDataSec>> map = list.stream()
-                .collect(Collectors.groupingBy(ExcelDataSec::getSecCode));
-        String dupCodes = map.values().stream()
-                .filter(item -> item.size() >= 2)
-                .map(item -> item.get(0).getSecCode())
-                .collect(Collectors.joining(","));
-        if(StringUtils.isNotBlank(dupCodes)) {
-            throw new NumberFormatException("导入的数据中存在重复代码:【"+ dupCodes +"】");
-        }
-
-        //校验编码是否存在
-        List<String> codes = list.stream().map(ExcelDataSec::getSecCode).distinct().collect(Collectors.toList());
-        List<DataSec> existList = getByCodes(codes);
-        if (CollectionUtils.isNotEmpty(existList)) {
-            String existCodes = existList.stream().map(DataSec::getSecCode).collect(Collectors.joining(","));
-            throw new NumberFormatException("【"+ existCodes +"】代码已被使用");
-        }
-    }
 
     @Override
     public List<DataSec> getByCodes(List<String> codes) {
@@ -244,45 +173,6 @@ public class DataSecServiceImpl implements IDataSecService {
         return dataSecMapper.selectList(queryWrapper);
     }
 
-    private List<ExcelDataSec> loadDataSecFromExcel(InputStream inputStream) throws IOException {
-        List<ExcelDataSec> list = new ArrayList<>();
-        Workbook wb0 = new HSSFWorkbook(inputStream);
-        //获取Excel文档中的第一个表单
-        Sheet sht0 = wb0.getSheetAt(0);
-        for (Row r : sht0) {
-            if (r.getRowNum() == 0) {
-                ImportUtil.checkTitle(r, excelTitle);
-            }else {
-                if(ImportUtil.checkIsEmpty(r, 2)) {
-                    continue;
-                }
-                ExcelDataSec dataSec = getDataSecFromRow(r);
-                list.add(dataSec);
-            }
-        }
-        return list;
-    }
-
-    private ExcelDataSec getDataSecFromRow(Row r) {
-        ExcelDataSec dataSec = new ExcelDataSec();
-        dataSec.setRowNum(r.getRowNum());
-        Cell cell;
-        //码值
-        cell = r.getCell(0);
-        String code = ImportUtil.getCellStringValue(cell);
-        dataSec.setSecCode(code);
-        //数据安全级别
-        cell = r.getCell(1);
-        String name = ImportUtil.getCellStringValue(cell);
-        dataSec.setSecName(name);
-        //说明
-        cell = r.getCell(2);
-        String remark = ImportUtil.getCellStringValue(cell);
-        dataSec.setRemark(remark);
-        return dataSec;
-    }
-
-
     private void saveByCode(DataSec dataSec) {
         DataSec exist = this.getByCode(dataSec.getSecCode());
         if(null == exist) {

+ 2 - 2
pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-app</artifactId>
-    <version>2.2.2-tjdsj-SNAPSHOT</version>
+    <version>2.2.3-tjdsj-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>dcuc-app-api</module>
@@ -18,7 +18,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死,用于标识打包的版本号,不可删除-->
-        <revision>2.2.2-tjdsj-SNAPSHOT</revision>
+        <revision>2.2.3-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>