fix:增加部分接口

pom.xml

@@ -9,10 +9,10 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.lqkj</groupId>
-    <artifactId>CMLCP-SERVER</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>CMLCP-SERVER</name>
-    <description>CMLCP-SERVER</description>
+    <artifactId>cmlcp</artifactId>
+    <version>1.0.0.${timestamp}</version>
+    <name>cmlcp</name>
+    <description>IOC低代码平台</description>
     <url/>
     <licenses>
         <license/>

src/main/java/com/lqkj/cmlcp/config/WebConfig.java

@@ -1,19 +1,19 @@
-package com.lqkj.cmlcp.config;
-
-import com.lqkj.cmlcp.filter.RequestUrlLoggingFilter;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
- 
-@Configuration
-public class WebConfig {
- 
-    @Bean
-    public FilterRegistrationBean<RequestUrlLoggingFilter> loggingFilter() {
-        FilterRegistrationBean<RequestUrlLoggingFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new RequestUrlLoggingFilter());
-        registrationBean.addUrlPatterns("/*");
-        registrationBean.setOrder(1);
-        return registrationBean;
-    }
-}
+//package com.lqkj.cmlcp.config;
+//
+//import com.lqkj.cmlcp.filter.RequestUrlLoggingFilter;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration
+//public class WebConfig {
+//
+//    @Bean
+//    public FilterRegistrationBean<RequestUrlLoggingFilter> loggingFilter() {
+//        FilterRegistrationBean<RequestUrlLoggingFilter> registrationBean = new FilterRegistrationBean<>();
+//        registrationBean.setFilter(new RequestUrlLoggingFilter());
+//        registrationBean.addUrlPatterns("/*");
+//        registrationBean.setOrder(1);
+//        return registrationBean;
+//    }
+//}

src/main/java/com/lqkj/cmlcp/config/WebMvcConfig.java

@@ -0,0 +1,57 @@
+package com.lqkj.cmlcp.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.mvc.WebContentInterceptor;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    /**
+     * 静态资源配置
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/upload/**")
+                .addResourceLocations("file:./upload/")
+                .setCacheControl(CacheControl.maxAge(0, TimeUnit.SECONDS));
+    }
+
+    /**
+     * 跨域配置
+     */
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.setAllowCredentials(true);
+        corsConfiguration.addAllowedOriginPattern("*");
+        corsConfiguration.setAllowedHeaders(List.of("accept", "authorization", "content-type", "cache-control"));
+        corsConfiguration.setAllowedMethods(List.of("POST", "GET", "PUT", "OPTIONS", "DELETE"));
+        UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(urlBasedCorsConfigurationSource);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        WebContentInterceptor contentInterceptor = new WebContentInterceptor();
+        contentInterceptor.setCacheSeconds(0);
+        contentInterceptor.setUseExpiresHeader(true);
+        contentInterceptor.setUseCacheControlNoStore(false);
+        contentInterceptor.setUseCacheControlHeader(true);
+        contentInterceptor.setUseCacheControlNoStore(false);
+        registry.addInterceptor(contentInterceptor);
+    }
+
+
+}

src/main/java/com/lqkj/cmlcp/module/api/controller/ApiInfoController.java

@@ -27,7 +27,7 @@ public class ApiInfoController {
 
     @GetMapping("/getAll")
     public Result getConfig(@RequestParam(required = false, defaultValue = "") String name,
-                            @RequestParam(required = true) Integer type) {
+                            @RequestParam() Integer type) {
         return Result.ok(apiInfoService.findAll(name, type));
     }
 
@@ -37,4 +37,9 @@ public class ApiInfoController {
         return Result.ok();
     }
 
+    @GetMapping("/getApi")
+    public Result getApi(@RequestParam Integer id) {
+        return Result.ok(apiInfoService.findById(id));
+    }
+
 }

src/main/java/com/lqkj/cmlcp/module/api/service/ApiInfoService.java

@@ -12,4 +12,5 @@ public interface ApiInfoService {
 
     void delete(List<Integer> ids);
 
+    ApiInfo findById(Integer id);
 }

src/main/java/com/lqkj/cmlcp/module/api/service/impl/ApiInfoServiceImpl.java

@@ -32,4 +32,9 @@ public class ApiInfoServiceImpl implements ApiInfoService {
     public void delete(List<Integer> ids) {
         apiInfoRepository.deleteAllById(ids);
     }
+
+    @Override
+    public ApiInfo findById(Integer id) {
+        return apiInfoRepository.findById(id).get();
+    }
 }

src/main/java/com/lqkj/cmlcp/module/zone/controller/ProjectInfoController.java

@@ -40,4 +40,26 @@ public class ProjectInfoController {
         projectInfoService.delete(ids);
         return Result.ok();
     }
+
+    /**
+     * 获取回收站列表
+     * @param name
+     * @return
+     */
+    @PostMapping("/getRBList")
+    public Result getRBList(@RequestParam(required = false) String name){
+        return Result.ok(projectInfoService.getRBList(name));
+    }
+
+    /**
+     * 恢复
+     * @param ids
+     * @return
+     */
+    @PostMapping("/restore")
+    public Result restore(@RequestBody List<Integer> ids){
+        projectInfoService.restoxre(ids);
+        return Result.ok();
+    }
+
 }

src/main/java/com/lqkj/cmlcp/module/zone/controller/ZoneInfoController.java

@@ -49,4 +49,14 @@ public class ZoneInfoController {
     public Result getList(@RequestParam Integer projectId) {
         return Result.ok(zoneInfoService.getList(projectId));
     }
+
+    /**
+     * 根据id获取态势/作品
+     * @param id
+     * @return
+     */
+    @PostMapping("/getZone")
+    public Result getZone(@RequestParam Integer id) {
+        return Result.ok(zoneInfoService.findById(id));
+    }
 }

src/main/java/com/lqkj/cmlcp/module/zone/repository/ProjectInfoRepository.java

@@ -4,17 +4,39 @@ import com.lqkj.cmlcp.module.zone.domain.ProjectInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public interface ProjectInfoRepository extends JpaRepository<ProjectInfo, Integer> {
 
     @Query(nativeQuery = true,
             value = "select * from project_info t where t.is_delete = false " +
-                    "and (:projectName = '' or project_name like concat('%', :projectName, '%'))")
+                    "and (:projectName = '' or project_name like concat('%', :projectName, '%')) order by update_time DESC ")
     Page<ProjectInfo> pageQuery(@Param("projectName") String projectName, PageRequest pageRequest);
 
     ProjectInfo findByProjectName(String projectName);
+
+    /**
+     * 获取回收站列表
+     * @param projectName
+     * @return
+     */
+    @Query(nativeQuery = true,
+            value = "select * from project_info t where t.is_delete = true " +
+                    "and (:projectName = '' or project_name like concat('%', :projectName, '%'))")
+    List<ProjectInfo> getRBList(@Param("projectName") String projectName);
+
+    /**
+     * 恢复项目
+     * @param ids
+     */
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "update project_info set is_delete = false where id in :ids")
+    void restoxre(@Param("ids") List<Integer> ids);
 }

src/main/java/com/lqkj/cmlcp/module/zone/repository/ZoneInfoRepository.java

@@ -14,8 +14,8 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
 
     @Query(nativeQuery = true,
             value = "select * from zone_info t where t.is_delete = false " +
-            "and (:name = '' or zone_name like concat('%', :name, '%'))")
+            "and (:name = '' or zone_name like concat('%', :name, '%')) order by update_time DESC ")
     Page<ZoneInfo> pageQuery(@Param("name") String name, PageRequest pageRequest);
 
-    ZoneInfo findByZoneName(String zoneName);
+    ZoneInfo findByZoneNameAndProjectId(String zoneName, Integer projectId);
 }

src/main/java/com/lqkj/cmlcp/module/zone/service/ProjectInfoService.java

@@ -11,4 +11,17 @@ public interface ProjectInfoService {
     void save(ProjectInfo projectInfo);
 
     void delete(List<Integer> ids);
+
+    /**
+     * 获取回收站列表
+     * @param name
+     * @return
+     */
+    List<ProjectInfo> getRBList(String name);
+
+    /**
+     * 恢复项目
+     * @param ids
+     */
+    void restoxre(List<Integer> ids);
 }

src/main/java/com/lqkj/cmlcp/module/zone/service/ZoneInfoService.java

@@ -18,4 +18,11 @@ public interface ZoneInfoService{
      * @return
      */
     List<ZoneInfo> getList(Integer projectId);
+
+    /**
+     * 根据id获取作品信息
+     * @param id
+     * @return
+     */
+    ZoneInfo findById(Integer id);
 }

src/main/java/com/lqkj/cmlcp/module/zone/service/impl/ProjectInfoServiceImpl.java

@@ -33,6 +33,7 @@ public class ProjectInfoServiceImpl implements ProjectInfoService {
         if (Objects.nonNull(projectInfo.getId()) && !projectInfo.getId().equals(oldProject.getId())) throw new RuntimeException("项目名称已存在");
         if (Objects.isNull(projectInfo.getId()) && Objects.nonNull(oldProject)) throw new RuntimeException("项目名称已存在");
         if (Objects.isNull(projectInfo.getId())) projectInfo.setCreateTime(new Date());
+        if (Objects.nonNull(projectInfo.getId())) projectInfo.setCreateTime(projectInfoRepository.findById(projectInfo.getId()).get().getCreateTime());
         projectInfo.setIsDelete(false);
         projectInfo.setUpdateTime(new Date());
         projectInfoRepository.save(projectInfo);
@@ -42,4 +43,15 @@ public class ProjectInfoServiceImpl implements ProjectInfoService {
     public void delete(List<Integer> ids) {
         projectInfoRepository.deleteAllById(ids);
     }
+
+    @Override
+    public List<ProjectInfo> getRBList(String name) {
+        return projectInfoRepository.getRBList(name);
+    }
+
+    @Transactional
+    @Override
+    public void restoxre(List<Integer> ids) {
+        projectInfoRepository.restoxre(ids);
+    }
 }

src/main/java/com/lqkj/cmlcp/module/zone/service/impl/ZoneInfoServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,11 +30,12 @@ public class ZoneInfoServiceImpl implements ZoneInfoService {
 
     @Override
     public void save(ZoneInfo zoneInfo) {
-        ZoneInfo oldzone = zoneInfoRepository.findByZoneName(zoneInfo.getZoneName());
+        ZoneInfo oldzone = zoneInfoRepository.findByZoneNameAndProjectId(zoneInfo.getZoneName(), zoneInfo.getProjectId());
         if (Objects.nonNull(zoneInfo.getId()) && Objects.nonNull(oldzone)
                 && !oldzone.getId().equals(zoneInfo.getId())) throw new RuntimeException("作品名称已存在");
         if (Objects.isNull(zoneInfo.getId()) && Objects.nonNull(oldzone)) throw new RuntimeException("作品名称已存在");
         if (Objects.isNull(zoneInfo.getId())) zoneInfo.setCreateTime(new Date());
+        if (Objects.nonNull(zoneInfo.getId())) zoneInfo.setCreateTime(zoneInfoRepository.findById(zoneInfo.getId()).get().getCreateTime());
         zoneInfo.setIsDelete(false);
         zoneInfo.setUpdateTime(new Date());
         zoneInfoRepository.save(zoneInfo);
@@ -52,7 +54,12 @@ public class ZoneInfoServiceImpl implements ZoneInfoService {
 
     @Override
     public List<ZoneInfo> getList(Integer projectId) {
-        return zoneInfoRepository.findAll(Example.of(new ZoneInfo(projectId)));
+        return zoneInfoRepository.findAll(Example.of(new ZoneInfo(projectId)), Sort.by(Sort.Order.desc("updateTime")));
+    }
+
+    @Override
+    public ZoneInfo findById(Integer id) {
+        return zoneInfoRepository.findById(id).orElse(null);
     }
 
 }