Merge remote-tracking branch 'origin/dev-customerfunction' into dev-customerfunction

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 菜单基础入参
+ */
+@Data
+public class MenuFormDTO implements Serializable {
+    private static final long serialVersionUID = -2898130727929596798L;
+
+    /**
+     * gov_menu表主键
+     */
+    @NotBlank(message = "菜单ID不能为空")
+    private String tableId;
+
+}

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovCustomerMenuController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.GovCustomerMenuDTO;
 import com.epmet.dto.form.MenuConfigFormDTO;
+import com.epmet.dto.form.MenuFormDTO;
 import com.epmet.excel.GovCustomerMenuExcel;
 import com.epmet.service.GovCustomerMenuService;
 import org.apache.commons.lang3.StringUtils;
@@ -116,14 +117,14 @@ public class GovCustomerMenuController {
     /**
      * 根据gov_menu表主键，查询拥有这项菜单的所有客户(customerIds)
      *
-     * @param tableId
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
      * @Author zhangyong
      * @Date 16:26 2021-03-16
      **/
-    @PostMapping("getcustomerids/{tableid}")
+    @PostMapping("getcustomerids")
-    public Result<List<String>> getcustomerids(@PathVariable("tableid") String tableId){
+    public Result<List<String>> getcustomerids(@RequestBody MenuFormDTO formDTO){
-        List<String> data = govCustomerMenuService.getcustomerIds(tableId);
+        List<String> data = govCustomerMenuService.getcustomerIds(formDTO.getTableId());
         return new Result<List<String>>().ok(data);
     }
 }

epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.5__gov_customer_menu.sql

@@ -0,0 +1,12 @@
+CREATE TABLE `gov_customer_menu` (
+  `ID` varchar(32) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `TABLE_ID` varchar(32) NOT NULL COMMENT 'gov_menu表主键',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+  `REVISION` int(11) DEFAULT '0' COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户菜单配置表';