diff --git a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java index c03c5bb5..cacdf4d5 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java +++ b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java @@ -24,13 +24,12 @@ import java.util.List; @Configuration -public class WebConfig implements WebMvcConfigurer { +public class WebConfig implements WebMvcConfigurer { @Value("${cors.allowed-origins}") private String allowedOrigins; @Bean - public CorsFilter corsFilter() - { + public CorsFilter corsFilter() { // 跨域配置地址 List crosDomainList = Arrays.asList(allowedOrigins.split(",")); @@ -46,6 +45,6 @@ public CorsFilter corsFilter() UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", corsConfiguration); - return new CorsFilter(source); - } + return new CorsFilter(source); + } } diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java index 3b7a6feb..390d5be2 100644 --- a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java +++ b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java @@ -18,7 +18,6 @@ import com.tinyengine.it.model.dto.BundleResultDto; import com.tinyengine.it.model.dto.CustComponentDto; import com.tinyengine.it.model.dto.FileResult; -import com.tinyengine.it.model.entity.Component; import com.tinyengine.it.service.material.ComponentService; import io.swagger.v3.oas.annotations.Operation; @@ -38,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; -import java.util.List; /** * 组件api diff --git a/base/src/main/java/com/tinyengine/it/model/dto/PackagesDto.java b/base/src/main/java/com/tinyengine/it/model/dto/PackagesDto.java index d511636f..0f8b6fec 100644 --- a/base/src/main/java/com/tinyengine/it/model/dto/PackagesDto.java +++ b/base/src/main/java/com/tinyengine/it/model/dto/PackagesDto.java @@ -32,5 +32,5 @@ public class PackagesDto { private String version; private String script; private String css; - private Map others; + private Map others; } diff --git a/base/src/main/java/com/tinyengine/it/model/entity/App.java b/base/src/main/java/com/tinyengine/it/model/entity/App.java index 70fe58cc..a972626a 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/App.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/App.java @@ -24,8 +24,6 @@ import lombok.Setter; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java index 3b8a4a03..2e62fa27 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java @@ -252,19 +252,20 @@ private SchemaMeta getSchemaMeta(MetaDto metaDto) { * * @return List the List */ - private List getPackages(){ + private List getPackages() { List componentLibraryList = componentLibraryMapper.queryAllComponentLibrary(); List packagesDtoList = new ArrayList<>(); - if(componentLibraryList.isEmpty()){ + if (componentLibraryList.isEmpty()) { return packagesDtoList; } - for (ComponentLibrary componentLibrary: componentLibraryList){ + for (ComponentLibrary componentLibrary : componentLibraryList) { PackagesDto pakagesDto = new PackagesDto(); BeanUtils.copyProperties(componentLibrary, pakagesDto); packagesDtoList.add(pakagesDto); } return packagesDtoList; } + /** * 获取应用信息 * @@ -497,11 +498,11 @@ public List> getSchemaComponentsMap(MetaDto metaDto) { // 转换组件数据为schema List components = materialHistory.getComponents(); List componentLibraryList = componentLibraryMapper.queryAllComponentLibrary(); - if(!componentLibraryList.isEmpty()){ - List componentList = componentLibraryList.stream() - .flatMap(componentLibrary -> componentLibrary.getComponents().stream()) // 扁平化每个 List - .collect(Collectors.toList()); // 收集到一个新的 List - components.addAll(componentList); + if (!componentLibraryList.isEmpty()) { + List componentList = componentLibraryList.stream() + .flatMap(componentLibrary -> componentLibrary.getComponents().stream()) // 扁平化每个 List + .collect(Collectors.toList()); // 收集到一个新的 List + components.addAll(componentList); } List> componentsSchema = getComponentSchema(components); // 合并两个 List diff --git a/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java b/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java index 14b53a1f..7adf7792 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java @@ -15,7 +15,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Material; -import com.tinyengine.it.model.entity.MaterialHistory; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java index c63f967f..34aca33c 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java @@ -77,13 +77,13 @@ public List queryComponentLibraryByCondition(ComponentLibrary * @return execute success data number */ @Override - public Result deleteComponentLibraryById(@Param("id") Integer id) { + public Result deleteComponentLibraryById(@Param("id") Integer id) { Result result = this.queryComponentLibraryById(id); - if(result.getData() == null || result.getData().getId() == null){ + if (result.getData() == null || result.getData().getId() == null) { return Result.success(); } - int deleteResult = componentLibraryMapper.deleteComponentLibraryById(id); - if(deleteResult != 1){ + int deleteResult = componentLibraryMapper.deleteComponentLibraryById(id); + if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } return result; @@ -97,9 +97,9 @@ public Result deleteComponentLibraryById(@Param("id") Integer * @return execute success data number */ @Override - public Result updateComponentLibraryById(ComponentLibrary componentLibrary) { + public Result updateComponentLibraryById(ComponentLibrary componentLibrary) { int updateResult = componentLibraryMapper.updateComponentLibraryById(componentLibrary); - if(updateResult != 1){ + if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } Result result = this.queryComponentLibraryById(componentLibrary.getId()); @@ -113,9 +113,9 @@ public Result updateComponentLibraryById(ComponentLibrary com * @return execute success data number */ @Override - public Result createComponentLibrary(ComponentLibrary componentLibrary) { + public Result createComponentLibrary(ComponentLibrary componentLibrary) { int createResult = componentLibraryMapper.createComponentLibrary(componentLibrary); - if(createResult != 1){ + if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } Result result = this.queryComponentLibraryById(componentLibrary.getId()); diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java index 4e3ab51c..8ff669ca 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java @@ -77,9 +77,9 @@ public List queryMaterialByCondition(Material material) { * @return execute success data number */ @Override - public Result deleteMaterialById(@Param("id") Integer id) { - int deleteResult = materialMapper.deleteMaterialById(id); - if(deleteResult != 1){ + public Result deleteMaterialById(@Param("id") Integer id) { + int deleteResult = materialMapper.deleteMaterialById(id); + if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } Result result = this.queryMaterialById(id); @@ -94,9 +94,9 @@ public Result deleteMaterialById(@Param("id") Integer id) { * @return execute success data number */ @Override - public Result updateMaterialById(Material material) { + public Result updateMaterialById(Material material) { int updateResult = materialMapper.updateMaterialById(material); - if(updateResult != 1){ + if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } Result result = this.queryMaterialById(material.getId()); @@ -110,9 +110,9 @@ public Result updateMaterialById(Material material) { * @return execute success data number */ @Override - public Result createMaterial(Material material) { + public Result createMaterial(Material material) { int createResult = materialMapper.createMaterial(material); - if(createResult != 1){ + if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } Result result = this.queryMaterialById(material.getId()); diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java index 2790414e..8abc1728 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java @@ -17,7 +17,6 @@ import com.tinyengine.it.mapper.MaterialMapper; import com.tinyengine.it.model.entity.Material; -import com.tinyengine.it.model.entity.MaterialHistory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;