Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -93,7 +93,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9092</server.port>
+                <server.port>9055</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- nacos -->
@@ -106,7 +106,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <server.port>9092</server.port>
+                <server.port>9055</server.port>
                 <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- nacos -->

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   redis:
     database: 2
-    host: redis
+    host: 47.104.224.45
     timeout: 30s
     port: 6379
-    password: 123456
+    password: elink@888
   datasource:
     druid:
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: renren
+      username: epdc
-      password: 123456
+      password: elink833066
       initial-size: 10
       max-active: 100
       min-idle: 10

esua-epdc/epdc-auth/pom.xml

@@ -108,7 +108,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9091</server.port>
+                <server.port>9056</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- redis配置 -->
@@ -127,7 +127,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <server.port>9091</server.port>
+                <server.port>9056</server.port>
                 <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- redis配置 -->

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java

@@ -54,7 +54,7 @@ public interface ServiceConstant {
     /**
      * 党群议事模块
      */
-    String EPDC_ISSUE_SERVER = "epdc-issue-server";
+    String EPDC_ISSUE_SERVER = "epdc-events-server";
     /**
      * 生活服务模块
      */

esua-epdc/epdc-gateway/pom.xml

@@ -79,10 +79,9 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <!-- gateway routes -->
-                <!--<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>-->
+                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>
+                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
+<!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
@@ -97,8 +96,8 @@
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
 <!--                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>-->
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-<!--                <gateway.routes.epdc-issue-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-issue-server.uri>-->
+<!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
                 <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
@@ -134,7 +133,7 @@
                 <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
                 <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
@@ -169,7 +168,7 @@
                 <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
+                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
                 <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -96,11 +96,11 @@ spring:
           filters:
             - StripPrefix=0
         #党群议事模块
-        - id: epdc-issue-server
+        - id: epdc-events-server
-          uri: @gateway.routes.epdc-issue-server.uri@
+          uri: @gateway.routes.epdc-events-server.uri@
           order: 11
           predicates:
-            - Path=/issue/**
+            - Path=/events/**
           filters:
             - StripPrefix=0
         #生活服务模块

esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml

@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-issue-client</artifactId>
+            <artifactId>epdc-events-client</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
@@ -50,4 +50,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml → esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>epdc-issue</artifactId>
+        <artifactId>epdc-events</artifactId>
         <groupId>com.esua.epdc</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>epdc-issue-client</artifactId>
+    <artifactId>epdc-events-client</artifactId>
     <packaging>jar</packaging>
 
 
-</project>
+</project>

esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml → esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -3,19 +3,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>epdc-issue</artifactId>
+        <artifactId>epdc-events</artifactId>
         <groupId>com.esua.epdc</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>epdc-issue-server</artifactId>
+    <artifactId>epdc-events-server</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-issue-client</artifactId>
+            <artifactId>epdc-events-client</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
@@ -143,4 +143,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>

esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java → esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java

@@ -22,10 +22,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-public class IssueApplication {
+public class EventsApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(IssueApplication.class, args);
+        SpringApplication.run(EventsApplication.class, args);
     }
 
 }

esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml → esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 server:
   port: @server.port@
   servlet:
-    context-path: /issue
+    context-path: /events
 
 spring:
   application:
-    name: epdc-issue-server
+    name: epdc-events-server
   # 环境 dev|test|prod
   profiles:
     active: @spring.profiles.active@
@@ -28,7 +28,7 @@ spring:
         register-enabled: @nacos.register-enabled@
     alibaba:
       seata:
-        tx-service-group: epdc-issue-server-fescar-service-group
+        tx-service-group: epdc-events-server-fescar-service-group
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver

esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml → esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml

@@ -2,7 +2,7 @@
 <configuration>
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
-    <property name="log.path" value="logs/issue"/>
+    <property name="log.path" value="logs/events"/>
 
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
@@ -156,4 +156,4 @@
         </root>
     </springProfile>
 
-</configuration>
+</configuration>

esua-epdc/epdc-module/epdc-issue/pom.xml → esua-epdc/epdc-module/epdc-events/pom.xml

@@ -9,12 +9,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>epdc-issue</artifactId>
+    <artifactId>epdc-events</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>epdc-issue-client</module>
+        <module>epdc-events-client</module>
-        <module>epdc-issue-server</module>
+        <module>epdc-events-server</module>
     </modules>
 
 
-</project>
+</project>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -62,17 +63,31 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
         List<UserEntity> entityList = baseDao.selectList(getWrapper(params));
-
         return ConvertUtils.sourceToTarget(entityList, UserDTO.class);
     }
 
     private QueryWrapper<UserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
+        String streetId=(String) params.get("streetId");
+        String communityId=(String) params.get("communityId");
+        String gridId=(String) params.get("gridId");
+        String realName=(String) params.get("realName");
+        String mobile=(String) params.get("mobile");
+        String identityNo=(String) params.get("identityNo");
+        String startTime=(String) params.get("startTime");
+        String endTime=(String) params.get("endTime");
 
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.eq(StringUtils.isNotBlank(id), "ID", id);
-        //wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+        wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId);
-
+        wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId);
+        wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId);
+        wrapper.eq(StringUtils.isNotBlank(realName),"REAL_NAME",realName);
+        wrapper.eq(StringUtils.isNotBlank(mobile),"MOBILE",mobile);
+        wrapper.eq(StringUtils.isNotBlank(identityNo),"IDENTITY_NO",identityNo);
+        wrapper.ge(StringUtils.isNotBlank(startTime),"REGISTER_TIME",startTime);
+        wrapper.lt(StringUtils.isNotBlank(endTime),"REGISTER_TIME",endTime);
+//        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
         return wrapper;
     }
 

esua-epdc/epdc-module/pom.xml

@@ -21,7 +21,7 @@
         <module>epdc-api</module>
         <module>epdc-heart</module>
         <module>epdc-news</module>
-        <module>epdc-issue</module>
+        <module>epdc-events</module>
         <module>epdc-neighbor</module>
         <module>epdc-services</module>
         <module>epdc-app</module>