5-26 fix

docs/init.sql

@@ -40,7 +40,7 @@ CREATE TABLE `safety_accountability_task_list` (
     KEY `idx_create_corp_id` (`create_corp_id`),
     KEY `idx_execute_corp_id` (`execute_corp_id`),
     KEY `idx_execute_user_id` (`execute_user_id`),
-    KEY `idx_status` (`status`),
+    KEY `idx_status_task_list_id` (`status`,`task_list_id`) USING BTREE,
     KEY `idx_period_time` (`period_start_time`, `period_end_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务清单表';
 
@@ -75,8 +75,7 @@ CREATE TABLE `safety_accountability_task_detail` (
     PRIMARY KEY (`id`),
     UNIQUE KEY `uk_task_detail_id` (`task_detail_id`),
     KEY `idx_task_list_id` (`task_list_id`),
-    KEY `idx_task_status` (`task_status`),
+    KEY `idx_task_list_status` (`task_list_id`,`task_status`)
-    KEY `idx_feedback_status` (`feedback_status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务清单详细表';
 
 -- =============================================
@@ -112,7 +111,7 @@ CREATE TABLE `safety_accountability_feedback` (
     KEY `idx_task_detail_id` (`task_detail_id`),
     KEY `idx_task_list_id` (`task_list_id`),
     KEY `idx_feedback_time` (`feedback_time`),
-    KEY `idx_feedback_period_flag` (`feedback_period_flag`),
+    KEY idx_taskdetail_period (task_detail_id, feedback_period_flag),
     KEY `idx_feedback_user_id` (`feedback_user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='执行反馈表';
 
@@ -146,8 +145,8 @@ CREATE TABLE `safety_accountability_feedback_exception` (
     UNIQUE KEY `uk_feedback_exception_id` (`feedback_exception_id`),
     KEY `idx_task_detail_id` (`task_detail_id`),
     KEY `idx_task_list_id` (`task_list_id`),
-    KEY `idx_exception_period_flag` (`exception_period_flag`),
+    KEY `idx_taskdetail_ex_period` (`task_detail_id`,`exception_period_flag`),
-    KEY `idx_exception_type` (`exception_type`)
+    KEY `idx_taskdetail_ex_type` (`task_detail_id`,`exception_type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='反馈异常信息表';
 
 -- =============================================

start/src/main/resources/bootstrap.yml

@@ -1,8 +1,8 @@
 spring:
   config:
     import:
-      - classpath:nacos.yml
+#      - classpath:nacos.yml
-      - classpath:sdk.yml
+#      - classpath:sdk.yml
-#      - classpath:nacos-prod.yml
+      - classpath:nacos-prod.yml
-#      - classpath:sdk-prod.yml
+      - classpath:sdk-prod.yml
       - classpath:swagger.yml

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

@@ -2,7 +2,7 @@ nacos:
   url: prod-nacos:8848
   namespace: jjb-dragon
 application:
-  name: jjb-saas-zcloud-safetyDutyList
+  name: jjb-saas-zcloud-safety-duty
   version:
   gateway: safetyDutyList
   cn-name: 安全责任清单

start/src/main/resources/nacos.yml

@@ -2,7 +2,7 @@ nacos:
   url: 192.168.20.100:30290
   namespace: jjb-dragon
 application:
-  name: jjb-saas-zcloud-safetyDutyList
+  name: jjb-saas-zcloud-safety-duty
   version:
   gateway: safetyDutyList
   cn-name: 安全责任清单

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

@@ -1,6 +1,6 @@
 sdk:
   server:
-    app-key: eff71d20c66840919c16e06554f17990
+    app-key: 09a491d02f9b4371968deb601898b467
   client:
     gateway:
       url: ${common.gateway.network.http.external}
@@ -28,27 +28,6 @@ sdk:
             uri: http://jjb-saas-base
             path: /${application.gateway}/container/**
             order: -2
-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:
@@ -57,21 +36,3 @@ archives:
       queueCapacity: 60
       namePrefix: async-task-
       keepAliveSeconds: 60
-message:
-  template:
-    relatedPartyUnitLeaderApplyStartWork: MS000109
-    xqUnitLeaderConfirmStartWork: MS000110
-    relatedPartyUnitLeaderApplyFinishWork: MS000111
-    xqUnitLeaderConfirmFinishWork: MS000112
-    relatedPartyUnitLeaderApplyStartWorkPass: MS000132
-    relatedPartyUnitLeaderApplyFinishWorkPass: MS000133
-    checkInitiatorApplyCheckNotPass: MS000134
-    checkedPersonApplyDefend: MS000135
-    checkerApplyCheck: MS000136
-    checkedPersonApplyCheckConfirm: MS000137
-    checkedPersonApplyDefendPass: MS000138
-    checkedPersonApplyDefendNotPass: MS000139
-    hiddenDangerRectifyPersonApplyRectify: MS000140
-    hiddenDangerAcceptancePersonApplyAcceptance: MS000141
-    checkInitiatorApplyAcceptancePass: MS000142
-    checkInitiatorApplyAcceptanceNotPass: MS000143

web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackDeleteExe.java

@@ -0,0 +1,24 @@
+package com.zcloud.safetyDutyList.command.tasklist;
+
+import com.alibaba.cola.exception.BizException;
+import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 反馈删除执行器
+ * <p>
+ * 根据主键ID删除反馈记录
+ */
+@Component
+@AllArgsConstructor
+public class FeedbackDeleteExe {
+    private final FeedbackGateway feedbackGateway;
+
+    public void execute(Long id) {
+        boolean res = feedbackGateway.deleteById(id);
+        if (!res) {
+            throw new BizException("删除失败");
+        }
+    }
+}