Merge branch 'dev_bugfix' into dev

epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/FootBarFormDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class FootBarFormDTO {
+    //@NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    // 哪一个端:gov,resi
+    @NotBlank(message = "app类型不能为空")
+    private String appType;
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/AppController.java

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
 import com.epmet.dto.form.CustomerFootBarFormDTO;
+import com.epmet.dto.form.FootBarFormDTO;
 import com.epmet.feign.OperCustomizeFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -22,15 +23,17 @@ public class AppController {
 
     /**
      * 查询
-     * @param formDTO
      * @return
      */
     @PostMapping("getcustomerfootbars")
-    public Result<List<CustomerFootBarDTO>> getCustomerFootBars(@RequestBody CustomerFootBarFormDTO formDTO) {
-        Result<List<CustomerFootBarDTO>> result = operCustomizeFeign.getCustomerfootbars(formDTO);
+    public Result<List<CustomerFootBarDTO>> getCustomerFootBars(@RequestBody FootBarFormDTO input) {
+        CustomerFootBarFormDTO form = new CustomerFootBarFormDTO();
+        form.setCustomerId(input.getCustomerId());
+        form.setAppType(input.getAppType());
+        Result<List<CustomerFootBarDTO>> result = operCustomizeFeign.getCustomerfootbars(form);
         if (CollectionUtils.isEmpty(result.getData())) {
-            formDTO.setCustomerId("default");
-            result = operCustomizeFeign.getCustomerfootbars(formDTO);
+            form.setCustomerId("default");
+            result = operCustomizeFeign.getCustomerfootbars(form);
         }
         return result;
     }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java

@@ -10,4 +10,8 @@ public class CustomerFootBarFormDTO {
     //@NotBlank(message = "客户ID不能为空")
     private String customerId;
 
+    // 哪一个端:gov,resi
+    @NotBlank(message = "app类型不能为空")
+    private String appType;
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java

@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -104,8 +105,9 @@ public class CustomerFootBarController {
     public Result<List<CustomerFootBarDTO>> getCustomerfootbars(@RequestBody CustomerFootBarFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         String customerId = formDTO.getCustomerId();
+        String appType = formDTO.getAppType();
 
-        List<CustomerFootBarEntity> footbars = customerFootBarService.listCustomerFootBars(customerId);
+        List<CustomerFootBarEntity> footbars = customerFootBarService.listCustomerFootBars(customerId, appType);
         List<CustomerFootBarDTO> barDTOS = new LinkedList<>();
         footbars.forEach(barEntity -> {
             CustomerFootBarDTO barDTO = new CustomerFootBarDTO();

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java

@@ -33,5 +33,6 @@ import java.util.List;
 @Mapper
 public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
 
-    List<CustomerFootBarEntity> listCustomerFootBars(@Param("customerId") String customerId);
+    List<CustomerFootBarEntity> listCustomerFootBars(@Param("customerId") String customerId,
+                                                     @Param("appType") String appType);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java

@@ -93,5 +93,5 @@ public interface CustomerFootBarService extends BaseService<CustomerFootBarEntit
      */
     void delete(String[] ids);
 
-    List<CustomerFootBarEntity> listCustomerFootBars(String customerId);
+    List<CustomerFootBarEntity> listCustomerFootBars(String customerId, String appType);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java

@@ -102,8 +102,8 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
     }
 
     @Override
-    public List<CustomerFootBarEntity> listCustomerFootBars(String customerId) {
-        return baseDao.listCustomerFootBars(customerId);
+    public List<CustomerFootBarEntity> listCustomerFootBars(String customerId, String appType) {
+        return baseDao.listCustomerFootBars(customerId, appType);
     }
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.2__add_footbar_columns.sql

@@ -0,0 +1,11 @@
+alter table customer_foot_bar add column `app_type` varchar(20) not null after `CUSTOMER_ID`;
+alter table customer_foot_bar add column `order` int(2) not null after `SELECTED_ICON_PATH`;
+
+update customer_foot_bar set `app_type`='gov' , `order`=1 where CUSTOMER_ID='default' and BAR_KEY='work';
+update customer_foot_bar set `app_type`='gov' , `order`=2 where CUSTOMER_ID='default' and BAR_KEY='org';
+update customer_foot_bar set `app_type`='gov' , `order`=3 where CUSTOMER_ID='default' and BAR_KEY='data';
+update customer_foot_bar set `app_type`='gov' , `order`=4 where CUSTOMER_ID='default' and BAR_KEY='find';
+
+INSERT INTO epmet_oper_customize.customer_foot_bar (ID, CUSTOMER_ID, app_type, BAR_KEY, BAR_NAME, PAGE_TITLE, ICON_PATH, SELECTED_ICON_PATH, `order`, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES (uuid(), 'default', 'resi', 'garden', '党建园地', '党建园地', null, null, 1, 0, 0, 'APP_USER', now(), 'APP_USER', now());
+INSERT INTO epmet_oper_customize.customer_foot_bar (ID, CUSTOMER_ID, app_type, BAR_KEY, BAR_NAME, PAGE_TITLE, ICON_PATH, SELECTED_ICON_PATH, `order`, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES (uuid(), 'default', 'resi', 'issue', '党群议事', '党群议事', null, null, 2, 0, 0, 'APP_USER', now(), 'APP_USER', now());
+INSERT INTO epmet_oper_customize.customer_foot_bar (ID, CUSTOMER_ID, app_type, BAR_KEY, BAR_NAME, PAGE_TITLE, ICON_PATH, SELECTED_ICON_PATH, `order`, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) VALUES (uuid(), 'default', 'resi', 'group', '楼院小组', '楼院小组', null, null, 3, 0, 0, 'APP_USER', now(), 'APP_USER', now());

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

@@ -21,13 +21,29 @@
     <!--查询客户的footbar列表-->
     <select id="listCustomerFootBars" resultType="com.epmet.entity.CustomerFootBarEntity">
         SELECT
-            *
+            id,
+            customer_id,
+            app_type,
+            bar_key,
+            bar_name,
+            page_title,
+            icon_path,
+            selected_icon_path,
+            `order`,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
         FROM
             customer_foot_bar
         <where>
             DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
+            AND APP_TYPE = #{appType}
         </where>
+        ORDER BY `order` ASC
     </select>