Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 WebService/src/main/java/com/java110/web/smo/impl/PrivilegeServiceSMOImpl.java

@@ -22,6 +22,7 @@

    /**
     * 查询 权限组
     *
     * @param pd
     * @return
     */
@@ -61,6 +62,7 @@

    /**
     * 查询权限
     *
     * @param pd
     * @return
     */
@@ -90,6 +92,7 @@

    /**
     * 保存权限组
     *
     * @param pd
     * @return
     */
@@ -103,7 +106,6 @@
        Assert.jsonObjectHaveKey(privilegeInfoObj,"description","请求报文中未包含权限组描述 节点");

        Assert.hasLength(privilegeInfoObj.getString("name"),"请求报文中权限组名称不能为空");



        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
@@ -125,7 +127,45 @@
    }

    /**
     * 保存权限组
     *
     * @param pd
     * @return
     */
    @Override
    public ResponseEntity<String> editPrivilegeGroup(IPageData pd) {
        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");

        JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());

        Assert.jsonObjectHaveKey(privilegeInfoObj, "name", "请求报文中未包含权限组名称 节点");
        Assert.hasKeyAndValue(privilegeInfoObj, "pgId", "请求报文中未包含权限组ID 节点");
        Assert.jsonObjectHaveKey(privilegeInfoObj, "description", "请求报文中未包含权限组描述 节点");

        Assert.hasLength(privilegeInfoObj.getString("name"), "请求报文中权限组名称不能为空");


        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);

        if (storeInfo.getStatusCode() != HttpStatus.OK) {
            return storeInfo;
        }
        // 商户返回信息
        JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());

        String storeId = storeInfoObj.getString("storeId");
        String storeTypeCd = storeInfoObj.getString("storeTypeCd");
        privilegeInfoObj.put("storeId", storeId);
        privilegeInfoObj.put("storeTypeCd", storeTypeCd);

        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
                ServiceConstant.SERVICE_API_URL + "/api/edit.privilegeGroup.info", HttpMethod.POST);
        return privilegeGroup;
    }

    /**
     * 删除权限组
     *
     * @param pd
     * @return
     */
@@ -174,16 +214,16 @@
        String  storeId = storeInfoObj.getString("storeId");
        String  storeTypeCd = storeInfoObj.getString("storeTypeCd");
        String pgId = privilegeInfoObj.getString("pgId");
        String pName = privilegeInfoObj.getString("pName");

        ResponseEntity<String> privileges = super.callCenterService(restTemplate,pd,"",
                ServiceConstant.SERVICE_API_URL+"/api/query.privilegeGroup.noAddPrivilege?storeId="+storeId+"&storeTypeCd="+storeTypeCd+"&pgId="+pgId , HttpMethod.GET);
                ServiceConstant.SERVICE_API_URL + "/api/query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName, HttpMethod.GET);

        if(privileges.getStatusCode() != HttpStatus.OK){
            return privileges;
        }

        JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());



        return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(),HttpStatus.OK);
@@ -196,7 +236,10 @@
        JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());

        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含权限组ID 节点");
        Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","请求报文中未包含权限ID 节点");
        //Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","请求报文中未包含权限ID 节点");
        if (!privilegeInfoObj.containsKey("pIds") || privilegeInfoObj.getJSONArray("pIds").size() < 1) {
            throw new IllegalArgumentException("请求报文中未包含权限");
        }

        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);

@@ -216,6 +259,7 @@

    /**
     * 删除权限
     *
     * @param pd
     * @return
     */
@@ -245,7 +289,6 @@
    }

    /**
     *
     * @param pd
     * @return
     */