角色 前端/后端 完成

CODE/smart-community/operate-api/src/main/java/com/community/huiju/OperateApplication.java

@@ -27,7 +27,8 @@ public class OperateApplication {
 		FastJsonConfig fastJsonConfig = new FastJsonConfig();
 		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue);
 		//日期格式化
-		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		//	fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		// fastJsonConfig.setDateFormat("yyyy-MM-dd");
 		converter.setFastJsonConfig(fastJsonConfig);
 		return new HttpMessageConverters(converter);
 	}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/SysRoleController.java

@@ -13,6 +13,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 @RefreshScope
 @RestController
@@ -76,4 +77,18 @@ public class SysRoleController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/role/delete", method = RequestMethod.POST)
+    @ApiOperation(value = "删除角色", notes = "删除角色")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "id角色编号集合")
+    })
+    public ResponseBean deleteRole(@RequestBody List<Integer> parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iToSysRoleService.deleteRole(parameter, userElement);
+
+        return responseBean;
+    }
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysRoleMapper.java

@@ -45,4 +45,13 @@ public interface ToSysRoleMapper {
     ToSysRole selectByRoleName(@Param("roleName") String roleName);
 
 
+    /**
+     * 批量删除
+     *
+     *  只是把 status 改为 0 无效
+     *
+     * @return
+     */
+    int banchDeleteRole(List<Integer> list);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysUserRoleMapper.java

@@ -2,6 +2,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.ToSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ToSysUserRoleMapper {
@@ -16,4 +19,11 @@ public interface ToSysUserRoleMapper {
     int updateByPrimaryKeySelective(ToSysUserRole record);
 
     int updateByPrimaryKey(ToSysUserRole record);
+
+    /**
+     * 根据 角色id 查询 用户和角色关联关系
+     * @param roleId
+     * @return
+     */
+    List<ToSysUserRole> selelctByRoleId(@Param("roleId") Integer roleId);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

@@ -11,6 +11,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,9 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
     @Autowired
     private ToUserMapper toUserMapper;
 
+    @Autowired
+    private ToSysUserRoleMapper toSysUserRoleMapper;
+
     @Override
     public List<ToSysRole> selectRoleByUserId(Integer userId) {
 
@@ -146,6 +150,7 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateRole(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -178,12 +183,24 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean deleteRole(List<Integer> ids, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         ids.forEach(e ->{
-
+            List<ToSysUserRole> userRoleList = toSysUserRoleMapper.selelctByRoleId(e);
+            if (CollectionUtils.isNotEmpty(userRoleList)) {
+                throw new WisdomException("角色存在用户关联关系, 无法删除!");
+            }
+            ToSysRole toSysRole = toSysRoleMapper.selectByPrimaryKey(e);
+            if (null == toSysRole) {
+                throw new WisdomException("删除失败, 角色编号 " + e + " 不存在!");
+            }
+            toSysRole.setStatus("0");
+            toSysRole.setUpdateUser(userElement.getId());
+            toSysRole.setUpdateDate(new Date());
+            toSysRoleMapper.updateByPrimaryKeySelective(toSysRole);
         });
-
+        responseBean.addSuccess("操作成功!");
         return responseBean;
     }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysRoleMapper.xml

@@ -137,8 +137,9 @@
     <include refid="Base_Column_List"/>
     from to_sys_role
     <where>
+      status != 0
       <if test="roleName != null and roleName != ''">
-        role_name like concat('%',#{roleName,jdbcType=VARCHAR},'%')
+        and role_name like concat('%',#{roleName,jdbcType=VARCHAR},'%')
       </if>
     </where>
   </select>
@@ -151,4 +152,12 @@
         role_name = #{roleName,jdbcType=VARCHAR}
     </where>
   </select>
+
+  <update id="banchDeleteRole" parameterType="list">
+    update to_sys_role
+    set status = 0 where id in
+    <foreach collection="list" index="index" separator="," open="(" close=")" item="item">
+      #{item}
+    </foreach>
+  </update>
 </mapper>

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysUserRoleMapper.xml

@@ -68,4 +68,10 @@
       role_id = #{roleId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selelctByRoleId" parameterType="integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from to_sys_user_role
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </select>
 </mapper>

VUECODE/smart-operate-manage/src/api/role.js

@@ -45,3 +45,12 @@ export function getRoleInfo(id) {
     method: 'get'
   })
 }
+
+// 根据 角色id集合 删除
+export function deleteRole(data) {
+  return request({
+    url: '/role/delete',
+    method: 'post',
+    data
+  })
+}

VUECODE/smart-operate-manage/src/store/modules/role.js

@@ -1,4 +1,4 @@
-import { getRoleList, getMenuList, addRole, updateRole, getRoleInfo } from '@/api/role'
+import { getRoleList, getMenuList, addRole, updateRole, getRoleInfo, deleteRole } from '@/api/role'
 
 const role = {
 
@@ -47,6 +47,15 @@ const role = {
           reject(err)
         })
       })
+    },
+    DeleteRole({ commit }, data) { // 根据 角色id 集合 删除
+      return new Promise((resolve, reject) => {
+        deleteRole(data).then(response => {
+          resolve(response)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
     }
   }
 }

VUECODE/smart-operate-manage/src/views/account/role/index.vue

@@ -155,14 +155,31 @@ export default {
       this.getRoleList()
     },
     deleteRole() { // 删除角色
+      const ids = this.selectId
+      if (ids.length <= 0) {
+        this.$message.error('请至少选择一行!')
+        return
+      }
+      this.$store.dispatch('DeleteRole', ids).then((res) => {
+        if (res.code === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.getRoleList()
+      }).catch(() => {
+        console.log('error DeleteRole')
+      })
     },
     updateRole() { // 修改角色
       const ids = this.selectId
       if (ids.length <= 0) {
         this.$message.error('请至少选择一行!')
+        return
       }
       if (ids.length > 1) {
         this.$message.error('只能选择一行数据!')
+        return
       }
       this.$router.push({ name: 'role-edi', params: { id: ids[0] }})
     },