Merge branch 'feature/v2.3.0-sub-obj' into 'develop'

app-service目录结构修改

See merge request dcuc-tjdsj/app-service!49

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

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.facade.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;
@@ -23,7 +24,7 @@ public interface IDataClaFacade {
      * @return
      */
     @PostMapping("dataClassifyAdd")
-    Boolean dataClassifyAdd(@RequestBody DataClaAcceptDTO dto);
+    ResponseStatus dataClassifyAdd(@RequestBody DataClaAcceptDTO dto);
 
     /**
      * 数据资源分类详情

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

@@ -20,8 +20,8 @@ public interface IDataLevelFacade {
      * @param dto
      * @return
      */
-    @PostMapping("saveOrUpdate")
-    DataLevelDTO saveOrUpdate(@RequestBody DataLevelDTO dto);
+    @PostMapping("dataLevelAdd")
+    ResponseStatus dataLevelAdd(@RequestBody DataLevelDTO dto);
 
     /**
      * 查看详情

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

@@ -20,8 +20,8 @@ public interface IDataSecFacade {
      * @param dto
      * @return
      */
-    @PostMapping("saveOrUpdate")
-    DataSecDTO saveOrUpdate(@RequestBody DataSecDTO dto);
+    @PostMapping("dataLevelAdd")
+    ResponseStatus dataLevelAdd(@RequestBody DataSecDTO dto);
 
     /**
      * 查看详情

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

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.facade.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;
@@ -23,7 +24,7 @@ public interface IFieldClaFacade {
      * @return
      */
     @PostMapping("fieldClassifyAdd")
-    Boolean fieldClassifyAdd(@RequestBody FieldClaAcceptDTO dto);
+    ResponseStatus fieldClassifyAdd(@RequestBody FieldClaAcceptDTO dto);
 
     /**
      * 两级字段分类修改

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataCla.java

@@ -75,6 +75,7 @@ public class DataCla implements Serializable {
      * 是否删除
      */
     @TableLogic
+    @TableField(jdbcType = JdbcType.VARCHAR,value = "deleted", condition = "%s='0'")
     private String deleted;
 
 

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataLevel.java

@@ -50,6 +50,7 @@ public class DataLevel implements Serializable {
      * 是否删除
      */
     @TableLogic
+    @TableField(jdbcType = JdbcType.VARCHAR,value = "deleted", condition = "%s='0'")
     private String deleted;
 
 

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

@@ -49,6 +49,7 @@ public class DataSec implements Serializable {
      * 是否删除
      */
     @TableLogic
+    @TableField(jdbcType = JdbcType.VARCHAR,value = "deleted", condition = "%s='0'")
     private String deleted;
 
 

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/FieldCla.java

@@ -64,6 +64,7 @@ public class FieldCla implements Serializable {
      * 是否删除
      */
     @TableLogic
+    @TableField(jdbcType = JdbcType.VARCHAR,value = "deleted", condition = "%s='0'")
     private String deleted;
 
 

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

@@ -12,10 +12,10 @@ import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
 import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
-import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
-import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
-import com.dragoninfo.dcuc.app.sub.service.IDataSecService;
-import com.dragoninfo.dcuc.app.sub.service.IFieldClaService;
+import com.dragoninfo.dcuc.app.service.sub.IDataClaService;
+import com.dragoninfo.dcuc.app.service.sub.IDataLevelService;
+import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
+import com.dragoninfo.dcuc.app.service.sub.IFieldClaService;
 import com.dragoninfo.dcuc.app.vo.*;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
@@ -189,7 +189,9 @@ public class DataResourceFacade implements IDataResourceFacade {
         combineTreeNode(secNodes, thirdNodes);
         combineTreeNode(thirdNodes, fourNodes);
         topTreeVo.setChild(firNodes);
-        getTotalCount(topTreeVo);
+
+        //计算总数量
+        resourceVo.setTotal(getTotalCount(topTreeVo));
         resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
         return resourceVo;
     }
@@ -217,11 +219,11 @@ public class DataResourceFacade implements IDataResourceFacade {
         Map<String, List<FieldCla>> levelMap = fieldClaList.stream().collect(Collectors.groupingBy(FieldCla::getLevel));
         List<DataResourceTreeVo> firNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.FIR.getLevel())).orElse(new ArrayList<>())
                 .stream().map(item -> convertFieldClaToNode(item, null)).collect(Collectors.toList());
-        List<DataResourceTreeVo> secNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.FIR.getLevel())).orElse(new ArrayList<>())
+        List<DataResourceTreeVo> secNodes = Optional.ofNullable(levelMap.get(FieldClaTypeEnum.SEC.getLevel())).orElse(new ArrayList<>())
                 .stream().map(item -> convertFieldClaToNode(item, item.getFirId())).collect(Collectors.toList());
         combineTreeNode(firNodes, secNodes);
         topTreeVo.setChild(firNodes);
-        getTotalCount(topTreeVo);
+        resourceVo.setTotal(getTotalCount(topTreeVo));
         resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
         return resourceVo;
     }

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

@@ -1,10 +1,10 @@
-package com.dragoninfo.dcuc.app.sub.facade;
+package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.facade.sub.IDataClaFacade;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataCla;
-import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
+import com.dragoninfo.dcuc.app.service.sub.IDataClaService;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,7 @@ public class DataClaFacade implements IDataClaFacade {
     private IDataClaService dataClaService;
 
     @Override
-    public Boolean dataClassifyAdd(DataClaAcceptDTO dto) {
+    public ResponseStatus dataClassifyAdd(DataClaAcceptDTO dto) {
         return dataClaService.dataClassifyAdd(dto);
     }
 

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

@@ -1,9 +1,8 @@
-package com.dragoninfo.dcuc.app.sub.facade;
+package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.facade.sub.IDataLevelFacade;
 import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
-import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
+import com.dragoninfo.dcuc.app.service.sub.IDataLevelService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;
@@ -25,10 +24,8 @@ public class DataLevelFacade implements IDataLevelFacade {
 
 
     @Override
-    public DataLevelDTO saveOrUpdate(DataLevelDTO dto) {
-        DataLevel dataLevel = dataLevelService.saveOrUpdate(dto);
-        dto.setId(dataLevel.getId());
-        return dto;
+    public ResponseStatus dataLevelAdd(DataLevelDTO dto) {
+       return dataLevelService.dataLevelAdd(dto);
     }
 
     @Override

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

@@ -1,9 +1,8 @@
-package com.dragoninfo.dcuc.app.sub.facade;
+package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.facade.sub.IDataSecFacade;
 import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataSec;
-import com.dragoninfo.dcuc.app.sub.service.IDataSecService;
+import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;
@@ -25,10 +24,8 @@ public class DataSecFacade implements IDataSecFacade {
 
 
     @Override
-    public DataSecDTO saveOrUpdate(DataSecDTO dto) {
-        DataSec sec = dataSecService.saveOrUpdate(dto);
-        dto.setId(sec.getId());
-        return dto;
+    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+        return dataSecService.dataLevelAdd(dto);
     }
 
 

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

@@ -1,10 +1,10 @@
-package com.dragoninfo.dcuc.app.sub.facade;
+package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.facade.sub.IFieldClaFacade;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
-import com.dragoninfo.dcuc.app.sub.service.IFieldClaService;
+import com.dragoninfo.dcuc.app.service.sub.IFieldClaService;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class FieldClaFacade implements IFieldClaFacade {
     private IFieldClaService fieldClaService;
 
     @Override
-    public Boolean fieldClassifyAdd(FieldClaAcceptDTO dto) {
+    public ResponseStatus fieldClassifyAdd(FieldClaAcceptDTO dto) {
         return fieldClaService.fieldClassifyAdd(dto);
     }
 

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.mapper;
+package com.dragoninfo.dcuc.app.mapper.sub;
 
 import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.mapper;
+package com.dragoninfo.dcuc.app.mapper.sub;
 
 import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.mapper;
+package com.dragoninfo.dcuc.app.mapper.sub;
 
 import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.mapper;
+package com.dragoninfo.dcuc.app.mapper.sub;
 
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;

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

@@ -1,9 +1,10 @@
-package com.dragoninfo.dcuc.app.sub.service;
+package com.dragoninfo.dcuc.app.service.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;
 
@@ -21,7 +22,7 @@ public interface IDataClaService {
      * @param dto
      * @return
      */
-    Boolean dataClassifyAdd(DataClaAcceptDTO dto);
+    ResponseStatus dataClassifyAdd(DataClaAcceptDTO dto);
 
     /**
      * 更新

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.service;
+package com.dragoninfo.dcuc.app.service.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
@@ -17,11 +17,11 @@ import java.util.List;
 public interface IDataLevelService {
 
     /**
-     * 数据分级保存或更新
+     * 数据分级保存
      * @param dto
      * @return
      */
-    DataLevel saveOrUpdate(DataLevelDTO dto);
+    ResponseStatus dataLevelAdd(DataLevelDTO dto);
 
     /**
      * 更新

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.service;
+package com.dragoninfo.dcuc.app.service.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataSec;
@@ -21,7 +21,7 @@ public interface IDataSecService {
      * @param dto
      * @return
      */
-    DataSec saveOrUpdate(DataSecDTO dto);
+    ResponseStatus dataLevelAdd(DataSecDTO dto);
 
     /**
      * 更新

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

@@ -1,9 +1,10 @@
-package com.dragoninfo.dcuc.app.sub.service;
+package com.dragoninfo.dcuc.app.service.sub;
 
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;
 
@@ -21,7 +22,7 @@ public interface IFieldClaService {
      * @param dto
      * @return
      */
-    Boolean fieldClassifyAdd(FieldClaAcceptDTO dto);
+    ResponseStatus fieldClassifyAdd(FieldClaAcceptDTO dto);
 
     /**
      * 字段分类保存

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

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.service.impl;
+package com.dragoninfo.dcuc.app.service.sub.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,9 +9,10 @@ import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
 import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
-import com.dragoninfo.dcuc.app.sub.mapper.DataClaMapper;
-import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
+import com.dragoninfo.dcuc.app.mapper.sub.DataClaMapper;
+import com.dragoninfo.dcuc.app.service.sub.IDataClaService;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+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;
@@ -41,7 +42,7 @@ public class DataClaServiceImpl implements IDataClaService {
     private DataClaMapper dataClaMapper;
 
     @Override
-    public Boolean dataClassifyAdd(DataClaAcceptDTO dto) {
+    public ResponseStatus dataClassifyAdd(DataClaAcceptDTO dto) {
         boolean saveFlag = false;
         String path = null;
 
@@ -104,17 +105,18 @@ public class DataClaServiceImpl implements IDataClaService {
         if(!saveFlag) {
             lab = getByCodeAndPath(dto.getLabCode(), path);
         }
-        if(null == lab) {
-            DataClaDTO dataClaDTO = new DataClaDTO(dto.getLabCode()
-                    ,dto.getLabName(), DataClaTypeEnum.LAB.getLevel(), DataClaTypeEnum.LAB.getCode());
-            dataClaDTO.setRemark(dto.getRemark());
-            dataClaDTO.setFirId(firId);
-            dataClaDTO.setSecId(secId);
-            dataClaDTO.setDataType(dto.getLabClaCode());
-            dataClaDTO.setLabClaId(labClaId);
-            save(dataClaDTO);
+        if(null != lab) {
+            return ResponseStatus.fail("标签代码已存在");
         }
-        return saveFlag;
+        DataClaDTO dataClaDTO = new DataClaDTO(dto.getLabCode()
+                ,dto.getLabName(), DataClaTypeEnum.LAB.getLevel(), DataClaTypeEnum.LAB.getCode());
+        dataClaDTO.setRemark(dto.getRemark());
+        dataClaDTO.setFirId(firId);
+        dataClaDTO.setSecId(secId);
+        dataClaDTO.setDataType(dto.getLabClaCode());
+        dataClaDTO.setLabClaId(labClaId);
+        save(dataClaDTO);
+        return ResponseStatus.success();
     }
 
     @Override

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

@@ -1,12 +1,14 @@
-package com.dragoninfo.dcuc.app.sub.service.impl;
+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.DataCla;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
 import com.dragoninfo.dcuc.app.dto.sub.ExcelDataLevel;
 import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
-import com.dragoninfo.dcuc.app.sub.mapper.DataLevelMapper;
-import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
+import com.dragoninfo.dcuc.app.mapper.sub.DataLevelMapper;
+import com.dragoninfo.dcuc.app.service.sub.IDataLevelService;
 import com.dragoninfo.dcuc.app.util.ImportUtil;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
@@ -14,6 +16,7 @@ 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;
@@ -50,16 +53,18 @@ public class DataLevelServiceImpl implements IDataLevelService {
     private IDuceapUploadFacade uploadFacade;
 
     @Override
-    public DataLevel saveOrUpdate(DataLevelDTO dto) {
-        String id = dto.getId();
-        DataLevel dataLevel;
-        if(StringUtils.isBlank(id)) {
-            dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_LEVEL.value);
-            dataLevel = save(dto);
-        } else {
-            dataLevel = update(dto);
+    public ResponseStatus dataLevelAdd(DataLevelDTO dto) {
+        String levelCode = dto.getLevelCode();
+        if(StringUtils.isBlank(levelCode)) {
+            return ResponseStatus.fail("代码不能为空");
         }
-        return dataLevel;
+        DataLevel exist = getByCode(levelCode);
+        if(null != exist) {
+            return ResponseStatus.fail("代码已存在");
+        }
+        dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_LEVEL.value);
+        save(dto);
+        return ResponseStatus.success();
     }
 
     @Override

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

@@ -1,12 +1,14 @@
-package com.dragoninfo.dcuc.app.sub.service.impl;
+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.sub.mapper.DataSecMapper;
-import com.dragoninfo.dcuc.app.sub.service.IDataSecService;
+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;
@@ -14,6 +16,7 @@ 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;
@@ -51,16 +54,19 @@ public class DataSecServiceImpl implements IDataSecService {
 
 
     @Override
-    public DataSec saveOrUpdate(DataSecDTO dto) {
-        String id = dto.getId();
-        DataSec dataSec;
-        if (StringUtils.isBlank(id)) {
-            dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_SEC.value);
-            dataSec = save(dto);
-        } else {
-            dataSec = update(dto);
+    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+        String code = dto.getSecCode();
+        if(StringUtils.isBlank(code)) {
+            return ResponseStatus.fail("代码不能为空");
         }
-        return dataSec;
+        DataSec exist = getByCode(code);
+        if(null != exist) {
+            return ResponseStatus.fail("代码已存在");
+        }
+        dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_SEC.value);
+        save(dto);
+
+        return ResponseStatus.success();
     }
 
     @Override

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

@@ -1,16 +1,18 @@
-package com.dragoninfo.dcuc.app.sub.service.impl;
+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;
 import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
-import com.dragoninfo.dcuc.app.sub.mapper.FieldClaMapper;
-import com.dragoninfo.dcuc.app.sub.service.IFieldClaService;
+import com.dragoninfo.dcuc.app.mapper.sub.FieldClaMapper;
+import com.dragoninfo.dcuc.app.service.sub.IFieldClaService;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+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;
@@ -39,7 +41,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
     private FieldClaMapper fieldClaMapper;
 
     @Override
-    public Boolean fieldClassifyAdd(FieldClaAcceptDTO dto) {
+    public ResponseStatus fieldClassifyAdd(FieldClaAcceptDTO dto) {
         boolean saveFlag = false;
         String firId;
         String path = null;
@@ -59,16 +61,16 @@ public class FieldClaServiceImpl implements IFieldClaService {
         if(!saveFlag) {
             sec = getByCodeAndPath(dto.getSecCode(), path);
         }
-        if(null == sec) {
-            saveFlag = true;
-            FieldClaDTO fieldClaDTO = new FieldClaDTO(dto.getSecCode(),dto.getSecName(),
-                    FieldClaTypeEnum.SEC.getLevel(), FieldClaTypeEnum.SEC.getCode());
-            fieldClaDTO.setFirId(firId);
-            fieldClaDTO.setRemark(dto.getRemark());
-            fieldClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_FIELD_SEC.value);
-            save(fieldClaDTO);
+        if (null != sec) {
+            return ResponseStatus.fail("二级代码已存在");
         }
-        return saveFlag;
+        FieldClaDTO fieldClaDTO = new FieldClaDTO(dto.getSecCode(),dto.getSecName(),
+                FieldClaTypeEnum.SEC.getLevel(), FieldClaTypeEnum.SEC.getCode());
+        fieldClaDTO.setFirId(firId);
+        fieldClaDTO.setRemark(dto.getRemark());
+        fieldClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_FIELD_SEC.value);
+        save(fieldClaDTO);
+        return ResponseStatus.success();
     }
 
     @Override

dcuc-app-service/src/test/java/com/dragoninfo/dcuc/app/mapper/ApplyInfoMapperTest.java

@@ -4,12 +4,18 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dragoninfo.dcuc.app.DcucAppApplication;
+import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
+import com.dragoninfo.dcuc.app.mapper.sub.DataLevelMapper;
+import com.dragoninfo.dcuc.app.service.sub.IDataLevelService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
@@ -21,7 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/10/28
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {DcucAppApplication.class})
 @Transactional
 @Rollback()
 public class ApplyInfoMapperTest {
@@ -29,6 +35,9 @@ public class ApplyInfoMapperTest {
     @Autowired
     private ApplyInfoMapper applyInfoMapper;
 
+    @Autowired
+    private IDataLevelService dataLevelService;
+
     @Test
     public void getNewSort() {
         String newSort = applyInfoMapper.getNewSort();
@@ -66,4 +75,17 @@ public class ApplyInfoMapperTest {
 
     }
 
+    @Test
+    public void dataLevel() {
+        DataLevel dataLevel = dataLevelService.getById("fabd5a433bd67d1b36373d11edd20a09");
+        dataLevel.setRemark("xiugai111");
+        DataLevelDTO dto = new DataLevelDTO();
+        BeanUtils.copyProperties(dataLevel, dto);
+        dto.setLevelName("XG1111");
+        dataLevelService.update(dto);
+
+    }
+
+
+
 }