Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysMenuDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.auth.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +22,10 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
      * @return
      */
     List<SysMenu> findByUser(Integer userId);
+
+    /**
+     * 根据权限标识查菜单
+     * @return
+     */
+    SysMenu findMenuByPermission(@Param("permission") String permission);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleDao.java

@@ -2,6 +2,8 @@ package com.ym.mec.auth.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysRole;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
@@ -12,4 +14,11 @@ public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
      * @return
      */
     List<SysRole> findRoleByUserId(Integer userId);
+
+    /**
+     * 根据role_code 查询角色
+     * @param code
+     * @return
+     */
+    SysRole findRoleByCode(@Param("code") String code);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysMenuService.java

@@ -20,4 +20,11 @@ public interface SysMenuService extends BaseService<Integer, SysMenu> {
      * @return
      */
     List<SysMenu> findByUser(Integer id);
+
+    /**
+     * 根据权限标识查菜单
+     * @param permission
+     * @return
+     */
+    SysMenu findMenuByPermission(String permission);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysRoleService.java

@@ -13,4 +13,11 @@ public interface SysRoleService extends BaseService<Integer, SysRole> {
      * @return
      */
     List<SysRole> findRoleByUserId(Integer userId);
+
+    /**
+     * 根据角色标识查询角色
+     * @param code
+     * @return
+     */
+    SysRole findRoleByCode(String code);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -31,4 +31,9 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	public List<SysMenu> findByUser(Integer id) {
 		return sysMenuDao.findByUser(id);
 	}
+
+	@Override
+	public SysMenu findMenuByPermission(String permission){
+		return sysMenuDao.findMenuByPermission(permission);
+	}
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -27,4 +27,10 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	public List<SysRole> findRoleByUserId(Integer userId) {
 		return sysRoleDao.findRoleByUserId(userId);
 	}
+
+	@Override
+	public SysRole findRoleByCode(String code){
+		return sysRoleDao.findRoleByCode(code);
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -22,6 +22,10 @@ public class MenuController extends BaseController {
     @ApiOperation("新增菜单")
     @PutMapping("/add")
     public Object getMenu(SysMenu sysMenu) {
+        SysMenu menuByPermission = sysMenuService.findMenuByPermission(sysMenu.getPermission());
+        if(menuByPermission != null){
+            return failed("权限标识不能重复");
+        }
         Date date = new Date();
         sysMenu.setUpdateTime(date);
         sysMenu.setCreateTime(date);
@@ -37,6 +41,10 @@ public class MenuController extends BaseController {
     @ApiOperation("根据菜单id修改菜单")
     @PutMapping("/update")
     public Object updateMenu(SysMenu sysMenu) {
+        SysMenu menuByPermission = sysMenuService.findMenuByPermission(sysMenu.getPermission());
+        if(menuByPermission != null && !menuByPermission.getId().equals(sysMenu.getId())){
+            return failed("权限标识不能重复");
+        }
         Date date = new Date();
         sysMenu.setUpdateTime(date);
         return succeed(sysMenuService.update(sysMenu));

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -39,6 +39,10 @@ public class RoleController extends BaseController {
     @ApiOperation("修改角色")
     @PutMapping("/update")
     public Object updateRole(SysRole sysRole) {
+        SysRole roleByCode = sysRoleService.findRoleByCode(sysRole.getRoleCode());
+        if(roleByCode != null && !roleByCode.getId().equals(sysRole.getId())){
+            return failed("权限标识已存在");
+        }
         sysRole.setUpdateTime(new Date());
         sysRoleService.update(sysRole);
         return succeed();
@@ -47,6 +51,10 @@ public class RoleController extends BaseController {
     @ApiOperation("新增角色")
     @PostMapping("/add")
     public Object addRole(SysRole sysRole) {
+        SysRole roleByCode = sysRoleService.findRoleByCode(sysRole.getRoleCode());
+        if(roleByCode != null){
+            return failed("权限标识已存在");
+        }
         Date date = new Date();
         sysRole.setUpdateTime(date);
         sysRole.setCreateTime(date);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -113,4 +113,9 @@
 		LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
 		WHERE sur.user_id_ = #{userId} AND sr.del_flag_ = 0 AND sm.del_flag_ = 0
 	</select>
+
+    <!-- 根据权限标识查菜单 -->
+    <select id="findMenuByPermission" resultType="com.ym.mec.auth.api.entity.SysMenu">
+        SELECT * FROM `sys_role_menu` WHERE `permission_` = #{permission} AND sm.del_flag_ = 0
+    </select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -80,4 +80,8 @@
     <select id="findRoleByUserId" resultMap="SysRole">
 		SELECT sr.* FROM sys_user_role sur LEFT JOIN sys_role sr ON sur.role_id_ = sr.id_ WHERE sur.user_id_ = #{userId} AND sr.del_flag_ = 0
 	</select>
+
+    <select id="findRoleByCode" resultMap="SysRole">
+        SELECT sr.* FROM sys_role WHERE role_code_ = #{code} AND sr.del_flag_ = 0
+    </select>
 </mapper>

mec-rongyun/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.ym</groupId>
+    <artifactId>mec</artifactId>
+    <version>1.0</version>
+  </parent>
+  <groupId>com.ym</groupId>
+  <artifactId>mec-rongyun</artifactId>
+  <version>1.0</version>
+  <name>mec-rongyun</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

mec-rongyun/src/main/java/com/ym/App.java

@@ -0,0 +1,13 @@
+package com.ym;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

mec-rongyun/src/test/java/com/ym/AppTest.java

@@ -0,0 +1,38 @@
+package com.ym;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/GoodsCategoryController.java

@@ -0,0 +1,58 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.GoodsCategory;
+import com.ym.mec.web.service.GoodsCategoryService;
+import com.ym.mec.web.service.GoodsService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("category")
+@Api(tags = "商品分类服务")
+@RestController
+public class GoodsCategoryController extends BaseController {
+
+    @Autowired
+    private GoodsCategoryService GoodsCategoryCategoryService;
+
+    @Autowired
+    private GoodsService goodsService;
+
+    @ApiOperation(value = "新增商品分类")
+    @PostMapping("/add")
+    public Object add(GoodsCategory goodsCategory) {
+        Date date = new Date();
+        goodsCategory.setCreateTime(date);
+        goodsCategory.setUpdateTime(date);
+        GoodsCategoryCategoryService.insert(goodsCategory);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除商品分类")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "商品分类编号", required = true) @PathVariable("id") Integer id) {
+        int num = goodsService.findGoodsNumByCategoryId(id);
+        if (num > 0) {
+            return failed("商品分类下有商品,不能删除");
+        }
+        GoodsCategoryCategoryService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改商品分类")
+    @PutMapping("/update")
+    public Object update(GoodsCategory goodsCategory) {
+        goodsCategory.setUpdateTime(new Date());
+        GoodsCategoryCategoryService.update(goodsCategory);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据商品分类编号查询商品分类")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "商品分类编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(GoodsCategoryCategoryService.get(id));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsDao.java

@@ -14,4 +14,11 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
      * @return
      */
     List<Goods> findGoodsBySubId(@Param("subjectId") Integer subjectId, @Param("goodsCategoryId") Integer goodsCategoryId);
+
+    /**
+     * 根据商品分类查找商品数量
+     * @param goodsCategoryId
+     * @return
+     */
+    int findGoodsNumByCategoryId(@Param("goodsCategoryId") Integer goodsCategoryId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/entity/GoodsCategory.java

@@ -13,15 +13,15 @@ public class GoodsCategory {
 	private Integer id;
 	
 	/** 分类名称 */
-	@ApiModelProperty(value = "分类名称",required = false)
+	@ApiModelProperty(value = "分类名称",required = true)
 	private String name;
 	
 	/** 产品展示的图片地址 */
-	@ApiModelProperty(value = "产品展示的图片地址",required = false)
+	@ApiModelProperty(value = "产品展示的图片地址")
 	private String img;
 	
 	/** 父节点编号 */
-	@ApiModelProperty(value = "父节点编号",required = false)
+	@ApiModelProperty(value = "父节点编号",required = true)
 	private Integer parentId;
 	
 	/** 顺序编号 */

mec-web/src/main/java/com/ym/mec/web/service/GoodsService.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Goods;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,4 +14,12 @@ public interface GoodsService extends BaseService<Integer, Goods> {
      * @return
      */
     List<Goods> findGoodsBySubId(Integer subjectId,Integer goodsCategoryId);
+
+    /**
+     * 根据商品分类id查找商品数量
+     * @param goodsCategoryId
+     * @return
+     */
+    int findGoodsNumByCategoryId(@Param("goodsCategoryId") Integer goodsCategoryId);
+
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/GoodsServiceImpl.java

@@ -26,4 +26,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	public List<Goods> findGoodsBySubId(Integer subjectId,Integer goodsCategoryId) {
 		return goodsDao.findGoodsBySubId(subjectId,goodsCategoryId);
 	}
+
+	public int findGoodsNumByCategoryId(Integer goodsCategoryId){
+		return goodsDao.findGoodsNumByCategoryId(goodsCategoryId);
+	}
 }

mec-web/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -138,4 +138,9 @@
         SELECT g.* FROM subject_goods_mapper sgm LEFT JOIN goods g ON sgm.goods_id_ = g.id_
         WHERE sgm.subject_id_ =  #{subjectId} AND g.goods_category_id_ = #{goodsCategoryId}
     </select>
+
+    <!-- 根据 -->
+    <select id="findGoodsNumByCategoryId" resultType="int">
+        SELECT COUNT(*) FROM goods WHERE goods_category_id_ = #{goodsCategoryId}
+    </select>
 </mapper>

pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ym</groupId>
@@ -312,5 +311,6 @@
 		<module>codegen</module>
 		<module>mec-web</module>
 		<module>cms</module>
-	</modules>
+	  <module>mec-rongyun</module>
+  </modules>
 </project>