修复删除权限组时，删除权限组下权限报错的bug

wuxw

2019-04-08 217d02a32b1c36b2c6dca9f1df74df8a3727ec58

 OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java

@@ -4,6 +4,7 @@
import com.java110.common.cache.MappingCache;
import com.java110.common.constant.MappingConstant;
import com.java110.common.util.Assert;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.order.dao.IPrivilegeDAO;
import com.java110.order.smo.IPrivilegeSMO;
import org.slf4j.Logger;
@@ -12,6 +13,9 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * 用户权限处理类
@@ -57,6 +61,76 @@
        return new ResponseEntity<String>("未知异常", HttpStatus.INTERNAL_SERVER_ERROR);
    }

    /**
     * 删除用户权限
     * @param privilegeInfo
     * @return
     */
    @Override
    public ResponseEntity<String> deleteUserAllPrivilege(String privilegeInfo) {
        Assert.isJsonObject(privilegeInfo,"请求报文不是有效的json格式");

        Assert.jsonObjectHaveKey(privilegeInfo,"userId","请求报文中未包含userId节点");

        JSONObject privilegeObj = JSONObject.parseObject(privilegeInfo);
        if(privilegeDAOImpl.deleteUserAllPrivilege(privilegeObj)){
            return new ResponseEntity<String>("成功", HttpStatus.OK);
        }

        return new ResponseEntity<String>("未知异常", HttpStatus.INTERNAL_SERVER_ERROR);
    }

    @Override
    public ResponseEntity<String> savePrivilegeGroup(String privilegeGroupInfo) {

        Assert.isJsonObject(privilegeGroupInfo,"请求报文不是有效的json格式");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"name","请求报文中未包含name节点");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"storeId","请求报文中未包含storeId节点");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"storeTypeCd","请求报文中未包含storeTypeCd节点");
        JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroupInfo);

        privilegeGroupObj.put("pgId",GenerateCodeFactory.getPgId());

        if(privilegeDAOImpl.savePrivilegeGroup(privilegeGroupObj)){
            return new ResponseEntity<String>("成功", HttpStatus.OK);
        }

        return new ResponseEntity<String>("未知异常", HttpStatus.INTERNAL_SERVER_ERROR);
    }

    /**
     * 删除权限组
     * @param privilegeGroupInfo
     * @return
     */
    @Override
    public ResponseEntity<String> deletePrivilegeGroup(String privilegeGroupInfo) {

        Assert.isJsonObject(privilegeGroupInfo,"请求报文不是有效的json格式");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"pgId","请求报文中未包含pgId节点");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"storeId","请求报文中未包含storeId节点");

        Assert.jsonObjectHaveKey(privilegeGroupInfo,"storeTypeCd","请求报文中未包含storeTypeCd节点");
        JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroupInfo);
        //删除权限组
        privilegeDAOImpl.deletePrivilegeGroup(privilegeGroupObj);

        List<Map> privileges = privilegeDAOImpl.queryPrivilegeRel(privilegeGroupObj);

        if(privileges !=null && privileges.size()>0) {
            //删除权限组和权限关系
            privilegeDAOImpl.deletePrivilegeRel(privilegeGroupObj);
        }

        return new ResponseEntity<String>("成功", HttpStatus.OK);

    }


    public IPrivilegeDAO getPrivilegeDAOImpl() {
        return privilegeDAOImpl;