fix: 修改大屏设计器、数据看板、组态分享后的数据，在编辑后会修改视图类型及访问凭证的bug

@@ -10,7 +10,7 @@ public class PublicCustomerDTO extends TenantDTO {
   private String publicId;
   private String publicId;
 
 
   @ApiModelProperty(value = "视图类型")
   @ApiModelProperty(value = "视图类型")
-  private ViewType viewType = ViewType.PRIVATE_VIEW;
+  private ViewType viewType;
 
 
   @ApiModelProperty(value = "访问凭证")
   @ApiModelProperty(value = "访问凭证")
   private String accessCredentials;
   private String accessCredentials;

@@ -73,6 +73,7 @@ public class TkConfigurationCenterServiceImpl
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
     TkConfigurationCenterEntity configurationCenter =
     TkConfigurationCenterEntity configurationCenter =
         configurationCenterDTO.getEntity(TkConfigurationCenterEntity.class);
         configurationCenterDTO.getEntity(TkConfigurationCenterEntity.class);
+    configurationCenter.setViewType(ViewType.PRIVATE_VIEW);
     baseMapper.insert(configurationCenter);
     baseMapper.insert(configurationCenter);
     Integer type = FastIotConstants.PC_TYPE;
     Integer type = FastIotConstants.PC_TYPE;
     String defaultContent =
     String defaultContent =
@@ -102,6 +103,7 @@ public class TkConfigurationCenterServiceImpl
     if (!configurationCenter.getTenantId().equals(configurationCenterDTO.getTenantId())) {
     if (!configurationCenter.getTenantId().equals(configurationCenterDTO.getTenantId())) {
       throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
       throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
     }
+    configurationCenterDTO.setAccessCredentials(configurationCenter.getAccessCredentials());
     baseMapper.updateById(configurationCenterDTO.getEntity(TkConfigurationCenterEntity.class));
     baseMapper.updateById(configurationCenterDTO.getEntity(TkConfigurationCenterEntity.class));
     return configurationCenterDTO;
     return configurationCenterDTO;
   }
   }

@@ -43,9 +43,7 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
         Optional.ofNullable(queryMap.get("tenantId"))
         Optional.ofNullable(queryMap.get("tenantId"))
             .map(Object::toString)
             .map(Object::toString)
             .orElseThrow(
             .orElseThrow(
-                () -> {
-                  throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-                });
+                () -> new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage()));
     String organizationId =
     String organizationId =
         null != queryMap.get("organizationId") ? queryMap.get("organizationId").toString() : null;
         null != queryMap.get("organizationId") ? queryMap.get("organizationId").toString() : null;
     List<String> organizationIds = null;
     List<String> organizationIds = null;
@@ -83,10 +81,11 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   @Transactional
   @Transactional
   public DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO) {
   public DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO) {
     TkDataBoardEntity dataBoard = dataBoardDTO.getEntity(TkDataBoardEntity.class);
     TkDataBoardEntity dataBoard = dataBoardDTO.getEntity(TkDataBoardEntity.class);
-    if(dataBoardDTO.getViewType().equals(ViewType.PRIVATE_VIEW)){
+    if(null != dataBoardDTO.getViewType() && dataBoardDTO.getViewType().equals(ViewType.PRIVATE_VIEW)){
       dataBoard.setAccessCredentials(null);
       dataBoard.setAccessCredentials(null);
     }
     }
     if (StringUtils.isEmpty(dataBoardDTO.getId())) {
     if (StringUtils.isEmpty(dataBoardDTO.getId())) {
+      dataBoard.setViewType(ViewType.PRIVATE_VIEW);
       baseMapper.insert(dataBoard);
       baseMapper.insert(dataBoard);
     } else {
     } else {
       if (null != dataBoardDTO.getLayout() && !dataBoardDTO.getLayout().isEmpty()) {
       if (null != dataBoardDTO.getLayout() && !dataBoardDTO.getLayout().isEmpty()) {
@@ -98,11 +97,12 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
                   .eq(TkDataBoardEntity::getId, dataBoardDTO.getId())
                   .eq(TkDataBoardEntity::getId, dataBoardDTO.getId())
                   .eq(TkDataBoardEntity::getTenantId, dataBoardDTO.getTenantId()));
                   .eq(TkDataBoardEntity::getTenantId, dataBoardDTO.getTenantId()));
       Optional.ofNullable(board)
       Optional.ofNullable(board)
-          .map(obj -> baseMapper.updateById(dataBoard))
+          .map(obj -> {
+            dataBoard.setAccessCredentials(obj.getAccessCredentials());
+            return baseMapper.updateById(dataBoard);
+          })
           .orElseThrow(
           .orElseThrow(
-              () -> {
-                throw new TkDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
-              });
+              () -> new TkDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage()));
     }
     }
     return dataBoard.getDTO(DataBoardDTO.class);
     return dataBoard.getDTO(DataBoardDTO.class);
   }
   }
@@ -138,10 +138,8 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
               return baseMapper.updateById(dataBoard) > 0;
               return baseMapper.updateById(dataBoard) > 0;
             })
             })
         .orElseThrow(
         .orElseThrow(
-            () -> {
-              throw new TkDataValidationException(
-                  ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
-            });
+            () -> new TkDataValidationException(
+                    ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage()));
   }
   }
 
 
   @Override
   @Override

@@ -73,6 +73,7 @@ public class TkDataViewServiceImpl extends AbstractBaseService<TkDataViewMapper,
   public TkDataViewDTO saveDataView(TkDataViewDTO tkDataViewDTO) {
   public TkDataViewDTO saveDataView(TkDataViewDTO tkDataViewDTO) {
     TkDataViewEntity dataView = tkDataViewDTO.getEntity(TkDataViewEntity.class);
     TkDataViewEntity dataView = tkDataViewDTO.getEntity(TkDataViewEntity.class);
     dataView.setState(0);
     dataView.setState(0);
+    dataView.setViewType(ViewType.PRIVATE_VIEW);
     baseMapper.insert(dataView);
     baseMapper.insert(dataView);
     TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
     TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
     contentDTO.setTenantId(dataView.getTenantId());
     contentDTO.setTenantId(dataView.getTenantId());
@@ -90,6 +91,7 @@ public class TkDataViewServiceImpl extends AbstractBaseService<TkDataViewMapper,
     }
     }
     //设计不修改状态
     //设计不修改状态
     tkDataViewDTO.setViewType(null);
     tkDataViewDTO.setViewType(null);
+    tkDataViewDTO.setAccessCredentials(dataView.getAccessCredentials());
     baseMapper.updateById(tkDataViewDTO.getEntity(TkDataViewEntity.class));
     baseMapper.updateById(tkDataViewDTO.getEntity(TkDataViewEntity.class));
     return tkDataViewDTO;
     return tkDataViewDTO;
   }
   }