瀏覽代碼

common模块

叶君翔 3 年之前
父節點
當前提交
ff80440108

+ 6 - 0
lb-common/pom.xml

@@ -191,6 +191,12 @@
             <artifactId>reflectasm</artifactId>
             <version>1.11.0</version>
         </dependency>
+        <!--  mvn install:install-file -DgroupId=shangou_platform -DartifactId=open_sdk -Dversion=1.0.19.1-SNAPSHOT -Dpackaging=jar -Dfile=shangou_platform_open_sdk-1.0.19.1-SNAPSHOT.jar-->
+<!--        <dependency>-->
+<!--            <groupId>shangou_platform</groupId>-->
+<!--            <artifactId>open_sdk</artifactId>-->
+<!--            <version>1.0.19.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.google.guava</groupId>

+ 14 - 0
lb-common/src/main/java/com/ydd/common/annotation/BindAgent.java

@@ -0,0 +1,14 @@
+package com.ydd.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 指定代理商的查询接口
+ * @author 叶君翔
+ * @date 2022/03/16 10:06
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface BindAgent {
+}

+ 21 - 0
lb-common/src/main/java/com/ydd/common/config/EnvConfig.java

@@ -0,0 +1,21 @@
+package com.ydd.common.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *  获取当前环境
+ * @author 叶君翔
+ * @date 2022/03/02 15:44
+ */
+@Configuration
+public class EnvConfig {
+
+    @Value("${spring.profiles.active}")
+    private String profiles;
+
+    public String getProfiles() {
+        return profiles;
+    }
+
+}

+ 46 - 0
lb-common/src/main/java/com/ydd/common/constant/Constants.java

@@ -1,5 +1,10 @@
 package com.ydd.common.constant;
 
+import com.ydd.common.enums.UserTypeJoinRoleEnums;
+
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 通用常量信息
  * 
@@ -148,4 +153,45 @@ public class Constants
      * 运力优化标识
      */
     public static final String DELIVERY_OPT_FLAG = "delivery_opt_flag:";
+
+    /**
+     * 后台登录用户可查看的代理商数据
+     */
+    public static final String SYS_USER_BIND_AGENT = "bindAgent";
+
+    /**
+     * 外部角色ID
+     */
+    public static final List<Long> EXTERNAL_ROLE_IDS = Arrays.asList(
+            UserTypeJoinRoleEnums.AGENT.getRoleId(),
+            UserTypeJoinRoleEnums.DADA.getRoleId(),
+            UserTypeJoinRoleEnums.DADA_DELIVERY_RAP.getRoleId(),
+            UserTypeJoinRoleEnums.DADA_DELIVERY.getRoleId());
+
+    /**
+     * 获取内部角色域名
+     * @param env 当前环境
+     * @return 域名
+     */
+    public static String getInSideDomain(String env) {
+        if (!"dev".equals(env)) {
+            return "manage.liebaoai.cn";
+        } else {
+            return "managetest.liebaoai.cn";
+        }
+    }
+
+    /**
+     * 获取外部角色域名
+     * @param env 当前环境
+     * @return 域名
+     */
+    public static String getExternalDomain(String env) {
+        if (!"dev".equals(env)) {
+            return "oms.liebaoai.cn";
+        } else {
+            return "omstest.liebaoai.cn";
+        }
+    }
+
 }

+ 34 - 7
lb-common/src/main/java/com/ydd/common/core/domain/entity/SysUser.java

@@ -1,12 +1,5 @@
 package com.ydd.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydd.common.annotation.Excel;
@@ -14,6 +7,14 @@ import com.ydd.common.annotation.Excel.ColumnType;
 import com.ydd.common.annotation.Excel.Type;
 import com.ydd.common.annotation.Excels;
 import com.ydd.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
@@ -100,6 +101,16 @@ public class SysUser extends BaseEntity
     /** 岗位组 */
     private Long[] postIds;
 
+    /**
+     * 符合条件的用户id
+     */
+    private List<Long> userIds;
+
+    /**
+     * 符合条件的代理商id
+     */
+    private List<Long> agentIds;
+
     public Integer getType() {
         return type;
     }
@@ -340,6 +351,22 @@ public class SysUser extends BaseEntity
         this.dadaDspId = dadaDspId;
     }
 
+    public List<Long> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<Long> userIds) {
+        this.userIds = userIds;
+    }
+
+    public List<Long> getAgentIds() {
+        return agentIds;
+    }
+
+    public void setAgentIds(List<Long> agentIds) {
+        this.agentIds = agentIds;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 4 - 1
lb-common/src/main/java/com/ydd/common/enums/UserTypeEnums.java

@@ -13,7 +13,10 @@ public enum UserTypeEnums
     DADA(3, "达达总后台"),
     DADA_DELIVERY_RAP(4, "配送服务商(收付)"),
     DADA_DELIVERY(5, "配送服务商"),
-    DADA_MERCHANT(6, "达达商户");
+    DADA_MERCHANT(6, "达达商户"),
+    DSP_CUSTOMER(7, "渠道商客服"),
+    DSP_MARKET(8, "渠道商市场")
+    ;
 
     private final Integer code;
     private final String info;

+ 24 - 0
lb-common/src/main/java/com/ydd/common/sms/AliSmsService.java

@@ -119,4 +119,28 @@ public class AliSmsService {
         return null;
     }
 
+    void sendVerifyCaptcha(String mobile, String code){
+
+        DefaultProfile profile = DefaultProfile.getProfile(cloudSmsConfig.getAliRegionId(), cloudSmsConfig.getAliAccessKeyId(), cloudSmsConfig.getAliAccessKeySecret());
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        CommonRequest request = new CommonRequest();
+        request.setSysMethod(MethodType.POST);
+        request.setSysDomain("dysmsapi.aliyuncs.com");
+        request.setSysVersion("2017-05-25");
+        request.setSysAction("SendSms");
+        request.putQueryParameter("RegionId", cloudSmsConfig.getAliRegionId());
+        request.putQueryParameter("PhoneNumbers", mobile);
+        request.putQueryParameter("SignName", cloudSmsConfig.getAliSign());
+        request.putQueryParameter("TemplateCode", cloudSmsConfig.getAliVerifyTemplateCode());
+        request.putQueryParameter("TemplateParam", "{\"code\":\""+ code+"\"}");
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            System.out.println(response.getData());
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            e.printStackTrace();
+        }
+    }
 }

+ 1 - 0
lb-common/src/main/java/com/ydd/common/sms/CloudSmsConfig.java

@@ -61,4 +61,5 @@ public class CloudSmsConfig {
      */
     private String aliForgetTemplateCode;
 
+    private String aliVerifyTemplateCode;
 }

+ 4 - 0
lb-common/src/main/java/com/ydd/common/sms/SmsService.java

@@ -51,6 +51,10 @@ public class SmsService {
 
     }
 
+    public void sendVerifyCaptcha(String mobile, String code){
+
+            new AliSmsService(cloudSmsConfig).sendVerifyCaptcha(mobile, code);
+    }
 
     public String getMobile(String accessToken) {
         return new AliSmsService(cloudSmsConfig).getMobile(accessToken);