加入菜单组ID自动生成，调整数据库 主键ID为30位

Api/src/main/java/com/java110/api/listener/menuGroup/SaveMenuGroupListener.java

@@ -6,11 +6,13 @@ import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.common.util.Assert;
 import com.java110.common.util.BeanConvertUtil;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.menu.IMenuInnerServiceSMO;
 import com.java110.dto.menuGroup.MenuGroupDto;
 import com.java110.dto.service.ServiceBusinessDto;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -51,6 +53,8 @@ public class SaveMenuGroupListener extends AbstractServiceApiListener {
 
         MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
 
+        freshGId(menuGroupDto);
+
 
         int saveFlag = menuInnerServiceSMOImpl.saveMenuGroup(menuGroupDto);
 
@@ -59,6 +63,19 @@ public class SaveMenuGroupListener extends AbstractServiceApiListener {
         context.setResponseEntity(responseEntity);
     }
 
+    /**
+     * 刷新 菜单组ID
+     * @param menuGroupDto
+     */
+    private void freshGId(MenuGroupDto menuGroupDto) {
+
+        if(!StringUtils.isEmpty(menuGroupDto.getGId())){
+            return ;
+        }
+        //生成流水
+        menuGroupDto.setGId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.MENU_GROUP));
+    }
+
     @Override
     public String getServiceCode() {
         return ServiceCodeMenuGroupConstant.ADD_MENUGROUP;

java110-bean/src/main/java/com/java110/vo/api/menuGroup/ApiMenuGroupDataVo.java

@@ -6,45 +6,57 @@ import java.util.Date;
 public class ApiMenuGroupDataVo implements Serializable {
 
     private String gId;
-private String name;
-private String icon;
-private String label;
-private String seq;
-private String description;
-public String getGId() {
+    private String name;
+    private String icon;
+    private String label;
+    private String seq;
+    private String description;
+
+    public String getGId() {
         return gId;
     }
-public void setGId(String gId) {
+
+    public void setGId(String gId) {
         this.gId = gId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getIcon() {
+
+    public String getIcon() {
         return icon;
     }
-public void setIcon(String icon) {
+
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-public String getLabel() {
+
+    public String getLabel() {
         return label;
     }
-public void setLabel(String label) {
+
+    public void setLabel(String label) {
         this.label = label;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
-public String getDescription() {
+
+    public String getDescription() {
         return description;
     }
-public void setDescription(String description) {
+
+    public void setDescription(String description) {
         this.description = description;
     }
 

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -86,6 +86,8 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_id="99";
     public static final String CODE_PREFIX_service_id="98";
 
+    public static final String MENU_GROUP = "80";
+
     /**
      * 只有在不调用服务生成ID时有用
      */

java110-core/src/main/java/com/java110/core/smo/menu/IMenuInnerServiceSMO.java

@@ -66,4 +66,7 @@ public interface IMenuInnerServiceSMO {
      */
     @RequestMapping(value = "/deleteMenuGroup", method = RequestMethod.POST)
     int deleteMenuGroup(@RequestBody MenuGroupDto routeDto);
+
+
+
 }