Merge branch 'master' into feature/dept

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@@ -67,6 +67,18 @@ public class SysDeptDTO extends TreeNode implements Serializable {
      */
     private String partyCode;
 
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系方式")
+    private String mobile;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     public String getPartyCode() {
         return partyCode;
     }
@@ -134,4 +146,36 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     public void setPid(Long pid) {
         this.pid = pid;
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -79,4 +80,24 @@ public class SysDeptEntity extends BaseEntity {
      */
     private String partyCode;
 
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
 }

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

@@ -8,9 +8,9 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: epdc
-      password: Elink@833066
+      url: jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      username: root
+      password: Abc@123456
       #Oracle
 #      driver-class-name: oracle.jdbc.OracleDriver
 #      url: jdbc:oracle:thin:@localhost:1521:xe

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@@ -165,15 +165,15 @@
                 <server.port>9065</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.host>118.190.232.100</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java

@@ -106,4 +106,39 @@ public class PartyMembersDTO implements Serializable {
 	 */
 	private String allDeptIdsStr;
 
+	/**
+	 * 入党时间
+	 */
+	private Date joinDate;
+	/**
+	 * 职务（字典项）
+	 */
+	private String position;
+
+	/**
+	 * 职务名称
+	 */
+	private String positionName;
+	/**
+	 * 是否是流动性党员 0否1是
+	 */
+	private String isMobility;
+	/**
+	 * 流动党员证号
+	 */
+	private String mobilityNum;
+	/**
+	 * 文化程度（字典项）
+	 */
+	private String education;
+	/**
+	 * 备注
+	 */
+	private String note;
+
+	/**
+	 * 地址
+	 */
+	private String address;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -139,21 +139,21 @@
                 <server.port>9068</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.host>118.190.232.100</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <dynamic.datasource.first.url>
-                    <![CDATA[jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </dynamic.datasource.first.url>
-                <dynamic.datasource.first.username>epdc</dynamic.datasource.first.username>
-                <dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password>
+                <dynamic.datasource.first.username>root</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>Abc@123456</dynamic.datasource.first.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java

@@ -87,4 +87,39 @@ public class PartyMembersEntity extends DeptScope {
      */
     private String partyOrganization;
 
+    /**
+     * 入党时间
+     */
+    private Date joinDate;
+    /**
+     * 职务（字典项）
+     */
+    private String position;
+    /**
+     * 职务名称
+     */
+    private String positionName;
+    /**
+     * 是否是流动性党员 0否1是
+     */
+    private String isMobility;
+    /**
+     * 流动党员证号
+     */
+    private String mobilityNum;
+    /**
+     * 文化程度（字典项）
+     */
+    private String education;
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+
 }

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

@@ -195,6 +195,14 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         entity.setRealName(dto.getRealName());
         entity.setMobile(dto.getMobile());
         entity.setIdentityNo(dto.getIdentityNo());
+        entity.setJoinDate(dto.getJoinDate());
+        entity.setPosition(dto.getPosition());
+        entity.setIsMobility(dto.getIsMobility());
+        entity.setMobilityNum(dto.getMobilityNum());
+        entity.setEducation(dto.getEducation());
+        entity.setNote(dto.getNote());
+        entity.setPositionName(dto.getPositionName());
+        entity.setAddress(dto.getAddress());
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);