Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AuthorityMenuTree.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import cn.hutool.core.collection.CollUtil;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.common.vo.TreeNode;
 import org.springframework.beans.BeanUtils;
 
@@ -17,6 +19,7 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{
     String text;
     List<AuthorityMenuTree> nodes = new ArrayList<AuthorityMenuTree>();
     String icon;
+    List<Element> elements = CollUtil.newArrayList();
 
     public String getIcon() {
         return icon;
@@ -34,6 +37,14 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{
     public AuthorityMenuTree() {
     }
 
+    public List<Element> getElements() {
+        return elements;
+    }
+
+    public void setElements(List<Element> elements) {
+        this.elements = elements;
+    }
+
     public String getText() {
         return text;
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/GroupBiz.java

@@ -2,13 +2,11 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.ResourceAuthority;
-import com.github.wxiaoqi.security.admin.mapper.GroupMapper;
-import com.github.wxiaoqi.security.admin.mapper.MenuMapper;
-import com.github.wxiaoqi.security.admin.mapper.ResourceAuthorityMapper;
-import com.github.wxiaoqi.security.admin.mapper.UserMapper;
+import com.github.wxiaoqi.security.admin.mapper.*;
 import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
 import com.github.wxiaoqi.security.admin.vo.GroupUsers;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -38,6 +36,8 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
     private MenuMapper menuMapper;
     @Autowired
     private GroupMapper groupMapper;
+    @Autowired
+    private ElementMapper elementMapper;
 
     @Override
     public void insertSelective(Group entity) {
@@ -216,6 +216,28 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
         return trees;
     }
 
+    /**
+     * 获取群主关联的菜单V2
+     *
+     * @param groupId
+     * @return
+     */
+    public List<AuthorityMenuTree> getAuthorityMenuV2(int groupId) {
+        List<Menu> menus = menuMapper.selectMenuByAuthorityId(String.valueOf(groupId), AdminCommonConstant.AUTHORITY_TYPE_GROUP);
+        List<AuthorityMenuTree> trees = new ArrayList<AuthorityMenuTree>();
+        AuthorityMenuTree node = null;
+        for (Menu menu : menus) {
+            node = new AuthorityMenuTree();
+            node.setText(menu.getTitle());
+            BeanUtils.copyProperties(menu, node);
+            node.setElements(elementMapper.select(new Element(){{
+                setMenuId(menu.getId().toString());
+            }}));
+            trees.add(node);
+        }
+        return trees;
+    }
+
     /**
      * 获取群组关联的资源
      *

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java

@@ -92,6 +92,12 @@ public class GroupController extends BaseController<GroupBiz, Group> {
     }
 
 
+    @RequestMapping(value = "/V2/{id}/authority/menu", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<List<AuthorityMenuTree>> getMenuAuthorityV2(@PathVariable  int id){
+        return new ObjectRestResponse().data(baseBiz.getAuthorityMenuV2(id)).rel(true);
+    }
+
     @RequestMapping(value = "/{id}/authority/menu", method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<List<AuthorityMenuTree>> getMenuAuthority(@PathVariable  int id){

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBrand.java

+package com.xxfc.platform.vehicle.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+@Data
+@Table(name = "vehicle_brand")
+public class VehicleBrand implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("")
+    private Integer id;
+	
+	    /**
+     *  品牌编码
+     */
+    @Column(name = "code")
+	@ApiModelProperty(value = "品牌编码")
+    private String code;
+	
+	    /**
+     *  品牌中文名称
+     */
+    @Column(name = "cn_name")
+	@ApiModelProperty(value = "品牌中文名称")
+    private String cnName;
+	
+	    /**
+     *  品牌英文名称
+     */
+    @Column(name = "en_name")
+	@ApiModelProperty(value = "品牌英文名称")
+    private String enName;
+	
+	    /**
+     *  品牌首字母
+     */
+    @Column(name = "index")
+	@ApiModelProperty(value = "品牌首字母")
+    private String index;
+	
+	    /**
+     *  品牌logo
+     */
+    @Column(name = "logo")
+	@ApiModelProperty(value = "品牌logo")
+    private String logo;
+	
+	    /**
+     *  品牌专区大图
+     */
+    @Column(name = "banner")
+	@ApiModelProperty(value = "品牌专区大图")
+    private String banner;
+	
+	    /**
+     *  品牌故事
+     */
+    @Column(name = "story")
+	@ApiModelProperty(value = "品牌故事")
+    private String story;
+	
+	    /**
+     *  
+     */
+    @Column(name = "sort")
+	@ApiModelProperty(value = "")
+    private Integer sort;
+	
+	    /**
+     *  品牌状态：1启用 2不启用
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "品牌状态：1启用 2不启用")
+    private Integer status;
+	
+	    /**
+     *  品牌推荐 1推荐 2不推荐
+     */
+    @Column(name = "recommend")
+	@ApiModelProperty(value = "品牌推荐 1推荐 2不推荐")
+    private Integer recommend;
+	
+	    /**
+     *  审核状态：1：未审核 2：审核通过 3审核拒绝
+     */
+    @Column(name = "audit")
+	@ApiModelProperty(value = "审核状态：1：未审核 2：审核通过 3审核拒绝")
+    private Integer audit;
+	
+	    /**
+     *  品牌删除状态 1：正常 2：删除
+     */
+    @Column(name = "delete")
+	@ApiModelProperty(value = "品牌删除状态 1：正常 2：删除")
+    private Integer delete;
+	
+	    /**
+     *  品牌审核备注
+     */
+    @Column(name = "audit_remark")
+	@ApiModelProperty(value = "品牌审核备注")
+    private String auditRemark;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Date crtTime;
+	
+	    /**
+     *  修改时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "修改时间", hidden = true )
+    private Date updTime;
+	
+	    /**
+     *  版本号
+     */
+    @Column(name = "version")
+	@ApiModelProperty(value = "版本号")
+    private String version;
+	
+
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCategory.java

+package com.xxfc.platform.vehicle.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+@Data
+@Table(name = "vehicle_category")
+public class VehicleCategory implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("")
+    private Integer id;
+	
+	    /**
+     *  
+     */
+    @Column(name = "brand_id")
+	@ApiModelProperty(value = "")
+    private Long brandId;
+	
+	    /**
+     *  
+     */
+    @Column(name = "brand_name")
+	@ApiModelProperty(value = "")
+    private Long brandName;
+	
+	    /**
+     *  
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "")
+    private String name;
+	
+	    /**
+     *  
+     */
+    @Column(name = "stock")
+	@ApiModelProperty(value = "")
+    private Integer stock;
+	
+	    /**
+     *  品牌删除状态 1：上架 2：下架
+     */
+    @Column(name = "shelves")
+	@ApiModelProperty(value = "品牌删除状态 1：上架 2：下架")
+    private Integer shelves;
+	
+	    /**
+     *  品牌删除状态 1：正常 2：删除
+     */
+    @Column(name = "delete")
+	@ApiModelProperty(value = "品牌删除状态 1：正常 2：删除")
+    private Integer delete;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Date crtTime;
+	
+	    /**
+     *  修改时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "修改时间", hidden = true )
+    private Date updTime;
+	
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBrandBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.vehicle.entity.VehicleBrand;
+import com.xxfc.platform.vehicle.mapper.VehicleBrandMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+@Service
+public class VehicleBrandBiz extends BaseBiz<VehicleBrandMapper, VehicleBrand> {
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCategoryBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.vehicle.entity.VehicleCategory;
+import com.xxfc.platform.vehicle.mapper.VehicleCategoryMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+@Service
+public class VehicleCategoryBiz extends BaseBiz<VehicleCategoryMapper, VehicleCategory> {
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBrandMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleBrand;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+public interface VehicleBrandMapper extends Mapper<VehicleBrand> {
+	
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleCategoryMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleCategory;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-09-19 17:48:20
+ */
+public interface VehicleCategoryMapper extends Mapper<VehicleCategory> {
+	
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleBrandController.java

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.biz.VehicleBrandBiz;
+import com.xxfc.platform.vehicle.entity.VehicleBrand;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("vehicleBrand")
+public class VehicleBrandController extends BaseController<VehicleBrandBiz, VehicleBrand> {
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCategoryController.java

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.biz.VehicleCategoryBiz;
+import com.xxfc.platform.vehicle.entity.VehicleCategory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("vehicleCategory")
+public class VehicleCategoryController extends BaseController<VehicleCategoryBiz, VehicleCategory> {
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/BgVehicleCategoryController.java

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.biz.VehicleCategoryBiz;
+import com.xxfc.platform.vehicle.entity.VehicleCategory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("admin/vehicleCategory")
+public class BgVehicleCategoryController extends BaseController<VehicleCategoryBiz, VehicleCategory> {
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBrandMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleBrandMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.vehicle.entity.VehicleBrand" id="vehicleBrandMap">
+        <result property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="cnName" column="cn_name"/>
+        <result property="enName" column="en_name"/>
+        <result property="index" column="index"/>
+        <result property="logo" column="logo"/>
+        <result property="banner" column="banner"/>
+        <result property="story" column="story"/>
+        <result property="sort" column="sort"/>
+        <result property="status" column="status"/>
+        <result property="recommend" column="recommend"/>
+        <result property="audit" column="audit"/>
+        <result property="delete" column="delete"/>
+        <result property="auditRemark" column="audit_remark"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="version" column="version"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCategoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleCategoryMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.vehicle.entity.VehicleCategory" id="vehicleCategoryMap">
+        <result property="id" column="id"/>
+        <result property="brandId" column="brand_id"/>
+        <result property="brandName" column="brand_name"/>
+        <result property="name" column="name"/>
+        <result property="stock" column="stock"/>
+        <result property="shelves" column="shelves"/>
+        <result property="delete" column="delete"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file