井筒-优化

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,46 @@
+Manifest-Version: 1.0
+Main-Class: com.bowintek.practice.PracticeApplication
+Class-Path: HikariCP-4.0.3.jar postgresql-42.3.4.jar java-jwt-3.9.0.jar 
+ netty-common-4.1.79.Final.jar netty-codec-4.1.79.Final.jar httpcore-4.4
+ .15.jar lucene-queryparser-4.7.2.jar commons-collections4-4.2.jar logba
+ ck-core-1.2.11.jar httpclient-4.5.9.jar lettuce-core-6.1.9.RELEASE.jar 
+ commons-pool2-2.11.1.jar spring-oxm-5.3.22.jar lucene-sandbox-4.7.2.jar
+  netty-handler-4.1.79.Final.jar spring-core-5.3.22.jar spring-jdbc-5.3.
+ 22.jar log4j-api-2.17.2.jar opentelemetry-context-1.29.0.jar mysql-conn
+ ector-java-8.0.29.jar commons-net-3.6.jar tomcat-embed-el-9.0.65.jar sn
+ akeyaml-1.30.jar spring-boot-starter-tomcat-2.7.2.jar gson-2.9.0.jar my
+ batis-3.5.9.jar spring-boot-2.7.2.jar jsr305-3.0.2.jar poi-4.0.0.jar ne
+ tty-transport-4.1.79.Final.jar jackson-core-2.13.3.jar log4j-to-slf4j-2
+ .17.2.jar httpcore-nio-4.4.15.jar jul-to-slf4j-1.7.36.jar tomcat-embed-
+ core-9.0.65.jar parsson-1.0.0.jar mybatis-spring-boot-starter-2.2.2.jar
+  spring-context-support-5.3.22.jar spring-boot-starter-jdbc-2.7.2.jar s
+ pring-boot-devtools-2.7.2.jar juh-4.1.2.jar jsqlparser-4.2.jar jackson-
+ annotations-2.13.3.jar json-20190722.jar lucene-analyzers-common-4.7.2.
+ jar pagehelper-spring-boot-autoconfigure-1.4.3.jar poi-ooxml-schemas-4.
+ 0.0.jar poi-ooxml-4.0.0.jar tomcat-embed-websocket-9.0.65.jar jakarta.a
+ nnotation-api-1.3.5.jar xmlbeans-3.0.1.jar spring-aop-5.3.22.jar spring
+ -context-5.3.22.jar lucene-core-4.7.2.jar commons-collections-3.2.2.jar
+  jodconverter-local-4.4.6.jar pagehelper-5.3.1.jar commons-beanutils-1.
+ 9.4.jar commons-compress-1.18.jar unoil-4.1.2.jar spring-webmvc-5.3.22.
+ jar spring-boot-starter-json-2.7.2.jar lombok-1.18.20.jar spring-expres
+ sion-5.3.22.jar jakarta.json-api-2.0.1.jar pagehelper-spring-boot-start
+ er-1.4.3.jar spring-boot-starter-2.7.2.jar commons-codec-1.15.jar sprin
+ g-tx-5.3.22.jar elasticsearch-java-8.11.1.jar postgresql-42.3.6.jar spr
+ ing-data-keyvalue-2.7.2.jar spring-data-redis-2.7.2.jar spring-boot-sta
+ rter-logging-2.7.2.jar spring-boot-autoconfigure-2.7.2.jar opentelemetr
+ y-api-1.29.0.jar checker-qual-3.5.0.jar lucene-queries-4.7.2.jar elasti
+ csearch-rest-client-7.17.4.jar curvesapi-1.04.jar druid-spring-boot-sta
+ rter-1.2.11.jar netty-buffer-4.1.79.Final.jar spring-data-commons-2.7.2
+ .jar aspectjweaver-1.9.7.jar spring-web-5.3.22.jar jackson-databind-2.1
+ 3.3.jar druid-1.2.11.jar fastjson-1.2.47.jar netty-transport-native-uni
+ x-common-4.1.79.Final.jar jackson-module-parameter-names-2.13.3.jar asp
+ ectjrt-1.9.7.jar jackson-datatype-jdk8-2.13.3.jar slf4j-api-1.7.36.jar 
+ spring-beans-5.3.22.jar httpasyncclient-4.1.5.jar reactor-core-3.4.21.j
+ ar netty-resolver-4.1.79.Final.jar spring-jcl-5.3.22.jar ridl-4.1.2.jar
+  jackson-datatype-jsr310-2.13.3.jar mybatis-spring-boot-autoconfigure-2
+ .2.2.jar mybatis-spring-2.0.7.jar aspose-words-15.8.0-jdk16.jar logback
+ -classic-1.2.11.jar reactive-streams-1.0.4.jar jurt-4.1.2.jar jodconver
+ ter-core-4.4.6.jar aspose-cells-18.9.jar poi-scratchpad-4.0.0.jar sprin
+ g-boot-starter-data-redis-2.7.2.jar ikanalyzer-2012_u6.jar spring-boot-
+ starter-web-2.7.2.jar commons-lang3-3.5.jar commons-logging-1.2.jar
+

src/main/resources/mapping/cquery/FactWellCQuery.xml

@@ -29,24 +29,22 @@
     <select id="getMonthGroupList" resultType="com.bowintek.practice.vo.FactWell.FactWellGroupList">
         SELECT t.well_id,
             t.prod_time_str time_str,
-            SUM(t.gas_prod_mon) gas,
-            SUM(t.oil_prod_mon) oil,
-            SUM(t.water_prod_mon) water,
-            SUM(t.fluid_prod_mon) fluid,
+            MAX(t.gas_prod_mon) gas,
+            MAX(t.oil_prod_mon) oil,
+            MAX(t.water_prod_mon) water,
+            MAX(t.fluid_prod_mon) fluid,
             0 watercut
         FROM (  SELECT wm.well_id,
-                    to_char(to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD'), 'YYYY年MM月') prod_time_str,
-                    COALESCE(wm.gas_prod_mon, 0) gas_prod_mon,
-                    COALESCE(wm.oil_prod_mon, 0) oil_prod_mon,
-                    COALESCE(wm.water_prod_mon, 0) water_prod_mon,
-                    COALESCE(wm.fluid_prod_mon, 0) fluid_prod_mon
-                FROM by_dwr.fact_dwr_pc_pro_well_vol_m wm
+                    TO_CHAR(wm.prod_date , 'YYYY-MM-DD') prod_time_str,
+                    COALESCE(wm.gas_prod_cum, 0) gas_prod_mon,
+                    COALESCE(wm.oil_prod_cum, 0) oil_prod_mon,
+                    COALESCE(wm.water_prod_cum, 0) water_prod_mon,
+                    COALESCE(wm.liquid_prod_cum, 0) fluid_prod_mon
+                FROM by_dwr.fact_dwr_pc_pro_well_vol_d wm
                 WHERE wm.prod_date is not null
-                    and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
-                    and to_date(CONCAT(wm.prod_date,'-01'), 'YYYY-MM-DD')  <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
-        <if test="wellId!='' and wellId!=null">
-            and wm.well_id=#{wellId}
-        </if>
+                    and wm.prod_date <![CDATA[ >= ]]> to_date(#{startDay},'YYYY-MM-DD')
+                    and wm.prod_date <![CDATA[ <= ]]> to_date(#{endDay},'YYYY-MM-DD')
+                  and wm.well_id=#{wellId}
             ) t
         GROUP BY t.well_id, t.prod_time_str
     </select>

src/main/resources/mapping/cquery/WellInfoCQuery.xml

@@ -3,7 +3,10 @@
 <mapper namespace="com.bowintek.practice.mapper.cquery.WellInfoCQuery">
 
     <select id="getWellInfo" resultType="java.util.HashMap">
-        select well.*,
+        select
+            well.well_id, well.well_common_name, well_purpose, well.well_type,  well.budgeted_md, well.completion_formation,
+            well.completion_method, well.org_id_a1, well.org_id_a2,  well.org_name_a2,well.project_id, well.project_name,
+            TO_CHAR(well.spud_date , 'YYYY-MM-dd') spud_date,TO_CHAR(well.end_drilling_date , 'YYYY-MM-dd') end_drilling_date,
                fact_daily.fluid_prod_daily,
                fact_daily.oil_prod_daily,
                fact_daily.water_cut,
@@ -24,9 +27,11 @@
                str.ko_horizontal_dislocation,
                str.azimuth_angle,
                str.well_coordinates_x,
-               str.well_coordinates_y
+               str.well_coordinates_y,
+            intr.well_state
         from by_dwr.fact_dwr_well_basic_information well
                  left join by_dwr.fact_dwr_well_structure str on well.well_id = str.well_id
+            left join  by_dwr.fact_dwr_well_history_introduction intr on well.well_id=intr.well_id
                  left join (
             select daily.*
             from by_dwr.fact_dwr_pc_pro_well_vol_d daily
@@ -48,17 +53,20 @@
     <select id="getWellInfoList" parameterType="com.bowintek.practice.vo.query.WellInfoParams"
             resultType="java.util.HashMap">
         select
-        well.well_id, well.well_common_name, well_purpose, well.well_type, well.spud_date, well.end_drilling_date, well.budgeted_md, well.completion_formation,
+        well.well_id, well.well_common_name, well_purpose, well.well_type,  well.end_drilling_date, well.budgeted_md, well.completion_formation,
                well.completion_method, well.org_id_a1, well.org_id_a2,  well.org_name_a2,well.project_id, well.project_name,
-        station.name  org_name_a1,
+        TO_CHAR(well.spud_date , 'YYYY-MM-dd') spud_date,TO_CHAR(well.end_drilling_date , 'YYYY-MM-dd') end_drilling_date,
+               station.name  org_name_a1,
         TO_CHAR(fact_daily.oil_prod_begin_date , 'YYYY-MM-dd') oil_prod_begin_date,
         TO_CHAR(fact_daily.oil_prod_recent_date , 'YYYY-MM-dd') oil_prod_recent_date,
         fact_daily.current_state,fact_daily.water_cut,
         fact_mon.oil_prod_mon,fact_mon.gas_prod_mon,fact_mon.gas_prod_year,fact_mon.oil_prod_year
         ,fact_mon.water_prod_mon,fact_mon.water_prod_year,
         well_stt.well_coordinates_x x,
-        well_stt.well_coordinates_y y
+        well_stt.well_coordinates_y y,
+        intr.well_state
         from by_dwr.fact_dwr_well_basic_information well
+        left join  by_dwr.fact_dwr_well_history_introduction intr on well.well_id=intr.well_id
         left join (
         select daily.* from by_dwr.fact_dwr_pc_pro_well_vol_d daily
         inner join(
@@ -198,7 +206,7 @@
     </select>
     <select id="selectAnalyticalAssaysList" resultType="java.util.HashMap">
         select *
-        from by_dm.dws_dm_analytical_assays aa
+        from by_dm.dws_dm_analytical_assays_new aa
         where aa.well_id = #{well_id}
     </select>
     <select id="selectAnalyticalAssaysSummary" resultType="java.util.HashMap">
@@ -211,7 +219,7 @@
                SUM(CASE WHEN item_code = '录井综合解释' THEN 1 ELSE 0 END)      AS 录井综合解释,
                SUM(CASE WHEN item_code = '气测解释' THEN 1 ELSE 0 END)        AS 气测解释,
                SUM(CASE WHEN item_code = '定量荧光解释' THEN 1 ELSE 0 END)      AS 定量荧光解释
-        FROM by_dm.dws_dm_analytical_assays
+        FROM by_dm.dws_dm_analytical_assays_new
         where well_id = #{well_id}
         GROUP BY item_code;
     </select>

target/classes/META-INF/MANIFEST.MF

@@ -1,44 +1,46 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: mybatis-spring-2.0.7.jar reactor-core-3.4.21.jar lettuce-cor
- e-6.1.9.RELEASE.jar spring-data-keyvalue-2.7.2.jar jackson-databind-2.1
- 3.3.jar jackson-datatype-jdk8-2.13.3.jar spring-boot-starter-data-redis
- -2.7.2.jar spring-boot-starter-jdbc-2.7.2.jar lucene-queries-4.7.2.jar 
- snakeyaml-1.30.jar netty-handler-4.1.79.Final.jar jackson-module-parame
- ter-names-2.13.3.jar jackson-core-2.13.3.jar poi-4.0.0.jar spring-webmv
- c-5.3.22.jar commons-collections4-4.2.jar fastjson-1.2.47.jar spring-be
- ans-5.3.22.jar commons-lang3-3.5.jar httpasyncclient-4.1.5.jar netty-re
- solver-4.1.79.Final.jar spring-boot-starter-json-2.7.2.jar lombok-1.18.
- 20.jar spring-boot-autoconfigure-2.7.2.jar reactive-streams-1.0.4.jar a
- spectjrt-1.9.7.jar spring-expression-5.3.22.jar jul-to-slf4j-1.7.36.jar
-  checker-qual-3.5.0.jar netty-codec-4.1.79.Final.jar parsson-1.0.0.jar 
- slf4j-api-1.7.36.jar xmlbeans-3.0.1.jar lucene-queryparser-4.7.2.jar to
- mcat-embed-core-9.0.65.jar opentelemetry-api-1.29.0.jar spring-jdbc-5.3
- .22.jar mysql-connector-java-8.0.29.jar spring-core-5.3.22.jar poi-ooxm
- l-4.0.0.jar pagehelper-spring-boot-starter-1.4.3.jar elasticsearch-java
- -8.11.1.jar mybatis-3.5.9.jar elasticsearch-rest-client-7.17.4.jar jsql
- parser-4.2.jar netty-common-4.1.79.Final.jar jakarta.annotation-api-1.3
- .5.jar spring-tx-5.3.22.jar netty-transport-4.1.79.Final.jar ikanalyzer
- -2012_u6.jar httpcore-4.4.15.jar mybatis-spring-boot-autoconfigure-2.2.
- 2.jar jakarta.json-api-2.0.1.jar log4j-to-slf4j-2.17.2.jar spring-boot-
- 2.7.2.jar druid-spring-boot-starter-1.2.11.jar pagehelper-spring-boot-a
- utoconfigure-1.4.3.jar spring-data-redis-2.7.2.jar commons-beanutils-1.
- 9.4.jar log4j-api-2.17.2.jar lucene-sandbox-4.7.2.jar httpclient-4.5.9.
- jar jsr305-3.0.2.jar HikariCP-4.0.3.jar tomcat-embed-websocket-9.0.65.j
- ar spring-boot-starter-web-2.7.2.jar postgresql-42.3.6.jar commons-coll
- ections-3.2.2.jar logback-classic-1.2.11.jar logback-core-1.2.11.jar po
- i-ooxml-schemas-4.0.0.jar spring-boot-devtools-2.7.2.jar netty-buffer-4
- .1.79.Final.jar pagehelper-5.3.1.jar commons-pool2-2.11.1.jar spring-bo
- ot-starter-2.7.2.jar spring-data-commons-2.7.2.jar commons-codec-1.15.j
- ar spring-aop-5.3.22.jar curvesapi-1.04.jar spring-boot-starter-tomcat-
- 2.7.2.jar opentelemetry-context-1.29.0.jar aspectjweaver-1.9.7.jar spri
- ng-web-5.3.22.jar commons-logging-1.2.jar aspose-words-15.8.0-jdk16.jar
-  postgresql-42.3.4.jar java-jwt-3.9.0.jar jackson-annotations-2.13.3.ja
- r lucene-analyzers-common-4.7.2.jar tomcat-embed-el-9.0.65.jar json-201
- 90722.jar druid-1.2.11.jar jackson-datatype-jsr310-2.13.3.jar mybatis-s
- pring-boot-starter-2.2.2.jar commons-compress-1.18.jar spring-oxm-5.3.2
- 2.jar httpcore-nio-4.4.15.jar spring-context-support-5.3.22.jar spring-
- context-5.3.22.jar netty-transport-native-unix-common-4.1.79.Final.jar 
- commons-net-3.6.jar poi-scratchpad-4.0.0.jar spring-jcl-5.3.22.jar spri
- ng-boot-starter-logging-2.7.2.jar lucene-core-4.7.2.jar
+Class-Path: HikariCP-4.0.3.jar postgresql-42.3.4.jar java-jwt-3.9.0.jar 
+ netty-common-4.1.79.Final.jar netty-codec-4.1.79.Final.jar httpcore-4.4
+ .15.jar lucene-queryparser-4.7.2.jar commons-collections4-4.2.jar logba
+ ck-core-1.2.11.jar httpclient-4.5.9.jar lettuce-core-6.1.9.RELEASE.jar 
+ commons-pool2-2.11.1.jar spring-oxm-5.3.22.jar lucene-sandbox-4.7.2.jar
+  netty-handler-4.1.79.Final.jar spring-core-5.3.22.jar spring-jdbc-5.3.
+ 22.jar log4j-api-2.17.2.jar opentelemetry-context-1.29.0.jar mysql-conn
+ ector-java-8.0.29.jar commons-net-3.6.jar tomcat-embed-el-9.0.65.jar sn
+ akeyaml-1.30.jar spring-boot-starter-tomcat-2.7.2.jar gson-2.9.0.jar my
+ batis-3.5.9.jar spring-boot-2.7.2.jar jsr305-3.0.2.jar poi-4.0.0.jar ne
+ tty-transport-4.1.79.Final.jar jackson-core-2.13.3.jar log4j-to-slf4j-2
+ .17.2.jar httpcore-nio-4.4.15.jar jul-to-slf4j-1.7.36.jar tomcat-embed-
+ core-9.0.65.jar parsson-1.0.0.jar mybatis-spring-boot-starter-2.2.2.jar
+  spring-context-support-5.3.22.jar spring-boot-starter-jdbc-2.7.2.jar s
+ pring-boot-devtools-2.7.2.jar juh-4.1.2.jar jsqlparser-4.2.jar jackson-
+ annotations-2.13.3.jar json-20190722.jar lucene-analyzers-common-4.7.2.
+ jar pagehelper-spring-boot-autoconfigure-1.4.3.jar poi-ooxml-schemas-4.
+ 0.0.jar poi-ooxml-4.0.0.jar tomcat-embed-websocket-9.0.65.jar jakarta.a
+ nnotation-api-1.3.5.jar xmlbeans-3.0.1.jar spring-aop-5.3.22.jar spring
+ -context-5.3.22.jar lucene-core-4.7.2.jar commons-collections-3.2.2.jar
+  jodconverter-local-4.4.6.jar pagehelper-5.3.1.jar commons-beanutils-1.
+ 9.4.jar commons-compress-1.18.jar unoil-4.1.2.jar spring-webmvc-5.3.22.
+ jar spring-boot-starter-json-2.7.2.jar lombok-1.18.20.jar spring-expres
+ sion-5.3.22.jar jakarta.json-api-2.0.1.jar pagehelper-spring-boot-start
+ er-1.4.3.jar spring-boot-starter-2.7.2.jar commons-codec-1.15.jar sprin
+ g-tx-5.3.22.jar elasticsearch-java-8.11.1.jar postgresql-42.3.6.jar spr
+ ing-data-keyvalue-2.7.2.jar spring-data-redis-2.7.2.jar spring-boot-sta
+ rter-logging-2.7.2.jar spring-boot-autoconfigure-2.7.2.jar opentelemetr
+ y-api-1.29.0.jar checker-qual-3.5.0.jar lucene-queries-4.7.2.jar elasti
+ csearch-rest-client-7.17.4.jar curvesapi-1.04.jar druid-spring-boot-sta
+ rter-1.2.11.jar netty-buffer-4.1.79.Final.jar spring-data-commons-2.7.2
+ .jar aspectjweaver-1.9.7.jar spring-web-5.3.22.jar jackson-databind-2.1
+ 3.3.jar druid-1.2.11.jar fastjson-1.2.47.jar netty-transport-native-uni
+ x-common-4.1.79.Final.jar jackson-module-parameter-names-2.13.3.jar asp
+ ectjrt-1.9.7.jar jackson-datatype-jdk8-2.13.3.jar slf4j-api-1.7.36.jar 
+ spring-beans-5.3.22.jar httpasyncclient-4.1.5.jar reactor-core-3.4.21.j
+ ar netty-resolver-4.1.79.Final.jar spring-jcl-5.3.22.jar ridl-4.1.2.jar
+  jackson-datatype-jsr310-2.13.3.jar mybatis-spring-boot-autoconfigure-2
+ .2.2.jar mybatis-spring-2.0.7.jar aspose-words-15.8.0-jdk16.jar logback
+ -classic-1.2.11.jar reactive-streams-1.0.4.jar jurt-4.1.2.jar jodconver
+ ter-core-4.4.6.jar aspose-cells-18.9.jar poi-scratchpad-4.0.0.jar sprin
+ g-boot-starter-data-redis-2.7.2.jar ikanalyzer-2012_u6.jar spring-boot-
+ starter-web-2.7.2.jar commons-lang3-3.5.jar commons-logging-1.2.jar
 

vue/src/views/subject/index.vue

@@ -39,13 +39,13 @@
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
-          <a-button type="primary" html-type="button" @click="add" functioncode="T010601">新增</a-button>
+          <a-button type="primary" html-type="button" @click="add" functioncode="T010801">新增</a-button>
           <BExportExcel :title="'导出'" :filename="'主题信息'" :url="'subject/exportSubject'"
                         :params="{...formState, idList:selectedRowKeys}"></BExportExcel>
           <a-popconfirm placement="leftTop"
             title="是否删除数据?"
             @confirm="onDelete()">
-            <a-button type="primary" style="margin: 0 8px" html-type="button" functioncode="T010604">删除</a-button>
+            <a-button type="primary" style="margin: 0 8px" html-type="button" functioncode="T010804">删除</a-button>
           </a-popconfirm>
         </a-col>
       </a-row>
@@ -60,7 +60,7 @@
           <template v-if="column.key === 'operation'">
             <a-button type="link" size="small" @click="detail(record.subId)">查看
             </a-button>
-            <a-button type="link" size="small" @click="edit(record.subId)" functioncode="T010603">编辑
+            <a-button type="link" size="small" @click="edit(record.subId)" functioncode="T010803">编辑
             </a-button>
           </template>
         </template>

vue/src/views/system/role/edit.vue

@@ -150,7 +150,7 @@ export default defineComponent({
       loadData(id);
       loadUserTypeList();
       loadDataRangeList();
-      loadFunctionCodeList();
+      loadFunctionCodeList(id);
       visible.value = true;
 
     };
@@ -197,8 +197,8 @@ export default defineComponent({
       });
     }
 
-    const loadFunctionCodeList = () => {
-      getFunctionCodeTreeList(dataModel.value.roleID, "1").then(data => {
+    const loadFunctionCodeList = (id) => {
+      getFunctionCodeTreeList(id, "1").then(data => {
         treeList.value =  data;
 
         let rowDataList = treeToList(deepCopy(data));

vue/src/views/wellinfo/table.ts

@@ -196,7 +196,7 @@ export const columns: TableColumnsType = [
     customRender: ({record}) =>
       record.oil_prod_recent_date == null ? "" : (dayjs(record.oil_prod_recent_date).format('YYYY-MM-DD'))
   },
-  {title: '状态', dataIndex: 'current_state_name', key: 'current_state', width: 120, customHeaderCell: onHeaderCell},
+  {title: '状态', dataIndex: 'well_state', key: 'well_state', width: 120, customHeaderCell: onHeaderCell},
   {title: '设计井深(m)', dataIndex: 'budgeted_md', key: 'tempNo', width: 120, customHeaderCell: onHeaderCell},
   {
     title: '含水率',