区分江南行和普通白名单

admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java

@@ -26,8 +26,8 @@ public interface H5UserMapper {
     void createH5UserByPhone(@Param("phone") String phone);
     
     @Insert("<script>" +
-            "insert into allowlist_detail(mobile, department, name, create_by, create_time, update_time" +
+            "insert into allowlist_detail(mobile, department, name, create_by, create_time, update_time, type" +
-            ") values (#{mobile}, #{department},#{name}, #{createBy}, now(), now()" +
+            ") values (#{mobile}, #{department},#{name}, #{createBy}, now(), now(), #{type}" +
             ")" +
             "</script>")
     void createH5User(H5UserDTO h5UserDTO);
@@ -72,6 +72,9 @@ public interface H5UserMapper {
     @Select("<script>" +
             "select * from allowlist_detail " +
             "<where>" +
+            "<if test=\"type != null \">" +
+             " and type =  #{type} " +
+            "</if>" +
             "<if test=\"mobile != null and mobile.trim().length() > 0 \">" +
             " and mobile = #{mobile} " +
             "</if>" +
@@ -81,7 +84,6 @@ public interface H5UserMapper {
             "<if test=\"status != null \">" +
             " and status = #{status} " +
             "</if>" +
-
             "</where>" +
             "order by create_time desc " +
             "limit ${size} offset ${offset}" +
@@ -91,6 +93,9 @@ public interface H5UserMapper {
     @Select("<script>" +
             "select count(*) from allowlist_detail " +
             "<where>" +
+            "<if test=\"type != null \">" +
+            " and type =  #{type} " +
+            "</if>" +
             "<if test=\"mobile != null and mobile.trim().length() > 0 \">" +
             " and mobile = #{mobile} " +
             "</if>" +

admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserDTO.java

@@ -7,7 +7,8 @@ public class H5UserDTO {
 	private String department;
 	private Integer status;
 	private String createBy;
-	
+	private Integer type;
+
 	public Long getId() {
 		return id;
 	}
@@ -44,4 +45,11 @@ public class H5UserDTO {
 	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
+
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserQueryParam.java

@@ -11,7 +11,8 @@ public class H5UserQueryParam {
     private String department;
     private Integer status;
     private String createBy;
-    
+    private Integer type;
+
 	public int getPage() {
 		return page;
 	}
@@ -72,4 +73,11 @@ public class H5UserQueryParam {
 	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
+
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

admin/src/main/java/com/jinrui/reference/admin/service/H5UserService.java

@@ -55,7 +55,7 @@ public class H5UserService {
         }
         int page = h5UserQueryParam.getPage();
         h5UserQueryParam.setOffset(offset);
-        
+        h5UserQueryParam.setType(1);
         List<H5UserVO> h5UserList;
         try {
         	h5UserList = h5UserMapper.queryH5User(h5UserQueryParam);
@@ -91,6 +91,7 @@ public class H5UserService {
 
 	public ResultObject<Void> addOrUpdate(H5UserDTO h5UserDTO) {
 		if (h5UserDTO.getId() == null) {
+            h5UserDTO.setType(1);
 			h5UserMapper.createH5User(h5UserDTO);
 		} else {
 			h5UserMapper.updateH5User(h5UserDTO);
@@ -143,6 +144,7 @@ public class H5UserService {
             			H5UserDTO h5UserDTO = new H5UserDTO();
             			BeanUtils.copyProperties(h5UserUploadData, h5UserDTO);
             			h5UserDTO.setCreateBy(createBy);
+                        h5UserDTO.setType(1);
             			h5UserMapper.createH5User(h5UserDTO);
             			continue;
         			}

admin/src/main/resources/application.yml

@@ -1,6 +1,3 @@
-logging:
-  level:
-    root: DEBUG
 server:
   port: 13579
   compression:
@@ -25,21 +22,21 @@ spring:
     #    url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     #    username: financial_prod
     #    password: mmTFncqmDal5HLRGY0BV
-    url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://10.127.2.207:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-    username: root
+    username: financial_prod
-    password: Xgf_8000
+    password: mmTFncqmDal5HLRGY0BV
 redis:
   #  host: 192.168.0.172
   #  port: 6379
   #  password: Xgf_redis
-  host: 123.60.153.169
+  host: 10.127.2.209
   port: 6379
-  password: Xgf_redis
+  password: dMrt4kmwiW6LDJXy
 elasticsearch:
   scheme: http
   # 111.13.176.3 部署地址
   # 10.127.2.194 本地测试地址
-  host: 111.13.176.3
+  host: 10.127.2.194
   port: 9200
   enable: true
   username: elastic