Merge remote-tracking branch 'origin/feature/phaseOne'

# Conflicts:
#	epdc-cloud-property/pom.xml

epdc-cloud-property/pom.xml

@@ -184,20 +184,20 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.port>10001</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_property?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_property?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
 
                 <!--党群e家小程序配置-->
                 <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
@@ -224,7 +224,7 @@
 
                 <server.port>10009</server.port>
 
-                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.index>9</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>10001</spring.redis.port>
                 <spring.redis.password>elink!888</spring.redis.password>

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java

@@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectExcel;
 import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService;
 import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO;
+import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,6 +58,11 @@ public class PropertyProjectController {
         return new Result<PageData<PropertyProjectDTO>>().ok(page);
     }
 
+    @GetMapping("dict")
+    public Result<List<PropertyDictListResultDTO>> dict() {
+        List<PropertyDictListResultDTO> page = propertyProjectService.dict();
+        return new Result<List<PropertyDictListResultDTO>>().ok(page);
+    }
     @GetMapping("{id}")
     public Result<PropertyProjectDTO> get(@PathVariable("id") String id) {
         PropertyProjectDTO data = propertyProjectService.get(id);

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/dao/PropertyProjectDao.java

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
 import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity;
+import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -48,6 +49,15 @@ public interface PropertyProjectDao extends BaseDao<PropertyProjectEntity> {
      */
     List<PropertyProjectEntity> selectListOfProjects(Map<String, Object> params);
 
+    /**
+     * 物业项目列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.smile.dto.pr.PropertyDictListResultDTO>
+     * @author zhangyuan
+     * @since 2019/10/11 14:54
+     */
+    List<PropertyDictListResultDTO> selectDictListOfProject();
+
     /**
      * 项目列表
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/PropertyProjectService.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
 import com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity;
 import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -48,6 +49,15 @@ public interface PropertyProjectService extends BaseService<PropertyProjectEntit
      */
     PageData<PropertyProjectDTO> page(Map<String, Object> params);
 
+    /**
+     * 下拉菜单
+     *
+     * @return PageData<PropertyDTO>
+     * @author zhangyuan
+     * @date 2020-05-20
+     */
+    List<PropertyDictListResultDTO> dict();
+
     /**
      * 默认查询
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java

@@ -49,6 +49,7 @@ import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
 import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
+import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,6 +97,13 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public List<PropertyDictListResultDTO> dict() {
+        List<PropertyDictListResultDTO> entityList = baseDao.selectDictListOfProject();
+
+        return ConvertUtils.sourceToTarget(entityList, PropertyDictListResultDTO.class);
+    }
+
     @Override
     public List<PropertyProjectDTO> list(Map<String, Object> params) {
         List<PropertyProjectEntity> entityList = baseDao.selectList(getWrapper(params));

epdc-cloud-property/src/main/resources/mapper/smile/project/PropertyProjectDao.xml

@@ -25,6 +25,16 @@
         ORDER BY
         ep.CREATED_TIME DESC
     </select>
+    <select id="selectDictListOfProject" resultType="com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO">
+        SELECT
+            ID AS dictValue, PROJECT_NAME AS dictName
+        FROM
+            yushan_esua_epdc_property.epdc_property_project epp
+        WHERE
+            epp.DEL_FLAG = '0'
+        ORDER BY
+            epp.CREATED_TIME DESC
+    </select>
 
     <select id="listAll" resultType="com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity">
         SELECT