From e3bac98f092a10c0e897143bece3abbcc59469f2 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 27 Oct 2023 10:06:24 +0800 Subject: [PATCH] fix:小程序提交 --- screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java index 02165ba..c75a0e4 100644 --- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java +++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java @@ -1,6 +1,16 @@ package com.moral.api.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; +import com.moral.api.pojo.enums.AllocationApproveEnum; +import com.moral.api.pojo.enums.AppAllocationStateEnum; +import com.moral.api.pojo.ext.allocation.AllocationPageExt; +import com.moral.api.pojo.query.app.AppAllocationFileCond; +import com.moral.api.pojo.query.app.AppAllocationPageCond; +import com.moral.api.pojo.vo.allocation.AllocationPageVo; +import com.moral.api.pojo.vo.app.AppAllocationFindVo; +import com.moral.constant.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -13,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.validation.Valid; @@ -44,6 +56,26 @@ return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos); } + @PostMapping("/page") + @ApiOperation("���������������������") + public ResultMessage<PageResult<AppAllocationFindVo>> page(@Valid @RequestBody AppAllocationPageCond allocationPageCond){ + Page<AllocationPageExt> allocationFindVos = allocationService.pageApp(allocationPageCond); + PageResult<AppAllocationFindVo> result = new PageResult<>(allocationFindVos); + result.setList(AppAllocationFindVo.convert(allocationFindVos.getRecords())); + return ResultMessage.ok(result); + } + + public static void main(String[] args) { + List<String> list = Arrays.asList("aaa", "bbb","aaa"); + System.out.println("num;" + Collections.frequency(list, "aaa")); + } + + @PostMapping("appFile") + @ApiOperation("������������������or������") + public ResultMessage appFile(@Valid @RequestBody AppAllocationFileCond appAllocationFileCond){ + allocationService.saveFile(appAllocationFileCond); + return ResultMessage.ok(); + } @PostMapping("changeRoutine") @ApiOperation("���������������") -- Gitblit v1.8.0