保存权限组开发完成待测试

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

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

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

@@ -22,4 +22,12 @@ public interface IPrivilegeDAO {
      * @return
      */
     public boolean deleteUserAllPrivilege(Map info);
+
+
+    /**
+     * 保存权限组
+     * @param info
+     * @return
+     */
+    public boolean savePrivilegeGroup(Map info);
 }

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

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

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

@@ -22,4 +22,12 @@ public interface IPrivilegeSMO {
      * @return
      */
     public ResponseEntity<String> deleteUserAllPrivilege(String privilegeInfo);
+
+
+    /**
+     * 保存权限组
+     * @param privilegeGroupInfo
+     * @return
+     */
+    public ResponseEntity<String> savePrivilegeGroup(String privilegeGroupInfo);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 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;
@@ -76,6 +77,27 @@ public class PrivilegeSMOImpl implements IPrivilegeSMO {
         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);
+    }
+
 
     public IPrivilegeDAO getPrivilegeDAOImpl() {
         return privilegeDAOImpl;

WebService/src/main/java/com/java110/web/components/AddPrivilegeGroupComponent.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("addPrivilegeGroup")
+public class AddPrivilegeGroupComponent {
+
+    @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

@@ -21,4 +21,12 @@ public interface IPrivilegeServiceSMO {
      * @return
      */
     public ResponseEntity<String> loadListPrivilege(IPageData pd);
+
+
+    /**
+     * 保存权限组
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> savePrivilegeGroup(IPageData pd);
 }

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

@@ -87,6 +87,42 @@ public class PrivilegeServiceSMOImpl extends BaseComponentSMO implements IPrivil
 
     }
 
+    /**
+     * 保存权限组
+     * @param pd
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> savePrivilegeGroup(IPageData pd) {
+        Assert.hasLength(pd.getUserId(),"用户未登录请先登录");
+
+        JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
+
+        Assert.jsonObjectHaveKey(privilegeInfoObj,"name","请求报文中未包含权限组名称 节点");
+        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/save.privilegeGroup.info" , HttpMethod.POST);
+        return privilegeGroup;
+    }
+
     public RestTemplate getRestTemplate() {
         return restTemplate;
     }

WebService/src/main/resources/components/add-privilege-group/addPrivilegeGroup.js

@@ -12,32 +12,32 @@
 
          },
          _initEvent:function(){
-             vc.component.$on('add_privilege_group_event',function(){
+             vc.component.$on('addPrivilegeGroup_openPrivilegeGroupModel',function(_params){
                 $('#addPrivilegeGroupModel').modal('show');
             });
         },
         methods:{
             addPrivilegeGroupValidate(){
                 return vc.validate.validate({
-                    addStaffInfo:vc.component.addStaffInfo
+                    addPrivilegeGroupInfo:vc.component.addPrivilegeGroupInfo
                 },{
                     'addPrivilegeGroupInfo.name':[
                         {
                             limit:"required",
                             param:"",
-                            errInfo:"用户名不能为空"
+                            errInfo:"权限组名不能为空"
                         },
                         {
                             limit:"maxin",
                             param:"2,10",
-                            errInfo:"权限组长度必须在2位至10位"
+                            errInfo:"权限组名长度必须在2位至10位"
                         },
                     ],
                     'addPrivilegeGroupInfo.description':[
                         {
                             limit:"required",
                             param:"",
-                            errInfo:"地址不能为空"
+                            errInfo:"权限组描述不能为空"
                         },
                         {
                             limit:"maxLength",
@@ -53,12 +53,11 @@
                     vc.component.addPrivilegeGroupInfo.errorInfo = vc.validate.errInfo;
                     return ;
                 }
-
                 vc.component.addPrivilegeGroupInfo.errorInfo = "";
                 vc.http.post(
                     'addPrivilegeGroup',
-                    'saveStaff',
-                    JSON.stringify(vc.component.addStaffInfo),
+                    'savePrivilegeGroupInfo',
+                    JSON.stringify(vc.component.addPrivilegeGroupValidate),
                     {
                         emulateJSON:true
                      },

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

@@ -2,7 +2,7 @@
     <div class="ibox ">
         <div class="ibox-content mailbox-content">
             <div class="file-manager">
-                <a class="btn btn-block btn-primary compose-mail" v-on:click="openPrivilegeGroup()">添加权限组</a>
+                <a class="btn btn-block btn-primary compose-mail" v-on:click="openPrivilegeGroupModel()">添加权限组</a>
                 <div class="space-25"></div>
 
                 <h5>权限组</h5>
@@ -16,6 +16,8 @@
 
                 <div class="clearfix"></div>
             </div>
+
+            <vc:create name="addPrivilegeGroup"></vc:create>
         </div>
     </div>
 </div>

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

@@ -44,8 +44,8 @@
                     _pgName:_pGroup.name
                 });
             },
-            openPrivilegeGroup:function(){
-
+            openPrivilegeGroupModel:function(){
+                vc.component.$emit('addPrivilegeGroup_openPrivilegeGroupModel',{});
             }
         }
     });

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

@@ -21,4 +21,9 @@
     <update id="deleteUserAllPrivilege" parameterType="Map">
         UPDATE p_privilege_user a SET a.`status_cd` = '1' WHERE a.`user_id` = #{userId}
     </update>
+
+    <insert id="savePrivilegeGroup" parameterType="map">
+        INSERT INTO p_privilege_group(pg_id,`name`,description,store_id,domain)
+        VALUES(#{pgId},#{name},#{description},#{storeId},#{storeTypeCd})
+    </insert>
 </mapper>

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -81,6 +81,7 @@ public class GenerateCodeFactory {
         prefixMap.put("propertyUserId","93");
         prefixMap.put("propertyFeeId","94");
         prefixMap.put("houseId","95");
+        prefixMap.put("pgId","600");
     }
 
     private static String PLATFORM_CODE = "0001";
@@ -629,6 +630,20 @@ public class GenerateCodeFactory {
         return getCode(prefixMap.get("commentScoreId"));
     }
 
+    /**
+     * pgId生成
+     * @return
+     * @throws GenerateCodeException
+     */
+    public static String getPgId()  throws GenerateCodeException{
+        if(!MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_NEED_INVOKE_GENERATE_ID))){
+            return prefixMap.get("pgId") +DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H)+ nextId("%04d");
+        }
+        //调用服务
+        return getCode(prefixMap.get("pgId"));
+    }
+
+
 
     /**
      * 获取restTemplate

java110-service/pom.xml

@@ -97,11 +97,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jms</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <scope>test</scope>
             <version>RELEASE</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

java110-service/src/test/java/com/java110/AppTest.java

@@ -1,38 +0,0 @@
-package com.java110;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}