Refactor/develop

settings/codestyle.xml

@@ -0,0 +1,31 @@
+<code_scheme name="tinye_code_style" version="173">
+  <JavaCodeStyleSettings>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="com" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="net" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+      </value>
+    </option>
+  </JavaCodeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="LAMBDA_BRACE_STYLE" value="3" />
+  </codeStyleSettings>
+</code_scheme>

src/main/java/com/tinyengine/it/controller/BlockController.java

@@ -0,0 +1,352 @@
+package com.tinyengine.it.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.tinyengine.it.common.base.Result;
+import com.tinyengine.it.config.log.SystemControllerLog;
+import com.tinyengine.it.mapper.BlockMapper;
+import com.tinyengine.it.mapper.TenantMapper;
+import com.tinyengine.it.model.dto.BlockDto;
+import com.tinyengine.it.model.dto.BlockParamDto;
+import com.tinyengine.it.model.entity.*;
+import com.tinyengine.it.service.material.BlockService;
+import com.tinyengine.it.service.material.TaskRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 区块
+ * </p>
+ *
+ * @author zhangjuncao
+ * @since 2024-10-30
+ */
+@Validated
+@RestController
+@CrossOrigin
+@RequestMapping("/material-center/api")
+public class BlockController {
+
+    @Autowired
+    BlockService blockService;
+    @Autowired
+    TenantMapper tenantMapper;
+    @Autowired
+    BlockMapper blockMapper;
+    @Autowired
+    TaskRecordService taskRecordService;
+
+    /**
+     * 获取block列表信息
+     *
+     * @param blockParamDto blockParamDto
+     * @return block列表信息
+     */
+    @Operation(summary = "获取区块列表信息",
+            description = "获取区块列表信息",
+            parameters = {
+                    @Parameter(name = "request", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取区块列表api")
+    @GetMapping("/block/list")
+    public Result<List<Block>> getAllBlocks(@RequestBody BlockParamDto blockParamDto) {
+        IPage<Block> blocksList = blockService.findBlocksByPagetionList(blockParamDto);
+        List<Block> result = blocksList.getRecords();
+        return Result.success(result);
+    }
+
+    /**
+     * 获取区块列表满足查询条件下的条数
+     *
+     * @param nameCn      name
+     * @param description description
+     * @return the integer
+     */
+    @Operation(summary = "获取区块列表满足查询条件下的条数",
+            description = "获取区块列表满足查询条件下的条数",
+            parameters = {
+                    @Parameter(name = "nameCn", description = "nameCn区块中文名称"),
+                    @Parameter(name = "description", description = "区块描述")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema())),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取区块列表满足查询条件下的条数")
+    @GetMapping("/block/count")
+    public Result<Integer> getCountByCondition(@RequestParam(value = "name_cn", required = false) String nameCn,
+                                               @RequestParam(value = "description", required = false) String description) {
+        // 获取查询条件name_cn、description,若为空查的是全部数据，若不为空按条件查询
+        List<Block> blocksList = blockMapper.findBlocksByNameCnAndDes(nameCn, description);
+        return Result.success(blocksList.size());
+    }
+
+    /**
+     * 根据id查询表block信息
+     *
+     * @param id id
+     * @return BlockDto
+     */
+    @Operation(summary = "查询区块详情",
+            description = "根据id查询表t_block信息并返回",
+            parameters = {
+                    @Parameter(name = "id", description = "区块Id")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回区块信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取区块详情api")
+    @GetMapping("/block/detail/{id}")
+    public Result<BlockDto> getBlocksById(@PathVariable Integer id) {
+        BlockDto blocks = blockMapper.findBlockAndGroupAndHistoByBlockId(id);
+        return Result.success(blocks);
+    }
+
+    /**
+     * 创建block
+     *
+     * @param blockDto the block dto
+     * @return BlockDto
+     */
+    @Operation(summary = "创建block",
+            description = "创建block",
+            parameters = {
+                    @Parameter(name = "map", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "区块创建api")
+    @PostMapping("/block/create")
+    public Result<BlockDto> createBlocks(@Valid @RequestBody BlockDto blockDto) {
+        return blockService.createBlock(blockDto);
+    }
+
+
+    /**
+     * 删除blocks信息
+     *
+     * @param id id
+     * @return BlockDto
+     */
+    @Operation(summary = "删除blocks信息",
+            description = "删除blocks信息",
+            parameters = {
+                    @Parameter(name = "id", description = "区块id")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "删除blocks信息")
+    @GetMapping("/block/delete/{id}")
+    public Result<BlockDto> deleteBlocks(@PathVariable Integer id) {
+        // 页面返回数据
+        BlockDto result = blockMapper.findBlockAndGroupAndHistoByBlockId(id);
+        blockService.deleteBlockById(id);
+        return Result.success(result);
+    }
+
+    /**
+     * 生态中心区块列表分页查询
+     *
+     * @param blockParamDto blockParamDto
+     * @return BlockDto
+     */
+    @Operation(summary = "生态中心区块列表分页查询",
+            description = "生态中心区块列表分页查询",
+            parameters = {
+                    @Parameter(name = "request", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema())),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "生态中心区块列表分页查询api")
+    @GetMapping("/block")
+    public Result<List<BlockDto>> find(@RequestBody BlockParamDto blockParamDto) {
+        IPage<Block> blocksIPage = blockService.findBlocksByPagetionList(blockParamDto);
+        List<Block> blocksList = blocksIPage.getRecords();
+        List<BlockDto> result = new ArrayList<>();
+        for (Block blocks : blocksList) {
+            List<BlockDto> blockDto = blockMapper.findBlockAndHistorByBlockId(blocks.getId());
+            result.addAll(blockDto);
+        }
+        return Result.success(result);
+    }
+
+    /**
+     * 查找表中所有tags
+     *
+     * @return the list
+     */
+    @Operation(summary = "查找表中所有tags",
+            description = "查找表中所有tags",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema())),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "查找表中所有tags")
+    @GetMapping("/block/tags")
+    public Result<List<String>> allTags() {
+        List<String> allTagsList = blockService.allTags();
+        return Result.success(allTagsList);
+    }
+
+
+    /**
+     * 获取区块列表list2
+     *
+     * @param request request
+     * @return the ipage
+     */
+    @Operation(summary = "获取区块列表list2",
+            description = "获取区块列表list2",
+            parameters = {
+                    @Parameter(name = "request", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema())),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取区块列表api")
+    @GetMapping("/block/list2")
+    public Result<IPage<Block>> getBlocks(@RequestBody Map<String, String> request) {
+        IPage<Block> BlocksList = blockService.findBlocksByConditionPagetion(request);
+        return Result.success(BlocksList);
+    }
+
+
+    /**
+     * 获取所有租户
+     *
+     * @return the list
+     */
+    @Operation(summary = "获取所有租户",
+            description = "获取所有租户",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Tenant.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取所有租户api")
+    @GetMapping("/block/tenants")
+    public Result<List<Tenant>> allTenant() {
+        List<Tenant> tenantsList = tenantMapper.queryAllTenant();
+        return Result.success(tenantsList);
+    }
+
+
+    /**
+     * 获取所有用户
+     *
+     * @return the list
+     */
+    @Operation(summary = "获取所有用户",
+            description = "获取所有用户",
+            parameters = {
+                    @Parameter(name = "blocks", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = User.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取所有用户api")
+    @GetMapping("/block/users")
+    public Result<List<User>> allAuthor() {
+
+        List<Block> blocksList = blockMapper.queryAllBlock();
+        List<User> userList = blockService.getUsers(blocksList);
+        return Result.success(userList);
+    }
+
+    /**
+     * 获取区块列表
+     *
+     * @param map map
+     * @return the list
+     */
+    @Operation(summary = "获取区块列表",
+            description = "获取区块列表",
+            parameters = {
+                    @Parameter(name = "map", description = "入参对象")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "获取区块列表")
+    @GetMapping("/blocks")
+    public Result<List<Block>> getAllBlockCategories(@Valid @RequestParam Map<String, String> map) {
+        return blockService.listNew(map);
+    }
+
+
+    /**
+     * 修改block
+     *
+     * @param blockDto blockDto
+     * @return block dto
+     */
+    @Operation(summary = "修改区块",
+            description = "修改区块",
+            parameters = {
+                    @Parameter(name = "blockDto", description = "入参对象"),
+                    @Parameter(name = "id", description = "区块id"),
+                    @Parameter(name = "appId", description = "appId")
+            },
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "返回信息",
+                            content = @Content(mediaType = "application/json",
+                                    schema = @Schema(implementation = Block.class))),
+                    @ApiResponse(responseCode = "400", description = "请求失败")}
+    )
+    @SystemControllerLog(description = "区块修改api")
+    @PostMapping("/block/update/{id}")
+    public Result<BlockDto> updateBlocks(@Valid @RequestBody BlockDto blockDto, @PathVariable Integer id, @RequestParam Integer appId) {
+        blockDto.setId(id);
+        BlockDto blocksResult = blockService.updateBlockById(blockDto);
+        return Result.success(blocksResult);
+    }
+
+
+}