优化权限组修改功能

OrderService/src/main/java/com/java110/order/api/PrivilegeApi.java

@@ -86,6 +86,23 @@ public class PrivilegeApi extends BaseController {
         }
     }
 
+    @RequestMapping(path = "/editPrivilegeGroup",method= RequestMethod.POST)
+    @ApiOperation(value="编辑权限组", notes="test: 返回 200 表示服务受理成功，其他表示失败")
+    @ApiImplicitParam(paramType="query", name = "privilegeGroupInfo", value = "权限信息", required = true, dataType = "String")
+    public ResponseEntity<String> editPrivilegeGroup(@RequestBody String privilegeGroupInfo,HttpServletRequest request){
+        ResponseEntity<String> responseEntity = null;
+
+        try {
+            responseEntity = privilegeSMOImpl.editPrivilegeGroup(privilegeGroupInfo);
+        }catch (Exception e){
+            logger.error("请求订单异常",e);
+            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常，"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }finally {
+            logger.debug("订单服务返回报文为: {}",responseEntity);
+            return responseEntity;
+        }
+    }
+
     @RequestMapping(path = "/deletePrivilegeGroup",method= RequestMethod.POST)
     @ApiOperation(value="删除权限组", notes="test: 返回 200 表示服务受理成功，其他表示失败")
     @ApiImplicitParam(paramType="query", name = "privilegeGroupInfo", value = "权限信息", required = true, dataType = "String")

OrderService/src/main/java/com/java110/order/dao/IPrivilegeDAO.java

@@ -32,6 +32,13 @@ public interface IPrivilegeDAO {
      */
     public boolean savePrivilegeGroup(Map info);
 
+    /**
+     * 编辑权限组
+     * @param info
+     * @return
+     */
+    public boolean updatePrivilegeGroup(Map info);
+
     /**
      * 删除权限组
      * @param info

OrderService/src/main/java/com/java110/order/dao/impl/PrivilegeDAOImpl.java

@@ -65,6 +65,21 @@ public class PrivilegeDAOImpl extends BaseServiceDao implements IPrivilegeDAO {
         return true;
     }
 
+    /**
+     * 保存权限组
+     * @param info
+     * @return
+     */
+    @Override
+    public boolean updatePrivilegeGroup(Map info) {
+        logger.debug("编辑权限组信息入参：{}",info);
+        int saveFlag = sqlSessionTemplate.insert("privilegeDAOImpl.updatePrivilegeGroup",info);
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR,"编辑权限组信息失败："+ JSONObject.toJSONString(info));
+        }
+        return true;
+    }
+
     /**
      * 删除权限组
      * @param info

OrderService/src/main/java/com/java110/order/smo/IPrivilegeSMO.java

@@ -32,6 +32,12 @@ public interface IPrivilegeSMO {
     public ResponseEntity<String> savePrivilegeGroup(String privilegeGroupInfo);
 
 
+    /**
+     * 编辑权限组
+     * @param privilegeGroupInfo
+     * @return
+     */
+    public ResponseEntity<String> editPrivilegeGroup(String privilegeGroupInfo);
     /**
      * 删除权限组
      * @param privilegeGroupInfo

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

@@ -104,6 +104,28 @@ public class PrivilegeSMOImpl implements IPrivilegeSMO {
         return new ResponseEntity<String>("未知异常", HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
+    @Override
+    public ResponseEntity<String> editPrivilegeGroup(String privilegeGroupInfo) {
+
+        Assert.isJsonObject(privilegeGroupInfo, "请求报文不是有效的json格式");
+
+        Assert.jsonObjectHaveKey(privilegeGroupInfo, "name", "请求报文中未包含name节点");
+        Assert.jsonObjectHaveKey(privilegeGroupInfo, "pgId", "请求报文中未包含pgId节点");
+
+        Assert.jsonObjectHaveKey(privilegeGroupInfo, "storeId", "请求报文中未包含storeId节点");
+
+        Assert.jsonObjectHaveKey(privilegeGroupInfo, "storeTypeCd", "请求报文中未包含storeTypeCd节点");
+        JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroupInfo);
+
+        privilegeGroupObj.put("pgId", GenerateCodeFactory.getPgId());
+
+        if (privilegeDAOImpl.updatePrivilegeGroup(privilegeGroupObj)) {
+            return new ResponseEntity<String>("成功", HttpStatus.OK);
+        }
+
+        return new ResponseEntity<String>("未知异常", HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
     /**
      * 删除权限组
      *

WebService/src/main/java/com/java110/web/components/EditPrivilegeGroupComponent.java

@@ -0,0 +1,48 @@
+package com.java110.web.components;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IPrivilegeServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 添加权限组组件
+ *
+ * add by wuxw
+ * 2019-04-08
+ */
+
+@Component("editPrivilegeGroup")
+public class EditPrivilegeGroupComponent {
+
+    @Autowired
+    private IPrivilegeServiceSMO privilegeServiceSMOImpl;
+
+
+    /**
+     * 保存权限组信息
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> savePrivilegeGroupInfo(IPageData pd){
+        ResponseEntity<String> responseEntity = null;
+        try{
+            responseEntity =  privilegeServiceSMOImpl.savePrivilegeGroup(pd);
+        }catch (Exception e){
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }finally {
+            return responseEntity;
+        }
+    }
+
+
+    public IPrivilegeServiceSMO getPrivilegeServiceSMOImpl() {
+        return privilegeServiceSMOImpl;
+    }
+
+    public void setPrivilegeServiceSMOImpl(IPrivilegeServiceSMO privilegeServiceSMOImpl) {
+        this.privilegeServiceSMOImpl = privilegeServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/IPrivilegeServiceSMO.java

@@ -30,6 +30,13 @@ public interface IPrivilegeServiceSMO {
      */
     public ResponseEntity<String> savePrivilegeGroup(IPageData pd);
 
+    /**
+     * 编辑权限组
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> editPrivilegeGroup(IPageData pd);
+
     /**
      * 删除权限组
      * @param pd

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

@@ -22,257 +22,297 @@ public class PrivilegeServiceSMOImpl extends BaseComponentSMO implements IPrivil
 
     /**
      * 查询 权限组
+     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> listPrivilegeGroup(IPageData pd) {
 
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        if (storeInfo.getStatusCode() != HttpStatus.OK) {
             return storeInfo;
         }
         // 商户返回信息
         JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
 
-        String  storeId = storeInfoObj.getString("storeId");
-        String  storeTypeCd = storeInfoObj.getString("storeTypeCd");
+        String storeId = storeInfoObj.getString("storeId");
+        String storeTypeCd = storeInfoObj.getString("storeTypeCd");
 
         //根据商户ID查询 权限组信息
 
 
-        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
-                ServiceConstant.SERVICE_API_URL+"/api/query.store.privilegeGroup?storeId="+storeId +"&storeTypeCd="+storeTypeCd, HttpMethod.GET);
-        if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.store.privilegeGroup?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd, HttpMethod.GET);
+        if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }
 
         JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
 
-        Assert.jsonObjectHaveKey(privilegeGroupObj,"privilegeGroups","查询菜单未返回privilegeGroups节点");
+        Assert.jsonObjectHaveKey(privilegeGroupObj, "privilegeGroups", "查询菜单未返回privilegeGroups节点");
 
         JSONArray privilegeGroups = privilegeGroupObj.getJSONArray("privilegeGroups");
 
-        return new ResponseEntity<String>(privilegeGroups.toJSONString(),HttpStatus.OK);
+        return new ResponseEntity<String>(privilegeGroups.toJSONString(), HttpStatus.OK);
     }
 
     /**
      * 查询权限
+     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> loadListPrivilege(IPageData pd) {
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含pgId 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "请求报文中未包含pgId 节点");
 
         String pgId = privilegeInfoObj.getString("pgId");
         String name = privilegeInfoObj.getString("name");
 
-        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
-                ServiceConstant.SERVICE_API_URL+"/api/query.privilege.byPgId?pgId="+pgId+"&name="+name , HttpMethod.GET);
-        if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.privilege.byPgId?pgId=" + pgId + "&name=" + name, HttpMethod.GET);
+        if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }
 
         JSONObject privilegeObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
 
-        Assert.jsonObjectHaveKey(privilegeObj,"privileges","查询菜单未返回privileges节点");
+        Assert.jsonObjectHaveKey(privilegeObj, "privileges", "查询菜单未返回privileges节点");
 
         JSONArray privileges = privilegeObj.getJSONArray("privileges");
 
-        return new ResponseEntity<String>(privileges.toJSONString(),HttpStatus.OK);
+        return new ResponseEntity<String>(privileges.toJSONString(), HttpStatus.OK);
 
     }
 
     /**
      * 保存权限组
+     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> savePrivilegeGroup(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
 
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"name","请求报文中未包含权限组名称 节点");
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"description","请求报文中未包含权限组描述 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "name", "请求报文中未包含权限组名称 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "description", "请求报文中未包含权限组描述 节点");
+
+        Assert.hasLength(privilegeInfoObj.getString("name"), "请求报文中权限组名称不能为空");
 
-        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());
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        String storeId = storeInfoObj.getString("storeId");
+        String storeTypeCd = storeInfoObj.getString("storeTypeCd");
+        privilegeInfoObj.put("storeId", storeId);
+        privilegeInfoObj.put("storeTypeCd", storeTypeCd);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/save.privilegeGroup.info", HttpMethod.POST);
+        return privilegeGroup;
+    }
+
+    /**
+     * 保存权限组
+     *
+     * @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);
+        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/save.privilegeGroup.info" , HttpMethod.POST);
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/edit.privilegeGroup.info", HttpMethod.POST);
         return privilegeGroup;
     }
 
     /**
      * 删除权限组
+     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> deletePrivilegeGroup(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
 
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含权限组ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "请求报文中未包含权限组ID 节点");
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        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);
+        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/delete.privilegeGroup.info" , HttpMethod.POST);
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/delete.privilegeGroup.info", HttpMethod.POST);
         return privilegeGroup;
     }
 
     @Override
     public ResponseEntity<String> listNoAddPrivilege(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
 
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含权限组ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "请求报文中未包含权限组ID 节点");
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        if (storeInfo.getStatusCode() != HttpStatus.OK) {
             return storeInfo;
         }
         // 商户返回信息
         JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
 
-        String  storeId = storeInfoObj.getString("storeId");
-        String  storeTypeCd = storeInfoObj.getString("storeTypeCd");
+        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);
+        ResponseEntity<String> privileges = super.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.privilegeGroup.noAddPrivilege?storeId=" + storeId + "&storeTypeCd=" + storeTypeCd + "&pgId=" + pgId + "&pName=" + pName, HttpMethod.GET);
 
-        if(privileges.getStatusCode() != HttpStatus.OK){
+        if (privileges.getStatusCode() != HttpStatus.OK) {
             return privileges;
         }
 
         JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());
 
 
-
-        return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(),HttpStatus.OK);
+        return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(), HttpStatus.OK);
     }
 
     @Override
     public ResponseEntity<String> addPrivilegeToPrivilegeGroup(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
 
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含权限组ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "请求报文中未包含权限组ID 节点");
         //Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","请求报文中未包含权限ID 节点");
-        if(!privilegeInfoObj.containsKey("pIds") || privilegeInfoObj.getJSONArray("pIds").size() <1){
+        if (!privilegeInfoObj.containsKey("pIds") || privilegeInfoObj.getJSONArray("pIds").size() < 1) {
             throw new IllegalArgumentException("请求报文中未包含权限");
         }
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        if (storeInfo.getStatusCode() != HttpStatus.OK) {
             return storeInfo;
         }
         // 商户返回信息
         JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
 
-        String  storeId = storeInfoObj.getString("storeId");
-        privilegeInfoObj.put("storeId",storeId);
+        String storeId = storeInfoObj.getString("storeId");
+        privilegeInfoObj.put("storeId", storeId);
 
-        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL+"/api/add.privilege.PrivilegeGroup" , HttpMethod.POST);
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/add.privilege.PrivilegeGroup", HttpMethod.POST);
         return privilegeGroup;
     }
 
     /**
      * 删除权限
+     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> deletePrivilegeFromPrivilegeGroup(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
 
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pgId","请求报文中未包含权限组ID 节点");
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"pId","请求报文中未包含权限ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "请求报文中未包含权限组ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "请求报文中未包含权限ID 节点");
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        if (storeInfo.getStatusCode() != HttpStatus.OK) {
             return storeInfo;
         }
         // 商户返回信息
         JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
 
-        String  storeId = storeInfoObj.getString("storeId");
-        privilegeInfoObj.put("storeId",storeId);
+        String storeId = storeInfoObj.getString("storeId");
+        privilegeInfoObj.put("storeId", storeId);
 
-        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,privilegeInfoObj.toJSONString(),
-                ServiceConstant.SERVICE_API_URL+"/api/delete.privilege.PrivilegeGroup" , HttpMethod.POST);
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, privilegeInfoObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/delete.privilege.PrivilegeGroup", HttpMethod.POST);
         return privilegeGroup;
     }
 
     /**
-     *
      * @param pd
      * @return
      */
     @Override
     public ResponseEntity<String> listStaffPrivileges(IPageData pd) {
-        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
 
         JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
-        Assert.jsonObjectHaveKey(privilegeInfoObj,"staffId","请求报文中未包含员工ID 节点");
+        Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "请求报文中未包含员工ID 节点");
 
-        ResponseEntity<String> storeInfo = super.getStoreInfo(pd,restTemplate);
+        ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
 
-        if(storeInfo.getStatusCode() != HttpStatus.OK){
+        if (storeInfo.getStatusCode() != HttpStatus.OK) {
             return storeInfo;
         }
         // 商户返回信息
         JSONObject storeInfoObj = JSONObject.parseObject(storeInfo.getBody());
 
-        String  storeId = storeInfoObj.getString("storeId");
-        privilegeInfoObj.put("storeId",storeId);
+        String storeId = storeInfoObj.getString("storeId");
+        privilegeInfoObj.put("storeId", storeId);
 
-        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate,pd,"",
-                ServiceConstant.SERVICE_API_URL+"/api/query.user.privilege?userId="+privilegeInfoObj.getString("staffId")+"&domain="+storeInfoObj.getString("storeTypeCd") , HttpMethod.GET);
-        if(privilegeGroup.getStatusCode() != HttpStatus.OK){
+        ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
+        if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
             return privilegeGroup;
         }
         JSONObject resultObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
@@ -280,9 +320,9 @@ public class PrivilegeServiceSMOImpl extends BaseComponentSMO implements IPrivil
         JSONArray privileges = resultObj.getJSONArray("privileges");
 
         JSONObject resObj = new JSONObject();
-        resObj.put("datas",privileges);
+        resObj.put("datas", privileges);
 
-        return new ResponseEntity<String>(resObj.toJSONString(),HttpStatus.OK);
+        return new ResponseEntity<String>(resObj.toJSONString(), HttpStatus.OK);
     }
 
     public RestTemplate getRestTemplate() {

WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html

@@ -18,9 +18,9 @@
                                     </div>
                                     <div class="col-sm-5">
                                         <div class="input-group">
-                                            <input placeholder="输入权限名称" type="text" class="form-control form-control-sm">
+                                            <input placeholder="输入权限名称" type="text" v-model = "addPrivilegeInfo._pName" class="form-control form-control-sm">
                                             <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary">查询</button>
+                                                <button type="button" class="btn btn-sm btn-primary" @click="listNoAddPrivilege()">查询</button>
                                             </span>
                                         </div>
                                     </div>

WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js

@@ -4,6 +4,7 @@
         data:{
             addPrivilegeInfo:{
                 _currentPgId:'',
+                _pName:'',
                 name:'',
                 description:'',
                 errorInfo:'',
@@ -39,7 +40,8 @@
                 vc.component.addPrivilegeInfo._noAddPrivilege=[];
                 var param = {
                     params:{
-                        pgId:vc.component.addPrivilegeInfo._currentPgId
+                        pgId:vc.component.addPrivilegeInfo._currentPgId,
+                        pName:vc.component.addPrivilegeInfo._pName
                     }
                 }
                 vc.http.get(
@@ -92,6 +94,7 @@
                         if(res.status == 200){
                             //关闭model
                             vc.component.listNoAddPrivilege();
+                            $('#addPrivilegeModel').modal('hide');
                             vc.component.$emit('privilege_loadPrivilege',vc.component.addPrivilegeInfo._currentPgId);
                             return ;
                         }

WebService/src/main/resources/components/privilegePackage/edit-privilege-group/editPrivilegeGroup.html

@@ -0,0 +1,28 @@
+<div id = "editPrivilegeGroupModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">编辑权限组</h3>
+                <div class="ibox-content">
+                    <div>
+                        <p style="color:red;">{{editPrivilegeGroupInfo.errorInfo}}</p>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">权限组名称</label>
+                                <div class="col-sm-10"><input v-model="editPrivilegeGroupInfo.name" type="text" placeholder="必填，请填写员工名称" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">权限组描述</label>
+                                <div class="col-sm-10"><input v-model="editPrivilegeGroupInfo.description" type="text" placeholder="必填，请填写员工名称" class="form-control"></div>
+                            </div>
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveAddPrivilegeGroup()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/privilegePackage/edit-privilege-group/editPrivilegeGroup.js

@@ -0,0 +1,102 @@
+(function(vc){
+
+    vc.extends({
+        data:{
+            editPrivilegeGroupInfo:{
+                pgId:'',
+                name:'',
+                description:'',
+                errorInfo:''
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('editPrivilegeGroup','openPrivilegeGroupModel',function(_params){
+                vc.copyObject(_params,vc.component.editPrivilegeGroupInfo)
+                $('#editPrivilegeGroupModel').modal('show');
+            });
+        },
+        methods:{
+            editPrivilegeGroupValidate(){
+                return vc.validate.validate({
+                    editPrivilegeGroupInfo:vc.component.editPrivilegeGroupInfo
+                },{
+                    'editPrivilegeGroupInfo.pgId':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"权限组ID不能为空"
+                        }
+
+                    ],
+                    'editPrivilegeGroupInfo.name':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"权限组名不能为空"
+                        },
+                        {
+                            limit:"maxin",
+                            param:"2,10",
+                            errInfo:"权限组名长度必须在2位至10位"
+                        },
+                    ],
+                    'editPrivilegeGroupInfo.description':[
+                        {
+                            limit:"required",
+                            param:"",
+                            errInfo:"权限组描述不能为空"
+                        },
+                        {
+                            limit:"maxLength",
+                            param:"200",
+                            errInfo:"权限组描述长度不能超过200位"
+                        },
+                    ]
+
+                });
+            },
+            saveAddPrivilegeGroup:function(){
+                if(!vc.component.editPrivilegeGroupValidate()){
+                    vc.component.editPrivilegeGroupInfo.errorInfo = vc.validate.errInfo;
+                    return ;
+                }
+                vc.component.editPrivilegeGroupInfo.errorInfo = "";
+                vc.http.post(
+                    'editPrivilegeGroup',
+                    'savePrivilegeGroupInfo',
+                    JSON.stringify(vc.component.editPrivilegeGroupInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#editPrivilegeGroupModel').modal('hide');
+                            vc.component.clearAddPrivilegeGroupInfo();
+                            vc.component.$emit('privilegeGroup_loadPrivilegeGroup',{});
+                            return ;
+                        }
+                        vc.component.editPrivilegeGroupInfo.errorInfo = json;
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.component.editPrivilegeGroupInfo.errorInfo = errInfo;
+                     });
+            },
+            clearAddPrivilegeGroupInfo:function(){
+                vc.component.editPrivilegeGroupInfo = {
+                    pgId:'',
+                    name:'',
+                    description:'',
+                    errorInfo:''
+                };
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html

@@ -11,6 +11,9 @@
                         <a v-on:click="notifyQueryPrivilege(pGroup)">
                             <i class="glyphicon glyphicon-chevron-right text-navy"></i>
                             {{pGroup.name}}
+                            <i v-if="pGroup.storeId != '9999'" class="glyphicon glyphicon-edit float-right"
+                               style="color:#dc3545"
+                               v-on:click.stop="openEditPrivilegeGroupModel(pGroup)"></i>
                             <i v-if="pGroup.storeId != '9999'" class="glyphicon glyphicon-remove-sign float-right"
                                style="color:#dc3545"
                                v-on:click.stop="openDeletePrivilegeGroupModel(pGroup)"></i>
@@ -22,6 +25,7 @@
             </div>
 
             <vc:create name="addPrivilegeGroup"></vc:create>
+            <vc:create name="editPrivilegeGroup"></vc:create>
             <vc:create name="deletePrivilegeGroup"></vc:create>
         </div>
     </div>

WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.js

@@ -54,6 +54,9 @@
             openPrivilegeGroupModel:function(){
                 vc.component.$emit('addPrivilegeGroup_openPrivilegeGroupModel',{});
             },
+            openEditPrivilegeGroupModel:function(_pGroup){
+                vc.emit('editPrivilegeGroup','openPrivilegeGroupModel',_pGroup);
+            },
             openDeletePrivilegeGroupModel:function(_pGroup){
                 vc.component.$emit('deletePrivilegeGroup_openDeletePrivilegeGroupModel',_pGroup);
             }

java110-db/src/main/resources/mapper/center/PrivilegeDAOImplMapper.xml

@@ -26,6 +26,26 @@
         INSERT INTO p_privilege_group(pg_id,`name`,description,store_id,domain)
         VALUES(#{pgId},#{name},#{description},#{storeId},#{storeTypeCd})
     </insert>
+
+
+    <update id="updatePrivilegeGroup" parameterType="Map">
+        UPDATE p_privilege_group a SET
+        <if test="name != null and name != ''">
+            and a.name = #{name},
+        </if>
+        <if test="description != null and description != ''">
+            and a.description = #{description}
+        </if>
+        WHERE 1= 1
+        <if test="storeId != null and storeId != ''">
+            and a.store_id = #{storeId}
+        </if>
+        and a.pg_id = #{pgId}
+        <if test="storeTypeCd != null and storeTypeCd != ''">
+            and a.domain= #{storeTypeCd}
+        </if>
+
+    </update>
     <!-- 删除权限组 -->
     <update id="deletePrivilegeGroup" parameterType="Map">
         UPDATE p_privilege_group a SET a.`status_cd` = '1'