提交代码

bweb/src/main/java/com/bweb/controller/SecMenuController.java

@@ -170,44 +170,17 @@ public class SecMenuController {
         }
     }
 
-    @RequestMapping(value="/queryAssignMenuTree",method = RequestMethod.GET)
+    @RequestMapping(value="/queryRoleMenuArray",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询分配菜单树")
-    public ResponseData queryAssignMenuTree(@RequestParam(value = "roleId" , required = true) Long roleId) {
+    public ResponseData queryRoleMenuArray(@RequestParam(value = "roleId" , required = true) Long roleId) {
         try {
 
-            List<MenuTreeModel> treeModelList = new ArrayList<>();
+            // 查询角色菜单权限
-            MenuTreeModel menuTree;
+            List<SecRoleMenuRel> roleMenuList = secRoleMenuRelService.getRelListByRole(roleId);
 
-            // 获取系统菜单
+            return ResponseMsgUtil.success(roleMenuList.stream().map(SecRoleMenuRel::getMenuId).collect(Collectors.toList())
-            List<SecMenu> sysMenuList = secMenuService.getAllList();
+                    .stream().map(Object::toString).collect(Collectors.toList()));
-            Map<Long, SecRoleMenuRel> roleMenuRelMap = secRoleMenuRelService.getRelListByRole(roleId)
-                    .stream()
-                    .collect(Collectors.toMap(SecRoleMenuRel::getMenuId, Function.identity()));
-
-            // 获取系统顶级菜单
-            List<SecMenu> topLevelMenuList = sysMenuList.stream().filter(o -> o.getMenuPSid() == null)
-                    .sorted(Comparator.comparing(SecMenu::getMenuSort))
-                    .collect(Collectors.toList());
-
-            for (SecMenu topLevelMenu : topLevelMenuList) {
-                menuTree = new MenuTreeModel();
-                menuTree.setId(topLevelMenu.getId());
-                menuTree.setMenuName(topLevelMenu.getMenuName());
-                menuTree.setMenuType(topLevelMenu.getMenuType());
-                menuTree.setMenuUrl(topLevelMenu.getMenuUrl());
-                menuTree.setMenuUrlImg(topLevelMenu.getMenuUrlImg());
-                menuTree.setMenuPSid(topLevelMenu.getMenuPSid());
-                menuTree.setMenuSort(topLevelMenu.getMenuSort());
-                menuTree.setMenuDesc(topLevelMenu.getMenuDesc());
-                // 递归子菜单
-                menuTree.setChildMenuList(recursionMenu(sysMenuList, roleMenuRelMap, topLevelMenu.getId()));
-                // 获取角色菜单
-                menuTree.setAuthority(roleMenuRelMap.get(topLevelMenu.getId()) != null ? true : false);
-                treeModelList.add(menuTree);
-            }
-
-            return ResponseMsgUtil.success(treeModelList);
 
         } catch (Exception e) {
             log.error("error!",e);
@@ -229,10 +202,10 @@ public class SecMenuController {
         }
     }
 
-    @RequestMapping(value="/queryRoleMenuTreeCustomized",method = RequestMethod.POST)
+    @RequestMapping(value="/queryMenuTree",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "查询角色菜单树")
-    public ResponseData queryRoleMenuTreeCustomized(@RequestParam(value = "roleId" , required = false) Long roleId) {
+    public ResponseData queryMenuTree() {
         try {
             List<Map<String,Object>> mapList = new ArrayList<>();
             Map<String,Object> map;
@@ -252,7 +225,7 @@ public class SecMenuController {
                     map.put("key", ""+topLevelMenu.getId());
                     map.put("title", topLevelMenu.getMenuName());
                     // 获取下级菜单
-                    map.put("children", recursionMenu2(menuList, topLevelMenu.getId()));
+                    map.put("children", recursionMenu(menuList, topLevelMenu.getId()));
                     mapList.add(map);
                 }
             }
@@ -271,7 +244,7 @@ public class SecMenuController {
      * @param parentMenuId 父级菜单id
      * @return
      */
-    public List<Map<String,Object>> recursionMenu2(List<SecMenu> dataSource, Long parentMenuId) {
+    public List<Map<String,Object>> recursionMenu(List<SecMenu> dataSource, Long parentMenuId) {
         List<Map<String,Object>> mapList = new ArrayList<>();
         Map<String,Object> map;
 
@@ -285,7 +258,7 @@ public class SecMenuController {
                 map.put("key", ""+menu.getId());
                 map.put("title", menu.getMenuName());
                 // 获取下级菜单
-                List<Map<String, Object>> recursioned = recursionMenu2(dataSource, menu.getId());
+                List<Map<String, Object>> recursioned = recursionMenu(dataSource, menu.getId());
                 if (recursioned.isEmpty()) {
                     map.put("isLeaf", true);
                 } else {
@@ -297,36 +270,4 @@ public class SecMenuController {
         return mapList;
     }
 
-    /**
-     * 递归菜单
-     * @param sysMenu 系统菜单
-     * @param roleMenuRel  角色菜单
-     * @param parentMenuId 父类菜单id
-     * @return
-     */
-    public List<MenuTreeModel> recursionMenu(List<SecMenu> sysMenu, Map<Long, SecRoleMenuRel> roleMenuRel, Long parentMenuId) {
-        List<MenuTreeModel> treeModelList = new ArrayList<>();
-        MenuTreeModel menuTree;
-
-        List<SecMenu> collect = sysMenu.stream()
-                .filter(o -> o.getMenuPSid() != null && o.getMenuPSid().equals(parentMenuId))
-                .sorted(Comparator.comparing(SecMenu::getMenuSort))
-                .collect(Collectors.toList());
-        for (SecMenu menu : collect) {
-            menuTree = new MenuTreeModel();
-            menuTree.setId(menu.getId());
-            menuTree.setMenuName(menu.getMenuName());
-            menuTree.setMenuType(menu.getMenuType());
-            menuTree.setMenuUrl(menu.getMenuUrl());
-            menuTree.setMenuUrlImg(menu.getMenuUrlImg());
-            menuTree.setMenuPSid(menu.getMenuPSid());
-            menuTree.setMenuSort(menu.getMenuSort());
-            menuTree.setMenuDesc(menu.getMenuDesc());
-            // 获取角色菜单
-            menuTree.setAuthority(roleMenuRel.get(menuTree.getId()) != null ? true : false);
-            menuTree.setChildMenuList(recursionMenu(sysMenu, roleMenuRel, menu.getId()));
-            treeModelList.add(menuTree);
-        }
-        return treeModelList;
-    }
 }

bweb/src/main/java/com/bweb/controller/goods/GoodsTypeController.java

@@ -0,0 +1,119 @@
+package com.bweb.controller.goods;
+
+import com.bweb.controller.FileUploadController;
+import com.hfkj.common.exception.ErrorCode;
+import com.hfkj.common.exception.ErrorHelp;
+import com.hfkj.common.exception.SysCode;
+import com.hfkj.common.security.SessionObject;
+import com.hfkj.common.security.UserCenter;
+import com.hfkj.common.utils.ResponseMsgUtil;
+import com.hfkj.entity.GoodsType;
+import com.hfkj.entity.SecMenu;
+import com.hfkj.model.ResponseData;
+import com.hfkj.model.SecUserSessionObject;
+import com.hfkj.service.goods.GoodsTypeService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GoodsTypeController {
+    private static final Logger log = LoggerFactory.getLogger(FileUploadController.class);
+
+    @Resource
+    private GoodsTypeService goodsTypeService;
+
+    @Resource
+    private UserCenter userCenter;
+
+    @RequestMapping(value="/editMenu",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "编辑菜单")
+    public ResponseData editMenu(@RequestBody GoodsType body, HttpServletRequest request) {
+
+        SessionObject sessionObject = userCenter.getSessionObject(request);
+        SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
+
+        if (body == null
+                || body.getBusinessType() == null
+                || StringUtils.isBlank(body.getTitle())) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+        }
+
+        GoodsType goodsType;
+
+        if (body.getId() != null) {
+            // 查询商品类型
+            goodsType = goodsTypeService.queryDetail(body.getId());
+            if (goodsType == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+        } else {
+            goodsType = new GoodsType();
+            goodsType.setCreateTime(new Date());
+        }
+
+        goodsType.setUpdateTime(new Date());
+        goodsType.setStatus(1);
+        goodsType.setParentId(body.getParentId());
+        goodsType.setBusinessType(body.getBusinessType());
+        goodsType.setImgUrl(body.getImgUrl());
+        goodsType.setOpId(userModel.getAccount().getId());
+        goodsType.setOpName(userModel.getAccount().getUserName());
+
+        if (body.getId() != null) {
+            goodsTypeService.update(goodsType);
+        } else {
+            goodsTypeService.create(goodsType);
+        }
+
+        return ResponseMsgUtil.success("操作成功");
+    }
+
+    @RequestMapping(value="/getList",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "查询列表")
+    public ResponseData getList(
+            @RequestParam(value = "parentId" , required = false) Long parentId,
+                                    @RequestParam(value = "businessType" , required = false) Integer businessType,
+                                    @RequestParam(value = "title" , required = false) String title
+    ) {
+        try {
+
+            Map<String , Object> map = new HashMap<>();
+            map.put("parentId" , parentId);
+            map.put("businessType" , businessType);
+            map.put("title" , title);
+
+            return ResponseMsgUtil.success(goodsTypeService.getList(map));
+
+        } catch (Exception e) {
+            log.error("error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
+    @RequestMapping(value="/delete",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "删除")
+    public ResponseData delete(@RequestParam(value = "id" , required = false) Long id) {
+        try {
+
+            goodsTypeService.delete(id , false);
+
+            return ResponseMsgUtil.success("删除成功");
+
+        } catch (Exception e) {
+            log.error("error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
+}

service/src/main/java/com/hfkj/dao/GoodsBrandMapper.java

@@ -0,0 +1,120 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.GoodsBrand;
+import com.hfkj.entity.GoodsBrandExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface GoodsBrandMapper extends GoodsBrandMapperExt {
+    @SelectProvider(type=GoodsBrandSqlProvider.class, method="countByExample")
+    long countByExample(GoodsBrandExample example);
+
+    @DeleteProvider(type=GoodsBrandSqlProvider.class, method="deleteByExample")
+    int deleteByExample(GoodsBrandExample example);
+
+    @Delete({
+        "delete from goods_brand",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into goods_brand (title, img_url, ",
+        "create_time, update_time, ",
+        "`status`, op_id, op_name, ",
+        "ext_1, ext_2, ext_3)",
+        "values (#{title,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, ",
+        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{status,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, ",
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(GoodsBrand record);
+
+    @InsertProvider(type=GoodsBrandSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(GoodsBrand record);
+
+    @SelectProvider(type=GoodsBrandSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    List<GoodsBrand> selectByExample(GoodsBrandExample example);
+
+    @Select({
+        "select",
+        "id, title, img_url, create_time, update_time, `status`, op_id, op_name, ext_1, ",
+        "ext_2, ext_3",
+        "from goods_brand",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    GoodsBrand selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=GoodsBrandSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") GoodsBrand record, @Param("example") GoodsBrandExample example);
+
+    @UpdateProvider(type=GoodsBrandSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") GoodsBrand record, @Param("example") GoodsBrandExample example);
+
+    @UpdateProvider(type=GoodsBrandSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(GoodsBrand record);
+
+    @Update({
+        "update goods_brand",
+        "set title = #{title,jdbcType=VARCHAR},",
+          "img_url = #{imgUrl,jdbcType=VARCHAR},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "op_id = #{opId,jdbcType=BIGINT},",
+          "op_name = #{opName,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(GoodsBrand record);
+}

service/src/main/java/com/hfkj/dao/GoodsBrandMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface GoodsBrandMapperExt {
+}

service/src/main/java/com/hfkj/dao/GoodsBrandSqlProvider.java

@@ -0,0 +1,318 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.GoodsBrand;
+import com.hfkj.entity.GoodsBrandExample.Criteria;
+import com.hfkj.entity.GoodsBrandExample.Criterion;
+import com.hfkj.entity.GoodsBrandExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class GoodsBrandSqlProvider {
+
+    public String countByExample(GoodsBrandExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("goods_brand");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(GoodsBrandExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("goods_brand");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(GoodsBrand record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("goods_brand");
+        
+        if (record.getTitle() != null) {
+            sql.VALUES("title", "#{title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.VALUES("img_url", "#{imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.VALUES("op_name", "#{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(GoodsBrandExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("title");
+        sql.SELECT("img_url");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("`status`");
+        sql.SELECT("op_id");
+        sql.SELECT("op_name");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("goods_brand");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        GoodsBrand record = (GoodsBrand) parameter.get("record");
+        GoodsBrandExample example = (GoodsBrandExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("goods_brand");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getTitle() != null) {
+            sql.SET("title = #{record.title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("goods_brand");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("title = #{record.title,jdbcType=VARCHAR}");
+        sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        GoodsBrandExample example = (GoodsBrandExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(GoodsBrand record) {
+        SQL sql = new SQL();
+        sql.UPDATE("goods_brand");
+        
+        if (record.getTitle() != null) {
+            sql.SET("title = #{title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.SET("img_url = #{imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, GoodsBrandExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/GoodsTypeMapper.java

@@ -0,0 +1,128 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.GoodsType;
+import com.hfkj.entity.GoodsTypeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface GoodsTypeMapper extends GoodsTypeMapperExt {
+    @SelectProvider(type=GoodsTypeSqlProvider.class, method="countByExample")
+    long countByExample(GoodsTypeExample example);
+
+    @DeleteProvider(type=GoodsTypeSqlProvider.class, method="deleteByExample")
+    int deleteByExample(GoodsTypeExample example);
+
+    @Delete({
+        "delete from goods_type",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into goods_type (parent_id, title, ",
+        "business_type, img_url, ",
+        "create_time, update_time, ",
+        "`status`, op_id, op_name, ",
+        "ext_1, ext_2, ext_3)",
+        "values (#{parentId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, ",
+        "#{businessType,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, ",
+        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{status,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, ",
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(GoodsType record);
+
+    @InsertProvider(type=GoodsTypeSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(GoodsType record);
+
+    @SelectProvider(type=GoodsTypeSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="parent_id", property="parentId", jdbcType=JdbcType.BIGINT),
+        @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="business_type", property="businessType", jdbcType=JdbcType.INTEGER),
+        @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    List<GoodsType> selectByExample(GoodsTypeExample example);
+
+    @Select({
+        "select",
+        "id, parent_id, title, business_type, img_url, create_time, update_time, `status`, ",
+        "op_id, op_name, ext_1, ext_2, ext_3",
+        "from goods_type",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="parent_id", property="parentId", jdbcType=JdbcType.BIGINT),
+        @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="business_type", property="businessType", jdbcType=JdbcType.INTEGER),
+        @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    GoodsType selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=GoodsTypeSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") GoodsType record, @Param("example") GoodsTypeExample example);
+
+    @UpdateProvider(type=GoodsTypeSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") GoodsType record, @Param("example") GoodsTypeExample example);
+
+    @UpdateProvider(type=GoodsTypeSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(GoodsType record);
+
+    @Update({
+        "update goods_type",
+        "set parent_id = #{parentId,jdbcType=BIGINT},",
+          "title = #{title,jdbcType=VARCHAR},",
+          "business_type = #{businessType,jdbcType=INTEGER},",
+          "img_url = #{imgUrl,jdbcType=VARCHAR},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "op_id = #{opId,jdbcType=BIGINT},",
+          "op_name = #{opName,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(GoodsType record);
+}

service/src/main/java/com/hfkj/dao/GoodsTypeMapperExt.java

@@ -0,0 +1,7 @@
+package com.hfkj.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface GoodsTypeMapperExt {
+}

service/src/main/java/com/hfkj/dao/GoodsTypeSqlProvider.java

@@ -0,0 +1,346 @@
+package com.hfkj.dao;
+
+import com.hfkj.entity.GoodsType;
+import com.hfkj.entity.GoodsTypeExample.Criteria;
+import com.hfkj.entity.GoodsTypeExample.Criterion;
+import com.hfkj.entity.GoodsTypeExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class GoodsTypeSqlProvider {
+
+    public String countByExample(GoodsTypeExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("goods_type");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(GoodsTypeExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("goods_type");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(GoodsType record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("goods_type");
+        
+        if (record.getParentId() != null) {
+            sql.VALUES("parent_id", "#{parentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getTitle() != null) {
+            sql.VALUES("title", "#{title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessType() != null) {
+            sql.VALUES("business_type", "#{businessType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.VALUES("img_url", "#{imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.VALUES("op_name", "#{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(GoodsTypeExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("parent_id");
+        sql.SELECT("title");
+        sql.SELECT("business_type");
+        sql.SELECT("img_url");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("`status`");
+        sql.SELECT("op_id");
+        sql.SELECT("op_name");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("goods_type");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        GoodsType record = (GoodsType) parameter.get("record");
+        GoodsTypeExample example = (GoodsTypeExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("goods_type");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getParentId() != null) {
+            sql.SET("parent_id = #{record.parentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getTitle() != null) {
+            sql.SET("title = #{record.title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessType() != null) {
+            sql.SET("business_type = #{record.businessType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("goods_type");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("parent_id = #{record.parentId,jdbcType=BIGINT}");
+        sql.SET("title = #{record.title,jdbcType=VARCHAR}");
+        sql.SET("business_type = #{record.businessType,jdbcType=INTEGER}");
+        sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        GoodsTypeExample example = (GoodsTypeExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(GoodsType record) {
+        SQL sql = new SQL();
+        sql.UPDATE("goods_type");
+        
+        if (record.getParentId() != null) {
+            sql.SET("parent_id = #{parentId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getTitle() != null) {
+            sql.SET("title = #{title,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getBusinessType() != null) {
+            sql.SET("business_type = #{businessType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getImgUrl() != null) {
+            sql.SET("img_url = #{imgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, GoodsTypeExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/SecRoleMenuRelMapperExt.java

@@ -13,9 +13,9 @@ public interface SecRoleMenuRelMapperExt {
 
     @Insert({"<script>" +
             " insert into sec_role_menu_rel (role_id, menu_id) " +
-            " VALUES " +
+            " values " +
-            " <foreach collection='list' item='item' index='index' separator=','>" +
+            " <foreach collection='list' item='item' index='index' separator=','>",
-            " (#{item.roleId, #{menuId})" +
+            " ( #{item.roleId}, #{item.menuId} )" +
             " </foreach>" +
             " </script>"})
     void batchAdd(@Param("list") List<SecRoleMenuRel> list);

service/src/main/java/com/hfkj/entity/GoodsBrand.java

@@ -0,0 +1,225 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * goods_brand
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class GoodsBrand implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态 1：正常 0 删除
+     */
+    private Integer status;
+
+    /**
+     * 操作人
+     */
+    private Long opId;
+
+    /**
+     * 操作人名称
+     */
+    private String opName;
+
+    /**
+     * ext_1
+     */
+    private String ext1;
+
+    /**
+     * ext_2
+     */
+    private String ext2;
+
+    /**
+     * ext_3
+     */
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOpId() {
+        return opId;
+    }
+
+    public void setOpId(Long opId) {
+        this.opId = opId;
+    }
+
+    public String getOpName() {
+        return opName;
+    }
+
+    public void setOpName(String opName) {
+        this.opName = opName;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        GoodsBrand other = (GoodsBrand) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle()))
+            && (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
+            && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
+        result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
+        result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", title=").append(title);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", status=").append(status);
+        sb.append(", opId=").append(opId);
+        sb.append(", opName=").append(opName);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/entity/GoodsBrandExample.java

@@ -0,0 +1,943 @@
+package com.hfkj.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class GoodsBrandExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    private Integer limit;
+
+    private Long offset;
+
+    public GoodsBrandExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setOffset(Long offset) {
+        this.offset = offset;
+    }
+
+    public Long getOffset() {
+        return offset;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNull() {
+            addCriterion("img_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNotNull() {
+            addCriterion("img_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlEqualTo(String value) {
+            addCriterion("img_url =", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotEqualTo(String value) {
+            addCriterion("img_url <>", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThan(String value) {
+            addCriterion("img_url >", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("img_url >=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThan(String value) {
+            addCriterion("img_url <", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("img_url <=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLike(String value) {
+            addCriterion("img_url like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotLike(String value) {
+            addCriterion("img_url not like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIn(List<String> values) {
+            addCriterion("img_url in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotIn(List<String> values) {
+            addCriterion("img_url not in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlBetween(String value1, String value2) {
+            addCriterion("img_url between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotBetween(String value1, String value2) {
+            addCriterion("img_url not between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIsNull() {
+            addCriterion("op_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIsNotNull() {
+            addCriterion("op_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdEqualTo(Long value) {
+            addCriterion("op_id =", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotEqualTo(Long value) {
+            addCriterion("op_id <>", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdGreaterThan(Long value) {
+            addCriterion("op_id >", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("op_id >=", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdLessThan(Long value) {
+            addCriterion("op_id <", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdLessThanOrEqualTo(Long value) {
+            addCriterion("op_id <=", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIn(List<Long> values) {
+            addCriterion("op_id in", values, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotIn(List<Long> values) {
+            addCriterion("op_id not in", values, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdBetween(Long value1, Long value2) {
+            addCriterion("op_id between", value1, value2, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotBetween(Long value1, Long value2) {
+            addCriterion("op_id not between", value1, value2, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIsNull() {
+            addCriterion("op_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIsNotNull() {
+            addCriterion("op_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameEqualTo(String value) {
+            addCriterion("op_name =", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotEqualTo(String value) {
+            addCriterion("op_name <>", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameGreaterThan(String value) {
+            addCriterion("op_name >", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameGreaterThanOrEqualTo(String value) {
+            addCriterion("op_name >=", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLessThan(String value) {
+            addCriterion("op_name <", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLessThanOrEqualTo(String value) {
+            addCriterion("op_name <=", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLike(String value) {
+            addCriterion("op_name like", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotLike(String value) {
+            addCriterion("op_name not like", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIn(List<String> values) {
+            addCriterion("op_name in", values, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotIn(List<String> values) {
+            addCriterion("op_name not in", values, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameBetween(String value1, String value2) {
+            addCriterion("op_name between", value1, value2, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotBetween(String value1, String value2) {
+            addCriterion("op_name not between", value1, value2, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1IsNull() {
+            addCriterion("ext_1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1IsNotNull() {
+            addCriterion("ext_1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1EqualTo(String value) {
+            addCriterion("ext_1 =", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotEqualTo(String value) {
+            addCriterion("ext_1 <>", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThan(String value) {
+            addCriterion("ext_1 >", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_1 >=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThan(String value) {
+            addCriterion("ext_1 <", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThanOrEqualTo(String value) {
+            addCriterion("ext_1 <=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Like(String value) {
+            addCriterion("ext_1 like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotLike(String value) {
+            addCriterion("ext_1 not like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1In(List<String> values) {
+            addCriterion("ext_1 in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotIn(List<String> values) {
+            addCriterion("ext_1 not in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Between(String value1, String value2) {
+            addCriterion("ext_1 between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotBetween(String value1, String value2) {
+            addCriterion("ext_1 not between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNull() {
+            addCriterion("ext_2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNotNull() {
+            addCriterion("ext_2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2EqualTo(String value) {
+            addCriterion("ext_2 =", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotEqualTo(String value) {
+            addCriterion("ext_2 <>", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThan(String value) {
+            addCriterion("ext_2 >", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_2 >=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThan(String value) {
+            addCriterion("ext_2 <", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThanOrEqualTo(String value) {
+            addCriterion("ext_2 <=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Like(String value) {
+            addCriterion("ext_2 like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotLike(String value) {
+            addCriterion("ext_2 not like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2In(List<String> values) {
+            addCriterion("ext_2 in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotIn(List<String> values) {
+            addCriterion("ext_2 not in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Between(String value1, String value2) {
+            addCriterion("ext_2 between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotBetween(String value1, String value2) {
+            addCriterion("ext_2 not between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNull() {
+            addCriterion("ext_3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNotNull() {
+            addCriterion("ext_3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3EqualTo(String value) {
+            addCriterion("ext_3 =", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotEqualTo(String value) {
+            addCriterion("ext_3 <>", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThan(String value) {
+            addCriterion("ext_3 >", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_3 >=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThan(String value) {
+            addCriterion("ext_3 <", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThanOrEqualTo(String value) {
+            addCriterion("ext_3 <=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Like(String value) {
+            addCriterion("ext_3 like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotLike(String value) {
+            addCriterion("ext_3 not like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3In(List<String> values) {
+            addCriterion("ext_3 in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotIn(List<String> values) {
+            addCriterion("ext_3 not in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Between(String value1, String value2) {
+            addCriterion("ext_3 between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotBetween(String value1, String value2) {
+            addCriterion("ext_3 not between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

service/src/main/java/com/hfkj/entity/GoodsType.java

@@ -0,0 +1,257 @@
+package com.hfkj.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * goods_type
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class GoodsType implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 父类ID
+     */
+    private Long parentId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 业务类型 ：根据数据字典查询
+     */
+    private Integer businessType;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态 1：正常 0 删除
+     */
+    private Integer status;
+
+    /**
+     * 操作人
+     */
+    private Long opId;
+
+    /**
+     * 操作人名称
+     */
+    private String opName;
+
+    /**
+     * ext_1
+     */
+    private String ext1;
+
+    /**
+     * ext_2
+     */
+    private String ext2;
+
+    /**
+     * ext_3
+     */
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOpId() {
+        return opId;
+    }
+
+    public void setOpId(Long opId) {
+        this.opId = opId;
+    }
+
+    public String getOpName() {
+        return opName;
+    }
+
+    public void setOpName(String opName) {
+        this.opName = opName;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        GoodsType other = (GoodsType) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId()))
+            && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle()))
+            && (this.getBusinessType() == null ? other.getBusinessType() == null : this.getBusinessType().equals(other.getBusinessType()))
+            && (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
+            && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode());
+        result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
+        result = prime * result + ((getBusinessType() == null) ? 0 : getBusinessType().hashCode());
+        result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
+        result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", title=").append(title);
+        sb.append(", businessType=").append(businessType);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", status=").append(status);
+        sb.append(", opId=").append(opId);
+        sb.append(", opName=").append(opName);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

service/src/main/java/com/hfkj/service/SecRoleMenuRelService.java

@@ -23,6 +23,12 @@ public interface SecRoleMenuRelService {
      */
     void delete(Long relId);
 
+    /**
+     * 删除
+     * @param roleId 角色id
+     */
+    void deleteByRole(Long roleId);
+
     /**
      * 查询角色菜单关系
      * @param roleId 角色id

service/src/main/java/com/hfkj/service/goods/GoodsTypeService.java

@@ -0,0 +1,76 @@
+package com.hfkj.service.goods;
+
+import com.hfkj.entity.GoodsType;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @serviceName .java
+ * @author Sum1Dream
+ * @version 1.0.0
+ * @Description // 商品类目管理
+ * @createTime 15:07 2024/4/19
+ **/
+public interface GoodsTypeService {
+
+    /**
+    * @Author Sum1Dream
+    * @Name create
+    * @Description // 创建
+    * @Date 15:11 2024/4/19
+    * @Param goodsType
+     * @return void
+    */
+    void create(GoodsType goodsType);
+
+    /**
+    * @Author Sum1Dream
+    * @Name update
+    * @Description // 修改
+    * @Date 15:12 2024/4/19
+    * @Param goodsType
+     * @return void
+    */
+    void update(GoodsType goodsType);
+
+    /**
+    * @Author Sum1Dream
+    * @Name delete
+    * @Description // 修改
+    * @Date 15:12 2024/4/19
+    * @Param id
+     * @return void
+    */
+    void delete(Long id , Boolean fullDelete);
+
+    /**
+    * @Author Sum1Dream
+    * @Name queryDetail
+    * @Description // 根据ID查询产品类型详情
+    * @Date 15:12 2024/4/19
+    * @Param id
+     * @return com.hfkj.entity.GoodsType
+    */
+    GoodsType queryDetail(Long id);
+
+    /**
+    * @Author Sum1Dream
+    * @Name queryDetailByMap
+    * @Description // 根据多条件查询产品类型
+    * @Date 15:12 2024/4/19
+    * @Param map
+     * @return com.hfkj.entity.GoodsType
+    */
+    GoodsType queryDetailByMap(Map<String , Object> map);
+
+    /**
+    * @Author Sum1Dream
+    * @Name getList
+    * @Description // 根据多条件查询列表
+    * @Date 15:13 2024/4/19
+    * @Param map
+     * @return java.util.List<com.hfkj.entity.GoodsType>
+    */
+    List<GoodsType> getList(Map<String , Object> map);
+}

service/src/main/java/com/hfkj/service/goods/impl/GoodsTypeServiceImpl.java

@@ -0,0 +1,91 @@
+package com.hfkj.service.goods.impl;
+
+import com.hfkj.dao.GoodsTypeMapper;
+import com.hfkj.entity.GoodsType;
+import com.hfkj.entity.GoodsTypeExample;
+import com.hfkj.service.goods.GoodsTypeService;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service("goodsTypeService")
+public class GoodsTypeServiceImpl implements GoodsTypeService {
+
+    @Resource
+    private GoodsTypeMapper goodsTypeMapper;
+
+    @Override
+    public void create(GoodsType goodsType) {
+        goodsTypeMapper.insert(goodsType);
+    }
+
+    @Override
+    public void update(GoodsType goodsType) {
+        goodsTypeMapper.updateByPrimaryKey(goodsType);
+    }
+
+    @Override
+    public void delete(Long id , Boolean fullDelete) {
+        if (fullDelete) {
+            goodsTypeMapper.deleteByPrimaryKey(id);
+        } else {
+            GoodsType goodsType = queryDetail(id);
+            goodsType.setStatus(0);
+            goodsType.setUpdateTime(new Date());
+            update(goodsType);
+        }
+    }
+
+    @Override
+    public GoodsType queryDetail(Long id) {
+        return goodsTypeMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public GoodsType queryDetailByMap(Map<String, Object> map) {
+
+        GoodsTypeExample example = new GoodsTypeExample();
+        GoodsTypeExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(0);
+
+        if (MapUtils.getLong(map, "parentId") != null) {
+            criteria.andParentIdEqualTo(MapUtils.getLong(map, "parentId"));
+        }
+        if (MapUtils.getString(map, "title") != null) {
+            criteria.andTitleEqualTo(MapUtils.getString(map, "title"));
+        }
+        if (MapUtils.getInteger(map, "businessType") != null) {
+            criteria.andBusinessTypeEqualTo(MapUtils.getInteger(map, "businessType"));
+        }
+
+        List<GoodsType> list = goodsTypeMapper.selectByExample(example);
+
+        if (!list.isEmpty()) {
+            return list.get(0);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<GoodsType> getList(Map<String, Object> map) {
+
+        GoodsTypeExample example = new GoodsTypeExample();
+        GoodsTypeExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(0);
+
+        if (MapUtils.getLong(map, "parentId") != null) {
+            criteria.andParentIdEqualTo(MapUtils.getLong(map, "parentId"));
+        }
+        if (MapUtils.getString(map, "title") != null) {
+            criteria.andTitleEqualTo(MapUtils.getString(map, "title"));
+        }
+        if (MapUtils.getInteger(map, "businessType") != null) {
+            criteria.andBusinessTypeEqualTo(MapUtils.getInteger(map, "businessType"));
+        }
+
+        return goodsTypeMapper.selectByExample(example);
+    }
+}

service/src/main/java/com/hfkj/service/impl/SecMenuServiceImpl.java

@@ -166,8 +166,8 @@ public class SecMenuServiceImpl implements SecMenuService {
         if (secRole == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的角色");
         }
-        // 查询角色菜单
+        // 删除角色权限旧数据
-        List<SecRoleMenuRel> roleMenuList = secRoleMenuRelService.getRelListByRole(roleId);
+        secRoleMenuRelService.deleteByRole(roleId);
 
         SecRoleMenuRel rel;
         List<SecRoleMenuRel> relList = new ArrayList<>();
@@ -177,11 +177,9 @@ public class SecMenuServiceImpl implements SecMenuService {
             rel.setMenuId(menuId);
             relList.add(rel);
         }
-        // 数据集合并
-        relList.addAll(roleMenuList);
         // 根据菜单id去重
         List<SecRoleMenuRel> collectList = relList.stream().filter(StreamUtil.distinctByKey(b -> b.getMenuId())).collect(Collectors.toList());
-        // 绑定角色与菜单关系
+        // 角色新菜单权限
         secRoleMenuRelService.batchAdd(collectList);
         // 更新缓存
         redisUtil.hdel(CACHE_ROLE_MENU, ""+roleId);

service/src/main/java/com/hfkj/service/impl/SecRoleMenuRelServiceImpl.java

@@ -30,6 +30,13 @@ public class SecRoleMenuRelServiceImpl implements SecRoleMenuRelService {
         secRoleMenuRelMapper.deleteByPrimaryKey(relId);
     }
 
+    @Override
+    public void deleteByRole(Long roleId) {
+        SecRoleMenuRelExample example = new SecRoleMenuRelExample();
+        example.createCriteria().andRoleIdEqualTo(roleId);
+        secRoleMenuRelMapper.deleteByExample(example);
+    }
+
     @Override
     public List<SecRoleMenuRel> getRelListByRole(Long roleId) {
         SecRoleMenuRelExample example = new SecRoleMenuRelExample();

user/src/main/java/com/UserApplication.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @MapperScan("com.hfkj.dao")
 public class UserApplication
 {
+
 	 public static void main( String[] args )
 	 {
 	 	ApplicationContext app = SpringApplication.run(UserApplication.class, args);