Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-api/src/main/java/com/gic/auth/constant/OrderOrAppEnum.java

@@ -8,7 +8,8 @@ package com.gic.auth.constant;
  */
 public enum OrderOrAppEnum {
     ORDER(1, "订单"),
-    APP(2, "应用")
+    APP(2, "应用"),
+    SMS_SIGN(3, "短信签名")
     ;
 
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java

@@ -59,7 +59,7 @@ public class ResourceDTO implements Serializable {
      }
      ]
      */
-    private Long orderResource;
+    private Integer orderResource;
 
     private String orderResourceJson;
 
@@ -76,9 +76,21 @@ public class ResourceDTO implements Serializable {
      }
      ]
      */
-    private Long appResource;
+    private Integer appResource;
     private String appResourceJson;
 
+    /**
+     * 短信签名资源
+     [
+     {
+     "type":1,            // 全部签名:1，  部分签名:2
+     "ids":[1,2,3]
+     }
+     ]
+     */
+    private Integer smsSignResource;
+    private String smsSignResourceJson;
+
     private Integer userResourceCount;
 
     public Integer getResourceId() {
@@ -145,11 +157,11 @@ public class ResourceDTO implements Serializable {
         this.goodsResourceId = goodsResourceId;
     }
 
-    public Long getOrderResource() {
+    public Integer getOrderResource() {
         return orderResource;
     }
 
-    public void setOrderResource(Long orderResource) {
+    public void setOrderResource(Integer orderResource) {
         this.orderResource = orderResource;
     }
 
@@ -161,11 +173,11 @@ public class ResourceDTO implements Serializable {
         this.orderResourceJson = orderResourceJson;
     }
 
-    public Long getAppResource() {
+    public Integer getAppResource() {
         return appResource;
     }
 
-    public void setAppResource(Long appResource) {
+    public void setAppResource(Integer appResource) {
         this.appResource = appResource;
     }
 
@@ -177,6 +189,22 @@ public class ResourceDTO implements Serializable {
         this.appResourceJson = appResourceJson;
     }
 
+    public Integer getSmsSignResource() {
+        return smsSignResource;
+    }
+
+    public void setSmsSignResource(Integer smsSignResource) {
+        this.smsSignResource = smsSignResource;
+    }
+
+    public String getSmsSignResourceJson() {
+        return smsSignResourceJson;
+    }
+
+    public void setSmsSignResourceJson(String smsSignResourceJson) {
+        this.smsSignResourceJson = smsSignResourceJson;
+    }
+
     public Integer getUserResourceCount() {
         return userResourceCount;
     }

gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysResource.java

-package com.gic.auth.entity;
-
-import java.util.Date;
-
-/**
- * tab_sys_resource
- */
-public class TabSysResource {
-    /**
-     * 
-     */
-    private Integer resourceId;
-
-    /**
-     * 资源名称
-     */
-    private String resourceName;
-
-    /**
-     * 
-     */
-    private Integer enterpriseId;
-
-    /**
-     * 会员卡资源控件id
-     */
-    private Long memberCardResource;
-
-    /**
-     * 服务号资源
-     */
-    private Long fwhResource;
-
-    /**
-     * 小程序资源
-     */
-    private Long appletResource;
-
-    /**
-     * 门店资源
-     */
-    private Long storeResource;
-
-    /**
-     * 商品资源
-     */
-    private Long goodsResourceId;
-
-    /**
-     * 订单资源  
- [
-     {
-         "channel":1,        // 渠道 1：线下门店， 2:达摩微商城， 3：微盟微商城
-         "storeContent":1    // 门店id或门店选择器id， 多个逗号隔开
-     }
- ]
-     */
-    private Integer orderResource;
-
-    /**
-     * 应用资源 
- [
-     {
-         appId:1,    // 应用id
-         appName:微商城   // 应用名称
-         child:[
-             appId: 10,          // 子应用id
-             appName: 短信发送   // 子应用名称
-         ]
-     }
- ]
-     */
-    private Integer appResource;
-
-    /**
-     * 
-     */
-    private Date createTime;
-
-    /**
-     * 
-     */
-    private Date updateTime;
-
-    /**
-     * 
-     */
-    private Integer status;
-
-    public Integer getResourceId() {
-        return resourceId;
-    }
-
-    public void setResourceId(Integer resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    public void setResourceName(String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    public Integer getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Integer enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public Long getMemberCardResource() {
-        return memberCardResource;
-    }
-
-    public void setMemberCardResource(Long memberCardResource) {
-        this.memberCardResource = memberCardResource;
-    }
-
-    public Long getFwhResource() {
-        return fwhResource;
-    }
-
-    public void setFwhResource(Long fwhResource) {
-        this.fwhResource = fwhResource;
-    }
-
-    public Long getAppletResource() {
-        return appletResource;
-    }
-
-    public void setAppletResource(Long appletResource) {
-        this.appletResource = appletResource;
-    }
-
-    public Long getStoreResource() {
-        return storeResource;
-    }
-
-    public void setStoreResource(Long storeResource) {
-        this.storeResource = storeResource;
-    }
-
-    public Long getGoodsResourceId() {
-        return goodsResourceId;
-    }
-
-    public void setGoodsResourceId(Long goodsResourceId) {
-        this.goodsResourceId = goodsResourceId;
-    }
-
-    public Integer getOrderResource() {
-        return orderResource;
-    }
-
-    public void setOrderResource(Integer orderResource) {
-        this.orderResource = orderResource;
-    }
-
-    public Integer getAppResource() {
-        return appResource;
-    }
-
-    public void setAppResource(Integer appResource) {
-        this.appResource = appResource;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
+package com.gic.auth.entity;
+
+import java.util.Date;
+
+/**
+ * tab_sys_resource
+ */
+public class TabSysResource {
+    /**
+     * 
+     */
+    private Integer resourceId;
+
+    /**
+     * 资源名称
+     */
+    private String resourceName;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 用户资源  人群权限筛选器
+     */
+    private Long userResource;
+
+    /**
+     * 会员卡资源控件id   暂时不用
+     */
+    private Long memberCardResource;
+
+    /**
+     * 服务号资源   暂时不用
+     */
+    private Long fwhResource;
+
+    /**
+     * 小程序资源  暂时不用
+     */
+    private Long appletResource;
+
+    /**
+     * 门店资源
+     */
+    private Long storeResource;
+
+    /**
+     * 商品资源
+     */
+    private Long goodsResourceId;
+
+    /**
+     * 订单资源  
 [
     {
         "channel":1,        // 渠道 1：线下门店， 2:达摩微商城， 3：微盟微商城
         "storeContent":1    // 门店id或门店选择器id， 多个逗号隔开
     }
 ]
+     */
+    private Integer orderResource;
+
+    /**
+     * 应用资源 
 [
     {
         appId:1,    // 应用id
         appName:微商城   // 应用名称
         child:[
             appId: 10,          // 子应用id
             appName: 短信发送   // 子应用名称
         ]
     }
 ]
+     */
+    private Integer appResource;
+
+    /**
+     * 短信签名资源  
 [
     {
         "type":1,            // 全部签名:1，  部分签名:2
         "ids":[1,2,3]
     }
 ]
+     */
+    private Integer smsSignResource;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 
+     */
+    private Integer status;
+
+    public Integer getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Integer resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceName() {
+        return resourceName;
+    }
+
+    public void setResourceName(String resourceName) {
+        this.resourceName = resourceName;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getUserResource() {
+        return userResource;
+    }
+
+    public void setUserResource(Long userResource) {
+        this.userResource = userResource;
+    }
+
+    public Long getMemberCardResource() {
+        return memberCardResource;
+    }
+
+    public void setMemberCardResource(Long memberCardResource) {
+        this.memberCardResource = memberCardResource;
+    }
+
+    public Long getFwhResource() {
+        return fwhResource;
+    }
+
+    public void setFwhResource(Long fwhResource) {
+        this.fwhResource = fwhResource;
+    }
+
+    public Long getAppletResource() {
+        return appletResource;
+    }
+
+    public void setAppletResource(Long appletResource) {
+        this.appletResource = appletResource;
+    }
+
+    public Long getStoreResource() {
+        return storeResource;
+    }
+
+    public void setStoreResource(Long storeResource) {
+        this.storeResource = storeResource;
+    }
+
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
+    }
+
+    public void setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
+    }
+
+    public Integer getOrderResource() {
+        return orderResource;
+    }
+
+    public void setOrderResource(Integer orderResource) {
+        this.orderResource = orderResource;
+    }
+
+    public Integer getAppResource() {
+        return appResource;
+    }
+
+    public void setAppResource(Integer appResource) {
+        this.appResource = appResource;
+    }
+
+    public Integer getSmsSignResource() {
+        return smsSignResource;
+    }
+
+    public void setSmsSignResource(Integer smsSignResource) {
+        this.smsSignResource = smsSignResource;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java

@@ -56,14 +56,22 @@ public class ResourceApiServiceImpl implements ResourceApiService {
         orderDTO.setType(OrderOrAppEnum.ORDER.getCode());
         orderDTO.setContent(resourceDTO.getOrderResourceJson());
         Integer order = orderAppResourceService.save(orderDTO);
-        resourceDTO.setOrderResource(order.longValue());
+        resourceDTO.setOrderResource(order);
 
         OrderAppResourceDTO appDTO = new OrderAppResourceDTO();
         appDTO.setEnterpriseId(resourceDTO.getEnterpriseId());
         appDTO.setType(OrderOrAppEnum.ORDER.getCode());
         appDTO.setContent(resourceDTO.getAppResourceJson());
         Integer app = orderAppResourceService.save(appDTO);
-        resourceDTO.setAppResource(app.longValue());
+        resourceDTO.setAppResource(app);
+
+        OrderAppResourceDTO smsSignDTO = new OrderAppResourceDTO();
+        smsSignDTO.setEnterpriseId(resourceDTO.getEnterpriseId());
+        smsSignDTO.setType(OrderOrAppEnum.SMS_SIGN.getCode());
+        smsSignDTO.setContent(resourceDTO.getSmsSignResourceJson());
+        Integer smsSign = orderAppResourceService.save(smsSignDTO);
+        resourceDTO.setSmsSignResource(smsSign);
+
         if (resourceDTO.getResourceId() == null) {
             // save
             resourceService.save(resourceDTO);
@@ -110,13 +118,17 @@ public class ResourceApiServiceImpl implements ResourceApiService {
         TabSysResource resource = resourceService.getResource(resourceId);
         ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resource);
         if (resourceDTO.getOrderResource() != null) {
-            TabSysOrderAppResource orderResource = orderAppResourceService.getById(resourceDTO.getOrderResource().intValue());
+            TabSysOrderAppResource orderResource = orderAppResourceService.getById(resourceDTO.getOrderResource());
             resourceDTO.setOrderResourceJson(orderResource.getContent());
         }
         if (resourceDTO.getAppResource() != null) {
-            TabSysOrderAppResource appResource = orderAppResourceService.getById(resourceDTO.getAppResource().intValue());
+            TabSysOrderAppResource appResource = orderAppResourceService.getById(resourceDTO.getAppResource());
             resourceDTO.setAppResourceJson(appResource.getContent());
         }
+        if (resourceDTO.getSmsSignResource() != null) {
+            TabSysOrderAppResource smsSignResource = orderAppResourceService.getById(resourceDTO.getSmsSignResource());
+            resourceDTO.setSmsSignResourceJson(smsSignResource.getContent());
+        }
         return ServiceResponse.success(resourceDTO);
     }
 }

gic-platform-auth-service/src/main/resources/mapper/TabSysResourceMapper.xml

@@ -5,21 +5,23 @@
     <id column="resource_id" jdbcType="INTEGER" property="resourceId" />
     <result column="resource_name" jdbcType="VARCHAR" property="resourceName" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="user_resource" jdbcType="BIGINT" property="userResource" />
     <result column="member_card_resource" jdbcType="BIGINT" property="memberCardResource" />
     <result column="fwh_resource" jdbcType="BIGINT" property="fwhResource" />
     <result column="applet_resource" jdbcType="BIGINT" property="appletResource" />
     <result column="store_resource" jdbcType="BIGINT" property="storeResource" />
     <result column="goods_resource_id" jdbcType="BIGINT" property="goodsResourceId" />
-    <result column="order_resource" jdbcType="VARCHAR" property="orderResource" />
-    <result column="app_resource" jdbcType="VARCHAR" property="appResource" />
+    <result column="order_resource" jdbcType="INTEGER" property="orderResource" />
+    <result column="app_resource" jdbcType="INTEGER" property="appResource" />
+    <result column="sms_sign_resource" jdbcType="INTEGER" property="smsSignResource" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <sql id="Base_Column_List">
-    resource_id, resource_name, enterprise_id, member_card_resource, fwh_resource, applet_resource, 
-    store_resource, goods_resource_id, order_resource, app_resource, create_time, update_time, 
-    status
+    resource_id, resource_name, enterprise_id, user_resource, member_card_resource, fwh_resource, 
+    applet_resource, store_resource, goods_resource_id, order_resource, app_resource, 
+    sms_sign_resource, create_time, update_time, status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -33,15 +35,17 @@
   </delete>
   <insert id="insert" parameterType="com.gic.auth.entity.TabSysResource">
     insert into tab_sys_resource (resource_id, resource_name, enterprise_id, 
-      member_card_resource, fwh_resource, applet_resource, 
-      store_resource, goods_resource_id, order_resource, 
-      app_resource, create_time, update_time, 
-      status)
+      user_resource, member_card_resource, fwh_resource, 
+      applet_resource, store_resource, goods_resource_id, 
+      order_resource, app_resource, sms_sign_resource, 
+      create_time, update_time, status
+      )
     values (#{resourceId,jdbcType=INTEGER}, #{resourceName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{memberCardResource,jdbcType=BIGINT}, #{fwhResource,jdbcType=BIGINT}, #{appletResource,jdbcType=BIGINT}, 
-      #{storeResource,jdbcType=BIGINT}, #{goodsResourceId,jdbcType=BIGINT}, #{orderResource,jdbcType=VARCHAR}, 
-      #{appResource,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{userResource,jdbcType=BIGINT}, #{memberCardResource,jdbcType=BIGINT}, #{fwhResource,jdbcType=BIGINT}, 
+      #{appletResource,jdbcType=BIGINT}, #{storeResource,jdbcType=BIGINT}, #{goodsResourceId,jdbcType=BIGINT}, 
+      #{orderResource,jdbcType=INTEGER}, #{appResource,jdbcType=INTEGER}, #{smsSignResource,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.auth.entity.TabSysResource">
     insert into tab_sys_resource
@@ -55,6 +59,9 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
+      <if test="userResource != null">
+        user_resource,
+      </if>
       <if test="memberCardResource != null">
         member_card_resource,
       </if>
@@ -76,6 +83,9 @@
       <if test="appResource != null">
         app_resource,
       </if>
+      <if test="smsSignResource != null">
+        sms_sign_resource,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -96,6 +106,9 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="userResource != null">
+        #{userResource,jdbcType=BIGINT},
+      </if>
       <if test="memberCardResource != null">
         #{memberCardResource,jdbcType=BIGINT},
       </if>
@@ -112,10 +125,13 @@
         #{goodsResourceId,jdbcType=BIGINT},
       </if>
       <if test="orderResource != null">
-        #{orderResource,jdbcType=VARCHAR},
+        #{orderResource,jdbcType=INTEGER},
       </if>
       <if test="appResource != null">
-        #{appResource,jdbcType=VARCHAR},
+        #{appResource,jdbcType=INTEGER},
+      </if>
+      <if test="smsSignResource != null">
+        #{smsSignResource,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -137,6 +153,9 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="userResource != null">
+        user_resource = #{userResource,jdbcType=BIGINT},
+      </if>
       <if test="memberCardResource != null">
         member_card_resource = #{memberCardResource,jdbcType=BIGINT},
       </if>
@@ -153,10 +172,13 @@
         goods_resource_id = #{goodsResourceId,jdbcType=BIGINT},
       </if>
       <if test="orderResource != null">
-        order_resource = #{orderResource,jdbcType=VARCHAR},
+        order_resource = #{orderResource,jdbcType=INTEGER},
       </if>
       <if test="appResource != null">
-        app_resource = #{appResource,jdbcType=VARCHAR},
+        app_resource = #{appResource,jdbcType=INTEGER},
+      </if>
+      <if test="smsSignResource != null">
+        sms_sign_resource = #{smsSignResource,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -174,13 +196,15 @@
     update tab_sys_resource
     set resource_name = #{resourceName,jdbcType=VARCHAR},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      user_resource = #{userResource,jdbcType=BIGINT},
       member_card_resource = #{memberCardResource,jdbcType=BIGINT},
       fwh_resource = #{fwhResource,jdbcType=BIGINT},
       applet_resource = #{appletResource,jdbcType=BIGINT},
       store_resource = #{storeResource,jdbcType=BIGINT},
       goods_resource_id = #{goodsResourceId,jdbcType=BIGINT},
-      order_resource = #{orderResource,jdbcType=VARCHAR},
-      app_resource = #{appResource,jdbcType=VARCHAR},
+      order_resource = #{orderResource,jdbcType=INTEGER},
+      app_resource = #{appResource,jdbcType=INTEGER},
+      sms_sign_resource = #{smsSignResource,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER}

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -86,6 +86,10 @@ public class ResourceController {
         if (CollectionUtils.isNotEmpty(resourceQO.getAppResourceJSON())) {
             resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResourceJSON()));
         }
+        // 短信签名资源
+        if (CollectionUtils.isNotEmpty(resourceQO.getSmsSignResourceJSON())) {
+            resourceDTO.setSmsSignResourceJson(JSON.toJSONString(resourceQO.getSmsSignResourceJSON()));
+        }
 
         ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
         if(response.isSuccess()){

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java

@@ -66,6 +66,8 @@ public class ResourceQO implements Serializable {
 
     private List<AppResourceQO> appResourceJSON;
 
+    private List<SmsSignResourceQO> smsSignResourceJSON;
+
     public Integer getResourceId() {
         return resourceId;
     }
@@ -153,4 +155,12 @@ public class ResourceQO implements Serializable {
     public void setGoodsResource(GoodsResouceQO goodsResource) {
         this.goodsResource = goodsResource;
     }
+
+    public List<SmsSignResourceQO> getSmsSignResourceJSON() {
+        return smsSignResourceJSON;
+    }
+
+    public void setSmsSignResourceJSON(List<SmsSignResourceQO> smsSignResourceJSON) {
+        this.smsSignResourceJSON = smsSignResourceJSON;
+    }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/SmsSignResourceQO.java

+package com.gic.auth.web.qo;
+
+import java.util.List;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-04 15:14
+ */
+public class SmsSignResourceQO {
+    // 全部签名：1, 部分签名：2
+    private Integer type;
+
+    private List<Integer> ids;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public List<Integer> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<Integer> ids) {
+        this.ids = ids;
+    }
+}