From 63e879d1c11b019cff8314559db205cb7606d893 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Mon, 23 Mar 2020 22:43:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E9=A1=B5=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/HomeComponentDTO.java | 4 +++ .../epmet/controller/FunctionController.java | 17 ++++++++++--- .../main/java/com/epmet/dao/FunctionDao.java | 16 +++++++++--- .../java/com/epmet/dao/HomeComponentDao.java | 11 ++++++++ .../com/epmet/service/FunctionService.java | 14 +++++++++-- .../service/impl/FunctionServiceImpl.java | 16 ++++++++++-- .../impl/HomeComponentServiceImpl.java | 12 ++++----- .../src/main/resources/mapper/FunctionDao.xml | 14 +++++++++-- .../resources/mapper/HomeComponentDao.xml | 25 +++++++++++++++++++ 9 files changed, 110 insertions(+), 19 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java index 1d1e437f1f..2845fd46b7 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/HomeComponentDTO.java @@ -113,4 +113,8 @@ public class HomeComponentDTO implements Serializable { */ private Date updatedTime; + /** + * 扩展属性用语显示功能名称 + */ + private String functionName; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java index 37208d3b35..ef7eec6d02 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java @@ -37,7 +37,7 @@ import java.util.Map; /** - * 功能表 + * 功能表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-10 @@ -45,7 +45,7 @@ import java.util.Map; @RestController @RequestMapping("function") public class FunctionController { - + @Autowired private FunctionService functionService; @@ -91,4 +91,15 @@ public class FunctionController { ExcelUtils.exportExcelToTarget(response, null, list, FunctionExcel.class); } -} \ No newline at end of file + /** + * @param + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 查询已上架的所有功能，供下拉框使用 + * @Date 2020/3/23 22:11 + **/ + @GetMapping("queryFunctionList") + public Result> queryFunctionList() { + return functionService.queryFunctionList(); + } +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java index 8196498d2f..dbc72d12dd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java @@ -18,16 +18,26 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.FunctionDTO; import com.epmet.entity.FunctionEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** - * 功能表 + * 功能表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-10 */ @Mapper public interface FunctionDao extends BaseDao { - -} \ No newline at end of file + /** + * @param + * @return java.util.List + * @Author yinzuomei + * @Description 查询已上架的所有功能，供下拉框使用 + * @Date 2020/3/23 22:15 + **/ + List selectFunctionList(); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/HomeComponentDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/HomeComponentDao.java index a5d45092e4..2fd4c3ce20 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/HomeComponentDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/HomeComponentDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.HomeComponentDTO; import com.epmet.dto.form.ComponentListByCustomerFormDTO; import com.epmet.dto.result.CommonComponentResultDTO; import com.epmet.dto.result.FunctionComponentResultDTO; @@ -25,6 +26,7 @@ import com.epmet.entity.HomeComponentEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 首页组件表 @@ -61,4 +63,13 @@ public interface HomeComponentDao extends BaseDao { * @Date 2020/3/11 14:02 **/ List selectComponentList(ComponentListByCustomerFormDTO formDTO); + + /** + * @return java.util.List + * @param params + * @Author yinzuomei + * @Description 分页查询组件信息 + * @Date 2020/3/23 22:42 + **/ + List selectListHomeComponentDTO(Map params); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java index 3992ec0446..7717980531 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java @@ -19,6 +19,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.FunctionDTO; import com.epmet.entity.FunctionEntity; @@ -26,7 +27,7 @@ import java.util.List; import java.util.Map; /** - * 功能表 + * 功能表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-10 @@ -92,4 +93,13 @@ public interface FunctionService extends BaseService { * @date 2020-03-10 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @param + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @description 查询已上架的所有功能，供下拉框使用 + * @Date 2020/3/23 22:10 + **/ + Result> queryFunctionList(); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java index 5fe3cbd1e7..cf46526f8a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.FunctionDao; import com.epmet.dto.FunctionDTO; import com.epmet.entity.FunctionEntity; @@ -38,7 +39,7 @@ import java.util.List; import java.util.Map; /** - * 功能表 + * 功能表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-10 @@ -101,4 +102,15 @@ public class FunctionServiceImpl extends BaseServiceImpl> + * @Author yinzuomei + * @description 查询已上架的所有功能，供下拉框使用 + * @Date 2020/3/23 22:10 + **/ + @Override + public Result> queryFunctionList() { + return new Result>().ok(baseDao.selectFunctionList()); + } + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java index 4b5802d789..96ac0834a3 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeComponentServiceImpl.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; /** - * 首页组件表 + * 首页组件表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-10 @@ -51,11 +51,9 @@ public class HomeComponentServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, HomeComponentDTO.class); + IPage page = getPage(params); + List list = baseDao.selectListHomeComponentDTO(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -101,4 +99,4 @@ public class HomeComponentServiceImpl extends BaseServiceImpl - - \ No newline at end of file + + + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml index 10bfc66952..a9e006b145 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml @@ -102,4 +102,29 @@ ORDER BY CONVERT ( hc.COMPONENT_NAME USING gbk ) ASC + + +