From 31d2df0d6b2165c187516d0ca8b568b0f0366a30 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 27 Apr 2020 16:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/StartupPageDTO.java | 9 ++++---- .../epdc/dto/result/StartupPageResultDTO.java | 9 ++++---- .../epdc/controller/StartupController.java | 20 ++++++++-------- .../controller/StartupPageController.java | 21 ++++++++--------- .../esua/epdc/entity/StartupPageEntity.java | 9 ++++---- .../esua/epdc/excel/StartupPageExcel.java | 9 ++++---- .../esua/epdc/service/StartupPageService.java | 23 ++++++++++--------- .../service/impl/StartupPageServiceImpl.java | 13 +++++------ 8 files changed, 53 insertions(+), 60 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java index c630643f..b65304ae 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java @@ -25,11 +25,10 @@ import java.util.List; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理接口参数 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @Data public class StartupPageDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/StartupPageResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/StartupPageResultDTO.java index 1d1ed0d5..1e21d3d9 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/StartupPageResultDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/StartupPageResultDTO.java @@ -23,11 +23,10 @@ import java.io.Serializable; /** - * 欢迎页结果 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理接口结果 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @Data public class StartupPageResultDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java index d0abb9ff..24aca387 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java @@ -25,29 +25,27 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理 启动页管理 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @RestController @RequestMapping("startup") public class StartupController { - + @Autowired private StartupPageService startupPageService; /** - * @Description 获取欢迎页信息 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取欢迎页信息 * @Author songyunpeng - * @Date 2020/3/25 + * @Date 2020/3/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping("getStartupPage") - public Result getStartupPage(){ + public Result getStartupPage() { StartupPageResultDTO data = startupPageService.getStartupPage(); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupPageController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupPageController.java index aadbd4a8..d11ad478 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupPageController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupPageController.java @@ -37,32 +37,31 @@ import java.util.Map; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理 启动页管理 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @RestController @RequestMapping("startuppage") public class StartupPageController { - + @Autowired private StartupPageService startupPageService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = startupPageService.listPage(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { StartupPageDTO data = startupPageService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody StartupPageDTO dto){ + public Result save(@RequestBody StartupPageDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); startupPageService.save(dto); @@ -70,7 +69,7 @@ public class StartupPageController { } @PutMapping - public Result update(@RequestBody StartupPageDTO dto){ + public Result update(@RequestBody StartupPageDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); startupPageService.update(dto); @@ -78,7 +77,7 @@ public class StartupPageController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); startupPageService.delete(ids); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java index de24d750..2dc04f35 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java @@ -23,11 +23,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理Entity + * @Author songyunpeng + * @Date 2020/4/27 + **/ @Data @EqualsAndHashCode(callSuper=false) @TableName("epdc_startup_page") diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/StartupPageExcel.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/StartupPageExcel.java index 9b81d2b4..ea9a2250 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/StartupPageExcel.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/StartupPageExcel.java @@ -23,11 +23,10 @@ import lombok.Data; import java.util.Date; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理 启动页管理 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @Data public class StartupPageExcel { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java index 72ad551c..5515fe91 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java @@ -27,11 +27,10 @@ import java.util.List; import java.util.Map; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理 启动页管理 + * @Author songyunpeng + * @Date 2020/4/27 + **/ public interface StartupPageService extends BaseService { /** @@ -93,20 +92,22 @@ public interface StartupPageService extends BaseService { * @date 2020-03-24 */ void delete(String[] ids); + /** - * @Description pcd端查看l列表 + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Description pcd端查看l列表 * @Author songyunpeng - * @Date 2020/3/24 + * @Date 2020/3/24 * @Param [params] - * @return com.elink.esua.epdc.commons.tools.page.PageData **/ PageData listPage(Map params); + /** - * @Description 获取欢迎页信息 + * @return com.elink.esua.dto.StartupPageResultDTO + * @Description 获取欢迎页信息 * @Author songyunpeng - * @Date 2020/3/24 + * @Date 2020/3/24 * @Param [] - * @return com.elink.esua.dto.StartupPageResultDTO **/ StartupPageResultDTO getStartupPage(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java index baf4952b..674defd2 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java @@ -38,11 +38,10 @@ import java.util.List; import java.util.Map; /** - * 启动页管理 启动页管理 - * - * @author elink elink@elink-cn.com - * @since v1.0.0 2020-03-24 - */ + * @Description 启动页管理 启动页管理 + * @Author songyunpeng + * @Date 2020/4/27 + **/ @Service public class StartupPageServiceImpl extends BaseServiceImpl implements StartupPageService { @@ -63,8 +62,8 @@ public class StartupPageServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);