diff --git a/epdc-cloud-property/doc/kettle/kettle.properties b/epdc-cloud-property/doc/kettle/kettle.properties new file mode 100644 index 0000000..109568d --- /dev/null +++ b/epdc-cloud-property/doc/kettle/kettle.properties @@ -0,0 +1,63 @@ +######################----yushan_screen----################################ + +####======================== dev +# db-source-yushan +db.mysql.epdc.source.ys.host=47.104.224.45 +db.mysql.epdc.source.ys.port=3308 +db.mysql.epdc.source.ys.username=epdcyushan +db.mysql.epdc.source.ys.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c + +# db-target-yushan +db.mysql.epdc.target.ys.host=47.104.224.45 +db.mysql.epdc.target.ys.port=3308 +db.mysql.epdc.target.ys.username=epdcyushan +db.mysql.epdc.target.ys.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c + +# databases-yushan-source +db.mysql.source.schema.ys.admin=yushan_esua_epdc_admin +db.mysql.source.schema.ys.custom=yushan_esua_epdc_custom +db.mysql.source.schema.ys.points=yushan_esua_epdc_points +db.mysql.source.schema.ys.mutuality=yushan_esua_epdc_mutuality +db.mysql.source.schema.ys.events=yushan_esua_epdc_events +db.mysql.source.schema.ys.group=yushan_esua_epdc_group +db.mysql.source.schema.ys.news=yushan_esua_epdc_news +db.mysql.source.schema.ys.user=yushan_esua_epdc_user +db.mysql.source.schema.ys.api=yushan_esua_epdc_api +db.mysql.source.schema.ys.property=yushan_esua_epdc_property + +# databases-yushan-target +db.mysql.target.schema.yushandb=yushan_esua_epdc_screen + + + + +####======================== prod +# # db-source-yushan +# db.mysql.epdc.source.ys.host=rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com +# db.mysql.epdc.source.ys.port=3306 +# db.mysql.epdc.source.ys.username=epdcyushan +# db.mysql.epdc.source.ys.password=Encrypted 656c696cd5fddfac09e7ab91b811af7e8cc2fd8a + +# # db-target-yushan +# db.mysql.epdc.target.ys.host=rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com +# db.mysql.epdc.target.ys.port=3306 +# db.mysql.epdc.target.ys.username=screen +# db.mysql.epdc.target.ys.password=Encrypted 51ddeacaad04e78b91b811af7e8cc2fd8a + +# # databases-yushan-source +# db.mysql.source.schema.ys.admin=esua_epdc_admin +# db.mysql.source.schema.ys.custom=esua_epdc_custom +# db.mysql.source.schema.ys.points=esua_epdc_points +# db.mysql.source.schema.ys.mutuality=esua_epdc_mutuality +# db.mysql.source.schema.ys.events=esua_epdc_events +# db.mysql.source.schema.ys.group=esua_epdc_group +# db.mysql.source.schema.ys.news=esua_epdc_news +# db.mysql.source.schema.ys.user=esua_epdc_user +# db.mysql.source.schema.ys.api=esua_epdc_api +# db.mysql.source.schema.ys.property=esua_epdc_property + +# # databases-yushan-target +# db.mysql.target.schema.yushandb=esua_epdc_screen + +######################----yushan_screen end----################################ + diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_year.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_query.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_charity_overview_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update_year.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_year_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_year_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_trend_month_update_co.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_trend_month_update_co.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_trend_month_update_st.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_trend_month_update_st.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_year.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_year.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_day_delete.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day_delete.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_day_delete.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_day_delete.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_grid_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_grid_month.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_grid_year.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_year.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_grid_year.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_year.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_month_delete_co.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_month_delete_co.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_month_delete_st.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_month_delete_st.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_street_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_day.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_street_day.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_day.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_street_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_street_month.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_street_year.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_year.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_street_year.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_year.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_year_delete.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year_delete.ktr similarity index 100% rename from epdc-cloud-property/doc/yushan-kettle/yushan_year_delete.ktr rename to epdc-cloud-property/doc/kettle/screen-yushan/yushan_year_delete.ktr diff --git a/epdc-cloud-property/doc/update.sql b/epdc-cloud-property/doc/sql/update.sql similarity index 100% rename from epdc-cloud-property/doc/update.sql rename to epdc-cloud-property/doc/sql/update.sql diff --git a/epdc-cloud-property/pom.xml b/epdc-cloud-property/pom.xml index 244d623..98d9869 100644 --- a/epdc-cloud-property/pom.xml +++ b/epdc-cloud-property/pom.xml @@ -274,8 +274,8 @@ - epdc - Elink@833066 + epdcyushan + elinkepdc@Yushan2020 true 172.16.1.243:8848 diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyServiceImpl.java index 7bb1839..fdde732 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.project.PropertyDTO; import com.elink.esua.epdc.dto.project.result.PropertyDictListResultDTO;