feat(config): 更新配置文件和数据查询逻辑以支持口门级别筛选

start/src/main/resources/application.yml

@@ -1 +0,0 @@
-# Application-level overrides are defined in dahua.yml.

start/src/main/resources/bootstrap.yml

@@ -2,8 +2,9 @@ spring:
   config:
     import:
 #      - classpath:nacos.yml
-      - classpath:prodnacos.yml
+#      - classpath:sdk.yml
-      - classpath:sdk.yml
       - classpath:dahua.yml
       - classpath:swagger.yml
+      - classpath:prodnacos.yml
+      - classpath:prod-sdk.yml
 #      - classpath:ds.yml

start/src/main/resources/prod-sdk.yml

@@ -0,0 +1,84 @@
+sdk:
+  server:
+    app-key: c7fbb137c1a0484c8b0cca8ac9937c55
+    #港务局线上appKey  c7fbb137c1a0484c8b0cca8ac9937c55
+  client:
+    gateway:
+      url: ${common.gateway.network.http.external}
+      route:
+        - client:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+          service:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://${application.name}
+            path: /${application.gateway}/**
+        - client:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+          service:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://jjb-saas-base
+            path: /${application.gateway}/container/**
+            order: -2
+        - client:
+            system-code: ${application.name}-h5
+            name: ${application.cn-name}-h5-前端
+            group-code: public_api
+          service:
+            system-code: ${application.name}-h5
+            name: ${application.cn-name}-h5-前端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://${application.name}
+            path: /${application.gateway}-h5/**
+            order: -3
+openapi:
+  appId: 1871106785124999168
+  appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3
+  appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30
+  appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  encryptType: SM2
+  platform:
+    - name: default
+      openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f
+      url: ${common.gateway.network.http.intranet}
+      protocol: HTTP
+      defaultPlatform: true
+      ##ciphertext plaintext
+      type: plaintext
+  apiPlatform:
+    - name: default
+      #多个可以逗号隔开
+      apiCode: test:01
+      #多个可以逗号隔开，可以为空
+      tenantIds: 1838408702262321152
+archives:
+  async:
+    pool:
+      maxPoolSize: 2
+      corePoolSize: 1
+      queueCapacity: 60
+      namePrefix: async-task-
+      keepAliveSeconds: 60
+message:
+  template:
+    firstLevelApplyReceiveAudit: MS000152
+    closedAreaApplyReceiveAudit: MS000153
+    firstLevelApplyReceiveCarAudit: MS000154
+    firstLevelApplyReceiveCarAuditReject: MS000155
+    firstLevelPersonReceiveAudit: MS000156
+    firstLevelPersonReceiveAuditReject: MS000157
+    closedAreaApplyReceiveCarAudit: MS000158
+    closedAreaApplyReceiveCarAuditReject: MS000159
+    closedAreaPersonReceiveAudit: MS000160
+    closedAreaPersonReceiveAuditReject: MS000161

web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateScreenPageQry.java

@@ -11,4 +11,7 @@ public class MkmjGateScreenPageQry extends PageQuery {
 
     @ApiModelProperty(value = "企业id")
     private Long corpinfoId;
+
+    @ApiModelProperty(value = "口门级别，1-一级口门，2-二级口门", required = true)
+    private Integer mkmjLevel;
 }

web-client/src/main/java/com/zcloud/primeport/dto/MkmjScreenPageQry.java

@@ -8,4 +8,7 @@ import lombok.Data;
 public class MkmjScreenPageQry extends PageQuery {
     @ApiModelProperty(value = "企业id", name = "corpId")
     private Long corpId;
+
+    @ApiModelProperty(value = "口门级别，1-一级口门，2-二级口门", required = true)
+    private Integer mkmjLevel;
 }

web-client/src/main/java/com/zcloud/primeport/dto/VideoScreenPageQry.java

@@ -8,4 +8,7 @@ import lombok.Data;
 public class VideoScreenPageQry extends PageQuery {
     @ApiModelProperty(value = "企业id")
     private Long corpinfoId;
+
+    @ApiModelProperty(value = "口门级别，1-一级口门，2-二级口门", required = true)
+    private Integer mkmjLevel;
 }

web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml

@@ -51,11 +51,11 @@
         order by c.id desc
     </select>
     <select id="screenList" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaCarApplyDO">
-        select c.*, c.create_name apply_user_name
+        select c.*, c.apply_person_user_name apply_user_name
         from closed_area_car_apply c
                  left join closed_area ca on c.closed_area_id = ca.id and ca.delete_enum = 'FALSE'
         where c.delete_enum = 'FALSE'
-          and c.audit_flag = 2
+          and c.audit_flag = 2 and c.level_two_mkmj_id is not null
         <if test="params.corpinfoId != null">
             and ca.jurisdictional_corp_id = #{params.corpinfoId}
         </if>

web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml

@@ -112,11 +112,11 @@
     </select>
 
     <select id="screenList" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO">
-        select c.*, c.create_name apply_user_name
+        select c.*, c.apply_person_user_name apply_user_name
         from closed_area_person_apply c
                  left join closed_area ca on c.closed_area_id = ca.id and ca.delete_enum = 'FALSE'
         where c.delete_enum = 'FALSE'
-          and c.audit_flag = 2
+          and c.audit_flag = 2 and c.level_two_mkmj_id is not null
         <if test="params.corpinfoId != null">
             and ca.jurisdictional_corp_id = #{params.corpinfoId}
         </if>

web-infrastructure/src/main/resources/mapper/MkmjDO.xml

@@ -62,11 +62,12 @@
             m.hg_auth_area AS areaType,
             m.hg_auth_area_name AS areaName,
             COUNT(DISTINCT m.id) AS mkmjCount,
-            COUNT(DISTINCT CASE WHEN p.passage_type IN ('HGKM_MKMJ_CKM') THEN p.id END) AS carPassageCount,
+            COUNT(DISTINCT CASE WHEN g.gate_type = 'HGKM_MKMJ_GATE_TYPE_CAR' THEN g.id END) AS carPassageCount,
-            COUNT(DISTINCT CASE WHEN p.passage_type IN ('HGKM_MKMJ_CKM_R') THEN p.id END) AS personPassageCount
+            COUNT(DISTINCT CASE WHEN g.gate_type = 'HGKM_MKMJ_GATE_TYPE_PERSON' THEN g.id END) AS personPassageCount
         FROM mkmj m
-                 LEFT JOIN mkmj_passage p ON m.id = p.mkmj_id AND p.delete_enum = 'false'
+                 LEFT JOIN mkmj_gate g ON m.id = g.mkmj_id AND g.delete_enum = 'false'
         WHERE m.delete_enum = 'false'
+          AND m.mkmj_level = 1
           AND m.hg_auth_area IN ('QHD_GQ_DGQ', 'QHD_GQ_XGQ')
         GROUP BY m.hg_auth_area, m.hg_auth_area_name
         ORDER BY CASE m.hg_auth_area

web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml

@@ -55,6 +55,9 @@
         <if test="params.corpinfoId != null">
             AND m.mkmj_area_jurisdictional_corp_id = #{params.corpinfoId}
         </if>
+        <if test="params.mkmjLevel != null">
+            AND m.mkmj_level = #{params.mkmjLevel}
+        </if>
         GROUP BY
         g.id
         ORDER BY g.id DESC

web-infrastructure/src/main/resources/mapper/VideoDO.xml

@@ -36,8 +36,8 @@
             COALESCE(m.mkmj_area_jurisdictional_corp_id, gm.mkmj_area_jurisdictional_corp_id) AS corpinfoId
         FROM video v
         LEFT JOIN vi_video vv ON v.video_resource_id = vv.id
-        LEFT JOIN mkmj m ON v.foreign_id = m.id AND m.delete_enum = 'false'
+        LEFT JOIN mkmj m ON v.foreign_id = m.id AND v.device_type = 1 AND m.delete_enum = 'false'
-        LEFT JOIN mkmj_gate g ON v.foreign_id = g.id AND g.delete_enum = 'false'
+        LEFT JOIN mkmj_gate g ON v.foreign_id = g.id AND v.device_type = 2 AND g.delete_enum = 'false'
         LEFT JOIN mkmj gm ON g.mkmj_id = gm.id AND gm.delete_enum = 'false'
         WHERE v.delete_enum = 'FALSE'
         <if test="params.corpinfoId != null">
@@ -46,6 +46,12 @@
                 OR gm.mkmj_area_jurisdictional_corp_id = #{params.corpinfoId}
             )
         </if>
+        <if test="params.mkmjLevel != null">
+            AND (
+                m.mkmj_level = #{params.mkmjLevel}
+                OR gm.mkmj_level = #{params.mkmjLevel}
+            )
+        </if>
         ORDER BY v.create_time DESC
     </select>