Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git

src/main/java/com/govmade/modules/system/controller/AreaController.java

@@ -7,11 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.govmade.common.utils.R;
+import com.govmade.common.validator.Assert;
 import com.govmade.modules.basic.controller.AbstractController;
 import com.govmade.modules.system.entity.AreaEntity;
 import com.govmade.modules.system.service.AreaService;
@@ -56,15 +58,16 @@ public class AreaController extends AbstractController{
 	}
 	
 	/**
-     * 删除、批量删除区划
+	 * 批量删除区划
 	 * 
 	 * @param ids
 	 * @return
 	 */
 	@DeleteMapping("/delete")
-    public R deleteArea(@RequestParam Set<Long> ids) {
+	public R deleteArea(@RequestBody Set<Long> ids) {
+		Assert.isNull(ids, "删除项不能为空");
 
-        areaService.deleteBatchIds(ids);
+		areaService.deleteBatch(ids);
 		return R.ok();
 	}
 	

src/main/java/com/govmade/modules/system/controller/DepartController.java

@@ -14,9 +14,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.R;
+import com.govmade.common.validator.Assert;
 import com.govmade.modules.basic.controller.AbstractController;
 import com.govmade.modules.system.entity.DepartEntity;
 import com.govmade.modules.system.service.DepartService;
+import com.govmade.modules.system.service.UserService;
 
 /**
  * 系统管理 - 部门设置
@@ -31,6 +33,9 @@ public class DepartController extends AbstractController{
 	@Autowired
 	private DepartService departService;
 	
+	@Autowired
+	private UserService userService;
+	
 	/**
 	 * 部门列表
 	 */
@@ -59,14 +64,18 @@ public class DepartController extends AbstractController{
 	
 
 	/**
-	 * 删除或批量删除角色
+	 * 批量删除部门
+	 * 
+	 * @param ids
+	 * @return
 	 */
-	@DeleteMapping("/delete")
 	public R deleteDepart(@RequestBody Set<Long> ids) {
-
-        departService.deleteBatchIds(ids);
+		Assert.isNull(ids, "删除项不能为空");
+        if(this.userService.userCount(ids)>0) {
+           return R.error("选中部门下有用户！！");
+        }
+		departService.deleteBatch(ids);
 		return R.ok();
 	}
 	
-	
 }

src/main/java/com/govmade/modules/system/controller/ModuleController.java

+package com.govmade.modules.system.controller;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.govmade.common.utils.PageUtils;
+import com.govmade.common.utils.R;
+import com.govmade.common.validator.Assert;
+import com.govmade.modules.basic.controller.AbstractController;
+import com.govmade.modules.system.entity.ModuleEntity;
+import com.govmade.modules.system.service.ModuleService;
+
+/**
+ * 系统管理 - 模块设置
+ * 
+ * @author 刘弈臻
+ * @date 2018年8月9日
+ */
+@RestController
+@RequestMapping("/system/module")
+public class ModuleController extends AbstractController{
+	
+	@Autowired
+	private ModuleService moduleService;
+	
+	/**
+	 * 模块列表
+	 */
+	@GetMapping("/list")
+	public R list(@RequestParam Map<String, Object> params) {
+		
+		PageUtils page = moduleService.queryPage(params);
+		return R.ok().put("page", page);
+	}
+	
+	/**
+	 * 保存或更新模块
+	 */
+	@PostMapping("/save")
+	public R save(ModuleEntity module) {
+
+		if (null == module.getId()) {
+			if (this.moduleService.checkModule(module.getName()) > 0) {
+				return R.error(module.getName() + " 已存在!");
+			}
+			
+		}
+		moduleService.save(module);
+		return R.ok();
+	}
+	
+	/**
+	 * 批量删除模块
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping("/delete")
+	public R deleteModule(@RequestBody Set<Long> ids) {
+		Assert.isNull(ids, "删除项不能为空");
+
+		moduleService.deleteBatch(ids);
+		return R.ok();
+	}
+    
+}

src/main/java/com/govmade/modules/system/controller/RoleController.java

@@ -7,12 +7,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.R;
+import com.govmade.common.validator.Assert;
 import com.govmade.modules.basic.controller.AbstractController;
 import com.govmade.modules.system.entity.RoleEntity;
 import com.govmade.modules.system.service.RoleService;
@@ -57,13 +59,18 @@ public class RoleController extends AbstractController{
 		return R.ok();
 	}
 	
-	/**
-	 * 删除或批量删除角色
+
+/**
+	 * 批量删除角色
+	 * 
+	 * @param ids
+	 * @return
 	 */
 	@DeleteMapping("/delete")
-    public R deleteUser(@RequestParam Set<Long> ids) {
+	public R deleteRole(@RequestBody Set<Long> ids) {
+		Assert.isNull(ids, "删除项不能为空");
 
-        roleService.deleteBatchIds(ids);
+		roleService.deleteBatch(ids);
 		return R.ok();
 	}
 	

src/main/java/com/govmade/modules/system/dao/AreaDao.java

 package com.govmade.modules.system.dao;
 
+import java.util.Set;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.govmade.modules.system.entity.AreaEntity;
@@ -14,5 +17,8 @@ import com.govmade.modules.system.entity.AreaEntity;
 @Mapper
 public interface AreaDao extends BaseMapper<AreaEntity> {
 
-	
+	/**
+	 * 批量删除或删除
+	 */
+	void deleteBatch(@Param("ids") Set<Long> ids);
 }

src/main/java/com/govmade/modules/system/dao/DepartDao.java

 package com.govmade.modules.system.dao;
 
+import java.util.Set;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.govmade.modules.system.entity.DepartEntity;
@@ -14,4 +17,8 @@ import com.govmade.modules.system.entity.DepartEntity;
 @Mapper
 public interface DepartDao extends BaseMapper<DepartEntity>{
      
+	/**
+	 * 批量删除或删除
+	 */
+	void deleteBatch(@Param("ids") Set<Long> ids);
 }

src/main/java/com/govmade/modules/system/dao/ModuleDao.java

+package com.govmade.modules.system.dao;
+
+import java.util.Set;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.govmade.modules.system.entity.ModuleEntity;
+
+/**
+ * 系统管理 - 模块设置
+ * 
+ * @author 刘弈臻
+ * @date 2018年8月9日
+ */
+@Mapper
+public interface ModuleDao extends BaseMapper<ModuleEntity>{
+
+	/**
+	 * 删除或批量删除
+	 */
+	void deleteBatch(@Param("ids") Set<Long> ids);
+	
+}

src/main/java/com/govmade/modules/system/dao/RoleDao.java

 package com.govmade.modules.system.dao;
 
+import java.util.Set;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.govmade.modules.system.entity.RoleEntity;
@@ -14,5 +17,8 @@ import com.govmade.modules.system.entity.RoleEntity;
 @Mapper
 public interface RoleDao extends BaseMapper<RoleEntity>{
 
-	
+	/**
+	 * 批量删除或删除
+	 */
+	void deleteBatch(@Param("ids") Set<Long> ids);
 }

src/main/java/com/govmade/modules/system/dao/UserDao.java

@@ -37,4 +37,6 @@ public interface UserDao extends BaseMapper<UserEntity> {
 
 	void deleteBatch(@Param("ids") Set<Long> ids);
 	
+	Integer userCount(@Param("ids") Set<Long> ids);
+
 }

src/main/java/com/govmade/modules/system/entity/ModuleEntity.java

+package com.govmade.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.govmade.modules.basic.entity.BaseEntity;
+
+/**
+ * 系统管理 - 模块设置
+ * 
+ * @author 刘弈臻
+ * @date 2018年8月9日
+ */
+@TableName("system_modules")
+public class ModuleEntity extends BaseEntity<Long>{
+
+	private static final long serialVersionUID = 1L;
+	
+	private String name; //模块名称
+	
+	private String path; //模块路径
+	
+	private String icon; //图标
+	
+	private Integer isShow; //是否显示
+	
+	private Long weight; //权重
+
+	
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public Integer getIsShow() {
+		return isShow;
+	}
+
+	public void setIsShow(Integer isShow) {
+		this.isShow = isShow;
+	}
+
+	public Long getWeight() {
+		return weight;
+	}
+
+	public void setWeight(Long weight) {
+		this.weight = weight;
+	}
+	
+	
+}

src/main/java/com/govmade/modules/system/service/AreaService.java

 package com.govmade.modules.system.service;
 
 import java.util.List;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.service.IService;
 import com.govmade.modules.system.entity.AreaEntity;
@@ -26,7 +27,7 @@ public interface AreaService extends IService<AreaEntity>{
 	/**
 	 * 删除行政区划
 	 */
-	void deleteBatch(Long[] areaIds);
+	void deleteBatch(Set<Long> ids);
 	
 
     /**

src/main/java/com/govmade/modules/system/service/DepartService.java

 package com.govmade.modules.system.service;
 
 import java.util.Map;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.service.IService;
 import com.govmade.common.utils.PageUtils;
@@ -27,7 +28,7 @@ public interface DepartService extends IService<DepartEntity>{
 	/**
 	 * 删除部门
 	 */
-	void deleteBatch(Long[] roleIds);
+	void deleteBatch(Set<Long> ids);
 	
 
     /**

src/main/java/com/govmade/modules/system/service/ModuleService.java

+package com.govmade.modules.system.service;
+
+import java.util.Map;
+import java.util.Set;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.govmade.common.utils.PageUtils;
+import com.govmade.modules.system.entity.ModuleEntity;
+
+/**
+ * 系统管理 - 模块设置
+ * 
+ * @author 刘弈臻
+ * @date 2018年8月9日
+ */
+public interface ModuleService extends IService<ModuleEntity>{
+
+	/**
+	 * 分页查询模块
+	 */
+	PageUtils queryPage(Map<String, Object> params);
+	
+	/**
+	 * 保存或修改模块
+	 */
+	void save(ModuleEntity module);
+	
+	/**
+	 * 删除模块
+	 */
+	void deleteBatch(Set<Long> ids);
+	
+   /**	
+	*模块查重
+	*/
+	Integer checkModule(String name);
+}

src/main/java/com/govmade/modules/system/service/RoleService.java

 package com.govmade.modules.system.service;
 
 import java.util.Map;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.service.IService;
 import com.govmade.common.utils.PageUtils;
@@ -26,9 +27,9 @@ public interface RoleService extends IService<RoleEntity>{
 	void save(RoleEntity role);
 	
 	/**
-	 * 删除角色
+	 * 删除或批量删除角色
 	 */
-	void deleteBatch(Long[] roleIds);
+	void deleteBatch(Set<Long> ids);
 	
 	/**
 	 * 角色查重

src/main/java/com/govmade/modules/system/service/UserService.java

@@ -42,4 +42,6 @@ public interface UserService extends IService<UserEntity> {
 	Integer checkUser(String username);
 	
 	UserEntity queryOne(Map<String, Object> params);
+	
+	Integer userCount(Set<Long> ids);
 }

src/main/java/com/govmade/modules/system/service/impl/AreaServiceImpl.java

 package com.govmade.modules.system.service.impl;
 
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
@@ -53,8 +54,8 @@ public class AreaServiceImpl extends ServiceImpl<AreaDao,AreaEntity> implements
 	}
 	
 	@Override
-	public void deleteBatch(Long[] areaIds) {
-		// TODO Auto-generated method stub
+	public void deleteBatch(Set<Long> ids) {
+		this.baseMapper.deleteBatch(ids);
 	}
 	
 	@Override

src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java

 package com.govmade.modules.system.service.impl;
 
 import java.util.Map;
+import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
@@ -42,8 +43,8 @@ public class DepartServiceImpl extends ServiceImpl<DepartDao,DepartEntity> imple
 	}
     
     @Override
-	public void deleteBatch(Long[] roleIds) {
-		// TODO Auto-generated method stub
+	public void deleteBatch(Set<Long> ids) {
+		this.baseMapper.deleteBatch(ids);
 	}
     
     @Override

src/main/java/com/govmade/modules/system/service/impl/ModuleServiceImpl.java

+package com.govmade.modules.system.service.impl;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.govmade.common.utils.PageUtils;
+import com.govmade.common.utils.Query;
+import com.govmade.modules.system.dao.ModuleDao;
+import com.govmade.modules.system.entity.ModuleEntity;
+import com.govmade.modules.system.service.ModuleService;
+
+import cn.hutool.core.util.StrUtil;
+
+
+
+/**
+ * 系统管理 - 模块设置
+ * 
+ * @author 刘弈臻
+ * @date 2018年8月9日
+ */
+@Service("ModuleService")
+public class ModuleServiceImpl extends ServiceImpl<ModuleDao, ModuleEntity> implements ModuleService{
+
+	@Override
+	public PageUtils queryPage(Map<String, Object> params) {
+		
+		String name = (String) params.get("name");
+		Page<ModuleEntity> page = this.selectPage(new Query<ModuleEntity>(params).getPage(),
+				new EntityWrapper<ModuleEntity>()
+				.like(StrUtil.isNotBlank(name), "name", name));
+		return new PageUtils(page);
+	}
+	
+	@Override
+	public void save(ModuleEntity module) {
+		super.insertOrUpdate(module);
+	}
+	
+	@Override
+	public void deleteBatch(Set<Long> ids) {
+		this.baseMapper.deleteBatch(ids);
+	}
+	
+	@Override
+	public Integer checkModule(String name) {
+		return super.selectCount(new EntityWrapper<ModuleEntity>().eq("name", name));
+	}
+}

src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java

 package com.govmade.modules.system.service.impl;
 
 import java.util.Map;
+import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
@@ -40,8 +41,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, RoleEntity> implements
 	}
 	
 	@Override
-	public void deleteBatch(Long[] roleIds) {
-		// TODO Auto-generated method stub
+	public void deleteBatch(Set<Long> ids) {
+		this.baseMapper.deleteBatch(ids);
 	}
 	
 	@Override

src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java

@@ -70,4 +70,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 		return (UserEntity) this
 				.selectOne(new EntityWrapper<UserEntity>().eq(StrUtil.isNotBlank(username), "username", username));
 	}
+	
+	@Override
+	public Integer userCount(Set<Long> ids) {
+		return this.baseMapper.userCount(ids);
+	}
 }

src/main/resources/mapper/system/AreaDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.govmade.modules.system.dao.AreaDao">
+
+	<!-- 批量删除 -->
+	<update id="deleteBatch">
+		UPDATE system_areas SET state =${@com.govmade.common.utils.Constant@STATE_DELETE} WHERE id IN 
+		<foreach collection="ids" item="id" open="("  close=")" separator=",">
+            #{id}
+        </foreach>
+	</update>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/system/DepartDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.govmade.modules.system.dao.DepartDao">
+
+	<!-- 批量删除 -->
+	<update id="deleteBatch">
+		UPDATE system_departs SET state =${@com.govmade.common.utils.Constant@STATE_DELETE} WHERE id IN 
+		<foreach collection="ids" item="id" open="("  close=")" separator=",">
+            #{id}
+        </foreach>
+	</update>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/system/ModuleDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.govmade.modules.system.dao.ModuleDao">
+
+	<!-- 批量删除 -->
+	<update id="deleteBatch">
+		UPDATE system_modules SET state =${@com.govmade.common.utils.Constant@STATE_NORMAL} WHERE id IN 
+		<foreach collection="ids" item="id" open="("  close=")" separator=",">
+            #{id}
+        </foreach>
+	</update>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/system/RoleDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.govmade.modules.system.dao.RoleDao">
+
+	<!-- 批量删除 -->
+	<update id="deleteBatch">
+		UPDATE system_roles SET state =${@com.govmade.common.utils.Constant@STATE_DELETE} WHERE id IN 
+		<foreach collection="ids" item="id" open="("  close=")" separator=",">
+            #{id}
+        </foreach>
+	</update>
+</mapper>

src/main/resources/mapper/system/UserDao.xml

@@ -5,9 +5,16 @@
 
 	<!-- 批量删除 -->
 	<update id="deleteBatch">
-		UPDATE system_users SET state =${@com.govmade.common.utils.Constant@STATE_NORMAL} WHERE id IN 
+		UPDATE system_users SET state =${@com.govmade.common.utils.Constant@STATE_DELETE} WHERE id IN 
 		<foreach collection="ids" item="id" open="("  close=")" separator=",">
             #{id}
         </foreach>
 	</update>
+	
+	<select id="userCount" resultType="Integer">
+	    SELECT COUNT(*) FROM system_users WHERE state =${@com.govmade.common.utils.Constant@STATE_NORMAL} AND dept_id IN
+	    <foreach collection="ids" item="id" open="("  close=")" separator=",">
+            #{id}
+        </foreach>	
+	</select>
 </mapper>
\ No newline at end of file