feature: 联动代码逻辑编写

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

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -21,7 +21,7 @@ public interface IDataSecFacade {
      * @return
      */
     @PostMapping("dataLevelAdd")
-    ResponseStatus dataLevelAdd(@RequestBody DataSecDTO dto);
+    ResponseStatus dataLevelAdd(@RequestBody FieldSecDTO dto);
 
     /**
      * 查看详情
@@ -29,7 +29,7 @@ public interface IDataSecFacade {
      * @return
      */
     @GetMapping("detail/{id}")
-    DataSecDTO detail(@PathVariable("id") String id);
+    FieldSecDTO detail(@PathVariable("id") String id);
 
     /**
      * 根据id删除
@@ -45,7 +45,7 @@ public interface IDataSecFacade {
      * @return
      */
     @GetMapping("detailByCode/{secCode}")
-    DataSecDTO detailByCode(@PathVariable("secCode") String secCode);
+    FieldSecDTO detailByCode(@PathVariable("secCode") String secCode);
 
     /**
      * 数据安全等级分页查询
@@ -53,6 +53,6 @@ public interface IDataSecFacade {
      * @return
      */
     @PostMapping("search")
-    Page<DataSecDTO> pageSearch(@RequestBody SearchDTO searchDTO);
+    Page<FieldSecDTO> pageSearch(@RequestBody SearchDTO searchDTO);
 
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataLevelDTO.java

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.app.dto.sub;
 import lombok.Data;
 
 /**
- * 主客体授权-数据分级新增修改DTO
+ * 主客体授权-数据分级DTO
  * @author mazq
  * @date 2021/5/25
  */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldClaDTO.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import java.util.Date;
 
 /**
+ * 字段分类Dto
+ *
  * @author mazq
  * @date 2021/5/31
  */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataSecDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldSecDTO.java

@@ -3,12 +3,12 @@ package com.dragoninfo.dcuc.app.dto.sub;
 import lombok.Data;
 
 /**
- * 主客体授权-数据分级新增修改DTO
+ * 主客体授权-字段安全等级Dto
  * @author mazq
  * @date 2021/5/25
  */
 @Data
-public class DataSecDTO {
+public class FieldSecDTO {
 
     private String id;
 

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataSec.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/FieldSec.java

@@ -20,7 +20,7 @@ import java.util.Date;
  */
 @Data
 @TableName("T_APP_DATA_SEC")
-public class DataSec implements Serializable {
+public class FieldSec implements Serializable {
 
     @TableId(type = IdType.UUID)
     private String id;

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -415,7 +415,7 @@ public class DataResourceFacade implements IDataResourceFacade {
 
     @Override
     public List<DataLevelVo> getSecurityLevelList() {
-        List<DataSec> all = dataSecService.getAll();
+        List<FieldSec> all = dataSecService.getAll();
         return all.stream()
                 .map(item -> new DataLevelVo(item.getId(), item.getSecCode(), item.getSecName(), item.getDataType()))
                 .collect(Collectors.toList());
@@ -626,7 +626,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             }).collect(Collectors.toList());
 
         } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
-            List<DataSec> list = dataSecService.getByIds(ids);
+            List<FieldSec> list = dataSecService.getByIds(ids);
             list.stream().map(item -> {
                 DataLevelVo vo = new DataLevelVo();
                 vo.setTypeCode(item.getDataType());
@@ -667,7 +667,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             vo.setLevelName(dataCla.getName());
             vo.setTypeCode(dataCla.getCode());
         } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
-            DataSec dataSec = dataSecService.getById(id);
+            FieldSec dataSec = dataSecService.getById(id);
             vo.setId(dataSec.getId());
             vo.setLevelCode(dataSec.getSecCode());
             vo.setLevelName(dataSec.getSecName());

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

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -24,15 +24,15 @@ public class DataSecFacade implements IDataSecFacade {
 
 
     @Override
-    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+    public ResponseStatus dataLevelAdd(FieldSecDTO dto) {
         return dataSecService.dataLevelAdd(dto);
     }
 
 
     @Override
-    public DataSecDTO detail(String id) {
-        DataSec sec = dataSecService.getById(id);
-        DataSecDTO dto = new DataSecDTO();
+    public FieldSecDTO detail(String id) {
+        FieldSec sec = dataSecService.getById(id);
+        FieldSecDTO dto = new FieldSecDTO();
         BeanUtils.copyProperties(sec, dto);
         return dto;
     }
@@ -43,12 +43,12 @@ public class DataSecFacade implements IDataSecFacade {
     }
 
     @Override
-    public DataSecDTO detailByCode(String secCode) {
+    public FieldSecDTO detailByCode(String secCode) {
         return dataSecService.detailByCode(secCode);
     }
 
     @Override
-    public Page<DataSecDTO> pageSearch(SearchDTO searchDTO) {
+    public Page<FieldSecDTO> pageSearch(SearchDTO searchDTO) {
         return dataSecService.pageSearch(searchDTO);
     }
 

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/mapper/sub/DataSecMapper.java

@@ -1,11 +1,11 @@
 package com.dragoninfo.dcuc.app.mapper.sub;
 
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**
  * @author mazq
  * @date 2021/5/25
  */
-public interface DataSecMapper extends BaseMybatisMapper<DataSec> {
+public interface DataSecMapper extends BaseMybatisMapper<FieldSec> {
 }

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

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.service.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -21,28 +21,28 @@ public interface IDataSecService {
      * @param dto
      * @return
      */
-    ResponseStatus dataLevelAdd(DataSecDTO dto);
+    ResponseStatus dataLevelAdd(FieldSecDTO dto);
 
     /**
      * 更新
      * @param dto
      * @return
      */
-    DataSec update(DataSecDTO dto);
+    FieldSec update(FieldSecDTO dto);
 
     /**
      * 保存
      * @param dto
      * @return
      */
-    DataSec save(DataSecDTO dto);
+    FieldSec save(FieldSecDTO dto);
 
     /**
      * 获取详情
      * @param id
      * @return
      */
-    DataSec getById(String id);
+    FieldSec getById(String id);
 
     /**
      * 根据id删除
@@ -56,14 +56,14 @@ public interface IDataSecService {
      * @param secCode
      * @return
      */
-    DataSecDTO detailByCode(String secCode);
+    FieldSecDTO detailByCode(String secCode);
 
     /**
      * 分页查询数据安全等级
      * @param searchDTO
      * @return
      */
-    Page<DataSecDTO> pageSearch(SearchDTO searchDTO);
+    Page<FieldSecDTO> pageSearch(SearchDTO searchDTO);
 
     /**
      * 安全等级同步数据保存
@@ -76,18 +76,18 @@ public interface IDataSecService {
      * @param codes
      * @return
      */
-    List<DataSec> getByCodes(List<String> codes);
+    List<FieldSec> getByCodes(List<String> codes);
 
     /**
      * 获取所有数据
      * @return
      */
-    List<DataSec> getAll();
+    List<FieldSec> getAll();
 
     /**
      * 批量获取
      * @param ids
      * @return
      */
-    List<DataSec> getByIds(List<String> ids);
+    List<FieldSec> getByIds(List<String> ids);
 }

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

@@ -1,39 +1,24 @@
 package com.dragoninfo.dcuc.app.service.sub.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.dto.sub.ExcelDataSec;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.mapper.sub.DataSecMapper;
 import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
-import com.dragoninfo.dcuc.app.util.ImportUtil;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
-import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
-import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
-import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,14 +34,14 @@ public class DataSecServiceImpl implements IDataSecService {
     private DataSecMapper dataSecMapper;
 
     @Override
-    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+    public ResponseStatus dataLevelAdd(FieldSecDTO dto) {
         String id = dto.getId();
         String code = dto.getSecCode();
         dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_SEC.value);
         if(StringUtils.isBlank(code)) {
             return ResponseStatus.fail("代码不能为空");
         }
-        DataSec exist = getByCode(code);
+        FieldSec exist = getByCode(code);
         if(StringUtils.isBlank(id)) {
             if(null != exist) {
                 return ResponseStatus.fail("代码已存在");
@@ -73,8 +58,8 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec update(DataSecDTO dto) {
-        DataSec dataSec = dataSecMapper.selectById(dto.getId());
+    public FieldSec update(FieldSecDTO dto) {
+        FieldSec dataSec = dataSecMapper.selectById(dto.getId());
         if (null == dataSec) {
             return null;
         }
@@ -85,8 +70,8 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec save(DataSecDTO dto) {
-        DataSec dataSec = new DataSec();
+    public FieldSec save(FieldSecDTO dto) {
+        FieldSec dataSec = new FieldSec();
         BeanUtils.copyProperties(dto, dataSec);
         dataSec.setCreateTime(new Date());
         dataSec.setDeleted(BooleanEnum.FALSE.value);
@@ -95,7 +80,7 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec getById(String id) {
+    public FieldSec getById(String id) {
         return dataSecMapper.selectById(id);
     }
 
@@ -105,11 +90,11 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSecDTO detailByCode(String secCode) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().eq(DataSec::getSecCode, secCode);
-        DataSec dataSec = dataSecMapper.selectOne(queryWrapper);
-        DataSecDTO dto = new DataSecDTO();
+    public FieldSecDTO detailByCode(String secCode) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().eq(FieldSec::getSecCode, secCode);
+        FieldSec dataSec = dataSecMapper.selectOne(queryWrapper);
+        FieldSecDTO dto = new FieldSecDTO();
         if (null == dataSec) {
             return dto;
         }
@@ -118,15 +103,15 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public Page<DataSecDTO> pageSearch(SearchDTO searchDTO) {
-        Page<DataSec> dataSecs = dataSecMapper.pagingBySearchable(Searchable.toSearchable(searchDTO));
-        List<DataSec> pageContent = dataSecs.getContent();
-        List<DataSecDTO> collect = pageContent.stream().map(item -> {
-            DataSecDTO dto = new DataSecDTO();
+    public Page<FieldSecDTO> pageSearch(SearchDTO searchDTO) {
+        Page<FieldSec> dataSecs = dataSecMapper.pagingBySearchable(Searchable.toSearchable(searchDTO));
+        List<FieldSec> pageContent = dataSecs.getContent();
+        List<FieldSecDTO> collect = pageContent.stream().map(item -> {
+            FieldSecDTO dto = new FieldSecDTO();
             BeanUtils.copyProperties(item, dto);
             return dto;
         }).collect(Collectors.toList());
-        Page<DataSecDTO> page = new PageImpl<>(collect, dataSecs.getPageable(), dataSecs.getTotalElements());
+        Page<FieldSecDTO> page = new PageImpl<>(collect, dataSecs.getPageable(), dataSecs.getTotalElements());
         return page;
     }
 
@@ -141,7 +126,7 @@ public class DataSecServiceImpl implements IDataSecService {
                 .collect(Collectors.toMap(DataLevelVo::getLevelCode, item -> item, (old, last) -> last));
         List<DataLevelVo> vos = new ArrayList<>(collect.values());
         for (DataLevelVo vo : vos) {
-            DataSec dataSec = new DataSec();
+            FieldSec dataSec = new FieldSec();
             dataSec.setSecCode(vo.getLevelCode());
             dataSec.setSecName(vo.getLevelName());
             dataSec.setDataType(vo.getTypeCode());
@@ -152,29 +137,29 @@ public class DataSecServiceImpl implements IDataSecService {
 
 
     @Override
-    public List<DataSec> getByCodes(List<String> codes) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().in(DataSec::getSecCode, codes);
+    public List<FieldSec> getByCodes(List<String> codes) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(FieldSec::getSecCode, codes);
         return dataSecMapper.selectList(queryWrapper);
     }
 
     @Override
-    public List<DataSec> getAll() {
+    public List<FieldSec> getAll() {
         return dataSecMapper.selectList(null);
     }
 
     @Override
-    public List<DataSec> getByIds(List<String> ids) {
+    public List<FieldSec> getByIds(List<String> ids) {
         if(CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().in(DataSec::getId, ids);
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(FieldSec::getId, ids);
         return dataSecMapper.selectList(queryWrapper);
     }
 
-    private void saveByCode(DataSec dataSec) {
-        DataSec exist = this.getByCode(dataSec.getSecCode());
+    private void saveByCode(FieldSec dataSec) {
+        FieldSec exist = this.getByCode(dataSec.getSecCode());
         if(null == exist) {
             dataSec.setDeleted(BooleanEnum.FALSE.value);
             dataSec.setCreateTime(new Date());
@@ -187,9 +172,9 @@ public class DataSecServiceImpl implements IDataSecService {
         }
     }
 
-    private DataSec getByCode(String secCode) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().eq(DataSec::getSecCode, secCode);
+    private FieldSec getByCode(String secCode) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().eq(FieldSec::getSecCode, secCode);
         return dataSecMapper.selectOne(queryWrapper);
     }
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/FieldClaServiceImpl.java

@@ -3,7 +3,6 @@ package com.dragoninfo.dcuc.app.service.sub.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.cons.CommonCons;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;