新增首页组件管理

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;
 }

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);
     }
 
-}
+    /**
+     * @param
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.FunctionDTO>>
+     * @Author yinzuomei
+     * @Description 查询已上架的所有功能，供下拉框使用
+     * @Date 2020/3/23 22:11
+     **/
+    @GetMapping("queryFunctionList")
+    public Result<List<FunctionDTO>> queryFunctionList() {
+        return functionService.queryFunctionList();
+    }
+}

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<FunctionEntity> {
-	
-}
+	/**
+	 * @param
+	 * @return java.util.List<com.epmet.dto.FunctionDTO>
+	 * @Author yinzuomei
+	 * @Description 查询已上架的所有功能，供下拉框使用
+	 * @Date 2020/3/23 22:15
+	 **/
+	List<FunctionDTO> selectFunctionList();
+}

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<HomeComponentEntity> {
 	 * @Date 2020/3/11 14:02
 	 **/
 	List<CommonComponentResultDTO> selectComponentList(ComponentListByCustomerFormDTO formDTO);
+
+	/**
+	 * @return java.util.List<com.epmet.dto.HomeComponentDTO>
+	 * @param params
+	 * @Author yinzuomei
+	 * @Description 分页查询组件信息
+	 * @Date 2020/3/23 22:42
+	 **/
+	List<HomeComponentDTO> selectListHomeComponentDTO(Map<String, Object> params);
 }

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<FunctionEntity> {
      * @date 2020-03-10
      */
     void delete(String[] ids);
-}
+
+    /**
+     * @param
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.FunctionDTO>>
+     * @Author yinzuomei
+     * @description 查询已上架的所有功能，供下拉框使用
+     * @Date 2020/3/23 22:10
+     **/
+    Result<List<FunctionDTO>> queryFunctionList();
+}

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<FunctionDao, FunctionEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.FunctionDTO>>
+     * @Author yinzuomei
+     * @description 查询已上架的所有功能，供下拉框使用
+     * @Date 2020/3/23 22:10
+     **/
+    @Override
+    public Result<List<FunctionDTO>> queryFunctionList() {
+        return new Result<List<FunctionDTO>>().ok(baseDao.selectFunctionList());
+    }
+
+}

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<HomeComponentDao,
 
     @Override
     public PageData<HomeComponentDTO> page(Map<String, Object> params) {
-        IPage<HomeComponentEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, HomeComponentDTO.class);
+        IPage<HomeComponentDTO> page = getPage(params);
+        List<HomeComponentDTO> list = baseDao.selectListHomeComponentDTO(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -101,4 +99,4 @@ public class HomeComponentServiceImpl extends BaseServiceImpl<HomeComponentDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+}

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionDao.xml

@@ -17,5 +17,15 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
-</mapper>
+    <!--  查询已上架的所有功能，供下拉框使用   -->
+    <select id="selectFunctionList" resultType="com.epmet.dto.FunctionDTO">
+        SELECT
+            f.id,
+            f.FUNCTION_NAME AS functionName
+        FROM
+            FUNCTION f
+        WHERE
+            f.DEL_FLAG = '0'
+            AND f.SHOPPING_STATUS = '1'
+    </select>
+</mapper>

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
     </select>
+
+    <!--  分页查询组件信息  -->
+    <select id="selectListHomeComponentDTO" parameterType="map" resultType="com.epmet.dto.HomeComponentDTO">
+        select hc.*,f.FUNCTION_NAME
+        from home_component hc
+        left join function f on(hc.FUNCTION_ID=f.id)
+        where hc.del_flag='0'
+        and f.del_flag='0'
+        <if test='componentName != "" and componentName != null'>
+            AND hc.COMPONENT_NAME LIKE concat('%', trim(#{componentName}), '%')
+        </if>
+        <if test='clientType != "" and clientType != null'>
+            AND hc.CLIENT_TYPE = #{clientType}
+        </if>
+        <if test='conponentType != "" and conponentType != null'>
+            AND hc.CONPONENT_TYPE = #{conponentType}
+        </if>
+        <if test='region != "" and region != null'>
+            AND hc.REGION = #{region}
+        </if>
+        <if test='functionId != "" and functionId != null'>
+            AND hc.FUNCTION_ID = #{functionId}
+        </if>
+        order by hc.CREATED_TIME desc
+    </select>
 </mapper>