From 7eeb20c633d3f4e34c6cdf9433bec22a03433f78 Mon Sep 17 00:00:00 2001 From: yujt Date: Thu, 11 Jun 2020 10:19:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/kettle/kettle.properties | 63 +++++++++++++++++++ .../screen_totality_comm_query.ktr | 0 .../screen_totality_comm_query_comm.ktr | 0 .../screen_totality_comm_query_comm_info.ktr | 0 .../screen_totality_comm_query_month.ktr | 0 .../screen_totality_comm_update.ktr | 0 .../screen_totality_grid_query.ktr | 0 .../screen_totality_grid_query_grid.ktr | 0 .../screen_totality_grid_query_grid_info.ktr | 0 .../screen_totality_grid_query_month.ktr | 0 .../screen_totality_grid_query_year.ktr | 0 .../screen_totality_grid_update.ktr | 0 .../screen_totality_street_query.ktr | 0 .../screen_totality_street_query_month.ktr | 0 .../screen_totality_street_query_street.ktr | 0 ...reen_totality_street_query_street_info.ktr | 0 .../screen_totality_street_update.ktr | 0 .../screen_ys_charity_overview_query.ktr | 0 .../screen_ys_charity_overview_update.ktr | 0 .../screen_ys_commu_hot_topic.ktr | 0 .../screen_ys_commu_hot_topic_update.ktr | 0 .../screen_ys_commu_hot_topic_update_year.ktr | 0 .../screen_ys_grid_rank_month_update.ktr | 0 .../screen_ys_grid_rank_month_update_year.ktr | 0 .../screen_ys_grid_rank_year_update.ktr | 0 .../screen-yushan}/screen_ys_news_update.ktr | 0 .../screen_ys_news_update_year.ktr | 0 .../screen_ys_trend_month_update_co.ktr | 0 .../screen_ys_trend_month_update_st.ktr | 0 .../screen-yushan}/yushan_comm_day.kjb | 0 .../screen-yushan}/yushan_comm_month.kjb | 0 .../screen-yushan}/yushan_comm_year.kjb | 0 .../screen-yushan}/yushan_day.kjb | 0 .../screen-yushan}/yushan_day_delete.ktr | 0 .../screen-yushan}/yushan_grid_day.kjb | 0 .../screen-yushan}/yushan_grid_month.kjb | 0 .../screen-yushan}/yushan_grid_year.kjb | 0 .../screen-yushan}/yushan_month.kjb | 0 .../screen-yushan}/yushan_month_delete_co.ktr | 0 .../screen-yushan}/yushan_month_delete_st.ktr | 0 .../screen-yushan}/yushan_street_day.kjb | 0 .../screen-yushan}/yushan_street_month.kjb | 0 .../screen-yushan}/yushan_street_year.kjb | 0 .../screen-yushan}/yushan_year.kjb | 0 .../screen-yushan}/yushan_year_delete.ktr | 0 epdc-cloud-property/doc/{ => sql}/update.sql | 0 epdc-cloud-property/pom.xml | 4 +- .../service/impl/PropertyServiceImpl.java | 1 + 48 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 epdc-cloud-property/doc/kettle/kettle.properties rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_comm_query.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_comm_query_comm.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_comm_query_comm_info.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_comm_query_month.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_comm_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_query.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_query_grid.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_query_grid_info.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_query_month.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_query_year.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_grid_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_street_query.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_street_query_month.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_street_query_street.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_street_query_street_info.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_totality_street_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_charity_overview_query.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_charity_overview_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_commu_hot_topic.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_commu_hot_topic_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_commu_hot_topic_update_year.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_grid_rank_month_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_grid_rank_month_update_year.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_grid_rank_year_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_news_update.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_news_update_year.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_trend_month_update_co.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/screen_ys_trend_month_update_st.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_comm_day.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_comm_month.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_comm_year.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_day.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_day_delete.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_grid_day.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_grid_month.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_grid_year.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_month.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_month_delete_co.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_month_delete_st.ktr (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_street_day.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_street_month.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_street_year.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_year.kjb (100%) rename epdc-cloud-property/doc/{yushan-kettle => kettle/screen-yushan}/yushan_year_delete.ktr (100%) rename epdc-cloud-property/doc/{ => sql}/update.sql (100%) 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; From 8dbcc7549075997ffbebc5d1d1166e05ab7b8151 Mon Sep 17 00:00:00 2001 From: yujt Date: Fri, 12 Jun 2020 09:17:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppConflictController.java | 46 ++++++++++++------ .../conflict/dao/ConflictMediateDao.java | 13 +---- .../entity/ConflictMediateEntity.java | 2 +- .../service/ConflictMediateService.java | 5 +- .../impl/ConflictMediateServiceImpl.java | 44 ++++++++++------- .../mapper/conflict/ConflictMediateDao.xml | 47 +++---------------- 6 files changed, 70 insertions(+), 87 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java index a1e9e5f..97e43c0 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java @@ -18,13 +18,8 @@ package com.elink.esua.epdc.modules.conflict.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; @@ -49,26 +44,47 @@ public class AppConflictController { @Autowired private ConflictMediateService conflictMediateService; + /** + * 工作端 - 综治矛调提报记录 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/6/11 15:07 + */ @GetMapping("listHistory") - public Result> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) throws Exception { - //效验数据 - ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); + public Result> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) { + // 效验数据 + ValidatorUtils.validateEntity(formDto); List list = conflictMediateService.listHistory(formDto); return new Result>().ok(list); } - @GetMapping("getById") - public Result getById(@RequestBody ConflictMediateDetailFormDTO formDto) throws Exception { + /** + * 工作端 - 获取综治矛调详细信息 + * + * @param conflictId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/6/11 15:07 + */ + @GetMapping("getById/{conflictId}") + public Result getById(@PathVariable("conflictId") String conflictId) { //效验数据 - ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); - ConflictMediateDetailResultDTO data = conflictMediateService.getById(formDto); + ConflictMediateDetailResultDTO data = conflictMediateService.getById(conflictId); return new Result().ok(data); } + /** + * 工作端 - 综治矛调提报 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/6/11 15:06 + */ @PostMapping("submit") - public Result submit(@RequestBody ConflictMediateFormDTO formDto) throws Exception { - UserDetail user = SecurityUser.getUser(); - formDto.setUserId(user.getId()); + public Result submit(@RequestBody ConflictMediateFormDTO formDto) { conflictMediateService.submit(formDto); return new Result(); } diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java index cbdc574..fcc5dcf 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java @@ -18,8 +18,8 @@ package com.elink.esua.epdc.modules.conflict.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity; import org.apache.ibatis.annotations.Mapper; @@ -53,15 +53,6 @@ public interface ConflictMediateDao extends BaseDao { * @author zhangyuan * @since 2020/5/21 14:54 */ - List listConflictMediate(ConflictMediateHistoryFormDTO dto); + List listConflictMediate(ConflictMediateHistoryFormDTO dto); - /** - * 工作端--矛盾调解 详情 - * - * @return com.elink.esua.epdc.modules.psychology.entity.ConflictMediateDetailResultDTO - * @params [params] - * @author zhangyuan - * @since 2020/5/21 14:54 - */ - ConflictMediateEntity getById(ConflictMediateDetailFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java index 16de7ff..9804559 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java @@ -35,7 +35,7 @@ import java.util.Date; @TableName("epdc_conflict_mediate") public class ConflictMediateEntity extends DeptScope { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 4325729627079127823L; /** * 提交人ID diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java index 468d8eb..c26b603 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.modules.conflict.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; @@ -131,10 +130,10 @@ public interface ConflictMediateService extends BaseService export(Map params) { List entityList = baseDao.selectList(getWrapper(params)); for (int i = 0; i < entityList.size(); i++) { - entityList.get(i).setId(i+1+""); + entityList.get(i).setId(i + 1 + ""); } return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class); } @@ -128,31 +129,40 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl listHistory(ConflictMediateHistoryFormDTO dto) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("获取用户信息失败"); + } // sql limit条件转换 - dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize()); - List entity = baseDao.listConflictMediate(dto); - return ConvertUtils.sourceToTarget(entity, ConflictMediateHistoryResultDTO.class); + dto.setPageIndex((dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize()); + dto.setUserId(String.valueOf(user.getId())); + return baseDao.listConflictMediate(dto); } @Override - public ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto) { - ConflictMediateEntity entity = baseDao.getById(dto); - return ConvertUtils.sourceToTarget(entity, ConflictMediateDetailResultDTO.class); + public ConflictMediateDetailResultDTO getById(String conflictId) { + ConflictMediateEntity conflictMediateEntity = this.baseDao.selectById(conflictId); + ConflictMediateDetailResultDTO resultDto = ConvertUtils.sourceToTarget(conflictMediateEntity, ConflictMediateDetailResultDTO.class); + resultDto.setSubmitTime(DateUtils.format(conflictMediateEntity.getSubmitTime(), DateUtils.DATE_PATTERN)); + return resultDto; } /** diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml index c318983..7692f46 100644 --- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml @@ -3,34 +3,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - ID, USER_ID, USER_NAME, CONFLICT_TYPE, CONFLICT_REASON, INVOLVED_NUM, MAINSTAY_LEADER, RESPONSIBLE_DEPT, - RESPONSIBLE_PEOPLE, MAJOR_MEASURES, CURRENT_SITUATION, REMARK, SUBMIT_TIME, + RESPONSIBLE_PEOPLE, MAJOR_MEASURES, CURRENT_SITUATION, REMARK, DATE_FORMAT( SUBMIT_TIME, '%Y-%m-%d' ) AS SUBMIT_TIME, DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, PARENT_DEPT_IDS, PARENT_DEPT_NAMES, ALL_DEPT_IDS, ALL_DEPT_NAMES @@ -56,24 +31,16 @@ ORDER BY CREATED_TIME DESC - SELECT - + t.id, + DATE_FORMAT( t.SUBMIT_TIME, '%Y-%m-%d' ) submitTime FROM - epdc_conflict_mediate + epdc_conflict_mediate t WHERE - DEL_FLAG = '0' + DEL_FLAG = '0' and t.USER_ID = #{userId} and t.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' ) ORDER BY - CREATED_TIME DESC + CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize}; - \ No newline at end of file