Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -6,6 +6,7 @@ import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.DesignMapper;
 import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.Organization;
 import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.PaymentInfoVO;
@@ -206,4 +207,17 @@ public class ConvenientInquiryController {
         return Response.success(convenientInquiryService.getAllGenerateFuncName());
     }
 
+    @ApiOperation("添加组织机构")
+    @GetMapping("/addOrganization")
+    public Response<String> addOrganization(@ApiParam(value = "机构名") @RequestParam String name, @ApiParam(value = "Enterprise || Education") @RequestParam String type){
+        convenientInquiryService.addOrganization(name, type);
+        return Response.success();
+    }
+
+    @ApiOperation("查询所有企业或教育机构")
+    @GetMapping("/queryOrganization")
+    public Response<List<Organization>> queryOrganization(@ApiParam(value = "Enterprise || Education") @RequestParam String type){
+        return Response.success(convenientInquiryService.queryOrganization(type));
+    }
+
 }

src/main/java/com/ai/da/controller/LibraryController.java

@@ -27,10 +27,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 
 @Api(tags = "library模块")
@@ -210,4 +207,39 @@ public class LibraryController {
         return Response.success(libraryService.addSysModelToLib(sysModelId));
     }
 
+    @ApiOperation(value = "将个人library元素添加到公共库")
+    @GetMapping("addToPublicLibrary")
+    public Response<String> addToPublicLibrary(@ApiParam("元素的libraryId") @RequestParam("libraryId") Long libraryId){
+        boolean b = libraryService.saveToOrganizationLibrary(libraryId);
+        if (b){
+            return Response.success("success");
+        }else {
+            return Response.success("fail");
+        }
+    }
+
+    @ApiOperation(value = "将个人library元素从公共库中删除")
+    @GetMapping("deleteFromPublicLib")
+    public Response<String> deleteFromPublicLib(@ApiParam("元素的libraryId") @RequestParam("libraryId") Long libraryId){
+        libraryService.deleteFromPublicLib(libraryId);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "获取公共库")
+    @GetMapping("getPublicLib")
+    public Response<PageBaseResponse<Library>> getPublicLib(@ApiParam("排序" ) @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
+                                                @ApiParam("page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
+                                                @ApiParam("size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
+
+        return Response.success(libraryService.getPublicLib(order, page, size));
+    }
+
+    @ApiOperation(value = "管理员获取所有子账号lib元素")
+    @GetMapping("getAllSubAccLib")
+    public Response<PageBaseResponse<Library>> getAllSubAccLib(@ApiParam("排序") @RequestParam(value = "order", defaultValue = "DESC", required = false) String order,
+                                                   @ApiParam("page") @RequestParam(value = "page", defaultValue = "1", required = false) Long page,
+                                                   @ApiParam("size") @RequestParam(value = "size", defaultValue = "20", required = false) Long size){
+        return Response.success(libraryService.getAllSubAccLib(order, page, size));
+    }
+
 }

src/main/java/com/ai/da/controller/PortfolioController.java

@@ -154,4 +154,11 @@ public class PortfolioController {
                                                            @RequestParam(value = "tagId", required = false) Long tagId) {
         return Response.success(portfolioService.queryPortfolioByTag(tagName, tagId));
     }*/
+
+    @ApiOperation(value = "将企业或教育版中的作品发布到公共gallery")
+    @GetMapping("/toPublic")
+    public Response<String> setPortfolioToPublic(@RequestParam("portfolioId") Long portfolioId) {
+        portfolioService.setPortfolioToPublic(portfolioId);
+        return Response.success("success");
+    }
 }