From 9139c93a755f3083d8bce9b2d6d943e1d27fbf4f Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 26 Feb 2024 17:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=B5=9B=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../racetr/RaceScoreRuleController.java | 9 - .../rtss/entity/racetr/RacetrScoringRule.java | 5 - .../racetr/RacetrScoringRuleExample.java | 60 ------- .../rtss/services/race/RaceSceneService.java | 1 + .../services/race/RaceScoreRuleService.java | 7 - .../club/joylink/rtss/vo/race/RacePaper.java | 90 +++++++++- .../rtss/vo/race/RaceSceneOuterClass.java | 163 +++++++++++++++++- .../mapper/racetr/RacetrScoringRuleDAO.xml | 31 +--- 8 files changed, 246 insertions(+), 120 deletions(-) diff --git a/src/main/java/club/joylink/rtss/controller/racetr/RaceScoreRuleController.java b/src/main/java/club/joylink/rtss/controller/racetr/RaceScoreRuleController.java index be51ccb8c..8c8fb08a2 100644 --- a/src/main/java/club/joylink/rtss/controller/racetr/RaceScoreRuleController.java +++ b/src/main/java/club/joylink/rtss/controller/racetr/RaceScoreRuleController.java @@ -49,15 +49,6 @@ public class RaceScoreRuleController { } - /** - * 需求变更 把评分规则关联taskid改成task去关联评分规则, - */ - @Deprecated - @PostMapping("/{ruleId}/{taskId}/bind/task") - public void bindTask(@PathVariable("ruleId") Long ruleId, @PathVariable("taskId") Long taskId, @RequestAttribute AccountVO user) { - this.scoreRuleService.bindTask(ruleId, taskId, user); - } - @GetMapping("/page") public PageVO page(TaskRuleQueryVO query) { return this.scoreRuleService.page(query); diff --git a/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRule.java b/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRule.java index 123226a30..c120fb0aa 100644 --- a/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRule.java +++ b/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRule.java @@ -18,11 +18,6 @@ public class RacetrScoringRule implements Serializable { */ private String name; - /** - * 关联的任务的ID - */ - private Long taskId; - /** * 创建者的ID */ diff --git a/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRuleExample.java b/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRuleExample.java index 9aeaa4559..6171fa610 100644 --- a/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRuleExample.java +++ b/src/main/java/club/joylink/rtss/entity/racetr/RacetrScoringRuleExample.java @@ -255,66 +255,6 @@ public class RacetrScoringRuleExample { return (Criteria) this; } - public Criteria andTaskIdIsNull() { - addCriterion("task_id is null"); - return (Criteria) this; - } - - public Criteria andTaskIdIsNotNull() { - addCriterion("task_id is not null"); - return (Criteria) this; - } - - public Criteria andTaskIdEqualTo(Long value) { - addCriterion("task_id =", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdNotEqualTo(Long value) { - addCriterion("task_id <>", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdGreaterThan(Long value) { - addCriterion("task_id >", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { - addCriterion("task_id >=", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdLessThan(Long value) { - addCriterion("task_id <", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdLessThanOrEqualTo(Long value) { - addCriterion("task_id <=", value, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdIn(List values) { - addCriterion("task_id in", values, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdNotIn(List values) { - addCriterion("task_id not in", values, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdBetween(Long value1, Long value2) { - addCriterion("task_id between", value1, value2, "taskId"); - return (Criteria) this; - } - - public Criteria andTaskIdNotBetween(Long value1, Long value2) { - addCriterion("task_id not between", value1, value2, "taskId"); - return (Criteria) this; - } - public Criteria andCreatorIdIsNull() { addCriterion("creator_id is null"); return (Criteria) this; diff --git a/src/main/java/club/joylink/rtss/services/race/RaceSceneService.java b/src/main/java/club/joylink/rtss/services/race/RaceSceneService.java index 42c5d7cd2..e1b761e51 100644 --- a/src/main/java/club/joylink/rtss/services/race/RaceSceneService.java +++ b/src/main/java/club/joylink/rtss/services/race/RaceSceneService.java @@ -136,6 +136,7 @@ public class RaceSceneService { ss.setMemberJson(bs.getMemberJson()); ss.setStepJson(bs.getStepJson()); ss.addAllPlayerIds(plays); + ss.setScoringRuleJson(bs.getScoringRuleJson()); return new PublishHereVO(bs.getMapId(), ss.build()); } diff --git a/src/main/java/club/joylink/rtss/services/race/RaceScoreRuleService.java b/src/main/java/club/joylink/rtss/services/race/RaceScoreRuleService.java index 478fbde67..dced6b465 100644 --- a/src/main/java/club/joylink/rtss/services/race/RaceScoreRuleService.java +++ b/src/main/java/club/joylink/rtss/services/race/RaceScoreRuleService.java @@ -95,13 +95,6 @@ public class RaceScoreRuleService { return voList; } - public void bindTask(Long ruleId, Long taskId, AccountVO user) { - RacetrScoringRule rule = this.findId(ruleId); - rule.setTaskId(taskId); - rule.setUpdaterId(user.getId()); - rule.setUpdateTime(LocalDateTime.now()); - ruleDAO.updateByPrimaryKeySelective(rule); - } public void delete(Long id) { RacetrTaskExample taskExample = new RacetrTaskExample(); diff --git a/src/main/java/club/joylink/rtss/vo/race/RacePaper.java b/src/main/java/club/joylink/rtss/vo/race/RacePaper.java index feb080226..12be0bbd5 100644 --- a/src/main/java/club/joylink/rtss/vo/race/RacePaper.java +++ b/src/main/java/club/joylink/rtss/vo/race/RacePaper.java @@ -3675,6 +3675,12 @@ public final class RacePaper { */ club.joylink.rtss.vo.race.RacePaper.RacePaperModuleVO.GroupOrBuilder getGroupOrBuilder( int index); + + /** + * int64 module_score_rule_id = 4; + * @return The moduleScoreRuleId. + */ + long getModuleScoreRuleId(); } /** * Protobuf type {@code race.RacePaperModuleVO.PaperModule} @@ -3824,6 +3830,17 @@ public final class RacePaper { return group_.get(index); } + public static final int MODULE_SCORE_RULE_ID_FIELD_NUMBER = 4; + private long moduleScoreRuleId_ = 0L; + /** + * int64 module_score_rule_id = 4; + * @return The moduleScoreRuleId. + */ + @java.lang.Override + public long getModuleScoreRuleId() { + return moduleScoreRuleId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -3847,6 +3864,9 @@ public final class RacePaper { for (int i = 0; i < group_.size(); i++) { output.writeMessage(3, group_.get(i)); } + if (moduleScoreRuleId_ != 0L) { + output.writeInt64(4, moduleScoreRuleId_); + } getUnknownFields().writeTo(output); } @@ -3867,6 +3887,10 @@ public final class RacePaper { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, group_.get(i)); } + if (moduleScoreRuleId_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(4, moduleScoreRuleId_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -3888,6 +3912,8 @@ public final class RacePaper { != other.getDuration()) return false; if (!getGroupList() .equals(other.getGroupList())) return false; + if (getModuleScoreRuleId() + != other.getModuleScoreRuleId()) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3907,6 +3933,9 @@ public final class RacePaper { hash = (37 * hash) + GROUP_FIELD_NUMBER; hash = (53 * hash) + getGroupList().hashCode(); } + hash = (37 * hash) + MODULE_SCORE_RULE_ID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getModuleScoreRuleId()); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -4047,6 +4076,7 @@ public final class RacePaper { groupBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); + moduleScoreRuleId_ = 0L; return this; } @@ -4099,6 +4129,9 @@ public final class RacePaper { if (((from_bitField0_ & 0x00000002) != 0)) { result.duration_ = duration_; } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.moduleScoreRuleId_ = moduleScoreRuleId_; + } } @java.lang.Override @@ -4147,6 +4180,9 @@ public final class RacePaper { } } } + if (other.getModuleScoreRuleId() != 0L) { + setModuleScoreRuleId(other.getModuleScoreRuleId()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -4196,6 +4232,11 @@ public final class RacePaper { } break; } // case 26 + case 32: { + moduleScoreRuleId_ = input.readInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -4628,6 +4669,38 @@ public final class RacePaper { } return groupBuilder_; } + + private long moduleScoreRuleId_ ; + /** + * int64 module_score_rule_id = 4; + * @return The moduleScoreRuleId. + */ + @java.lang.Override + public long getModuleScoreRuleId() { + return moduleScoreRuleId_; + } + /** + * int64 module_score_rule_id = 4; + * @param value The moduleScoreRuleId to set. + * @return This builder for chaining. + */ + public Builder setModuleScoreRuleId(long value) { + + moduleScoreRuleId_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * int64 module_score_rule_id = 4; + * @return This builder for chaining. + */ + public Builder clearModuleScoreRuleId() { + bitField0_ = (bitField0_ & ~0x00000008); + moduleScoreRuleId_ = 0L; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -6728,14 +6801,15 @@ public final class RacePaper { "\001(\010\022)\n\013modify_info\030\010 \001(\0132\024.common.Modify" + "InfoVO\"X\n\021RacePaperCreateVO\022\014\n\004name\030\001 \001(" + "\t\022\014\n\004desc\030\002 \001(\t\022\021\n\tseason_id\030\003 \001(\003\022\024\n\014su" + - "pport_copy\030\004 \001(\010\"\204\002\n\021RacePaperModuleVO\0224" + + "pport_copy\030\004 \001(\010\"\243\002\n\021RacePaperModuleVO\0224" + "\n\007modules\030\001 \003(\0132#.race.RacePaperModuleVO" + - ".PaperModule\032b\n\013PaperModule\022\023\n\013module_na" + - "me\030\001 \001(\t\022\020\n\010duration\030\002 \001(\005\022,\n\005group\030\003 \003(" + - "\0132\035.race.RacePaperModuleVO.Group\032U\n\005Grou" + - "p\022\020\n\010task_ids\030\001 \003(\003\022,\n\005group\030\002 \003(\0132\035.rac" + - "e.RacePaperModuleVO.Group\022\014\n\004name\030\003 \001(\tB" + - "\033\n\031club.joylink.rtss.vo.raceb\006proto3" + ".PaperModule\032\200\001\n\013PaperModule\022\023\n\013module_n" + + "ame\030\001 \001(\t\022\020\n\010duration\030\002 \001(\005\022,\n\005group\030\003 \003" + + "(\0132\035.race.RacePaperModuleVO.Group\022\034\n\024mod" + + "ule_score_rule_id\030\004 \001(\003\032U\n\005Group\022\020\n\010task" + + "_ids\030\001 \003(\003\022,\n\005group\030\002 \003(\0132\035.race.RacePap" + + "erModuleVO.Group\022\014\n\004name\030\003 \001(\tB\033\n\031club.j" + + "oylink.rtss.vo.raceb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -6772,7 +6846,7 @@ public final class RacePaper { internal_static_race_RacePaperModuleVO_PaperModule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_race_RacePaperModuleVO_PaperModule_descriptor, - new java.lang.String[] { "ModuleName", "Duration", "Group", }); + new java.lang.String[] { "ModuleName", "Duration", "Group", "ModuleScoreRuleId", }); internal_static_race_RacePaperModuleVO_Group_descriptor = internal_static_race_RacePaperModuleVO_descriptor.getNestedTypes().get(1); internal_static_race_RacePaperModuleVO_Group_fieldAccessorTable = new diff --git a/src/main/java/club/joylink/rtss/vo/race/RaceSceneOuterClass.java b/src/main/java/club/joylink/rtss/vo/race/RaceSceneOuterClass.java index e4c0a78c9..5f4d90c7b 100644 --- a/src/main/java/club/joylink/rtss/vo/race/RaceSceneOuterClass.java +++ b/src/main/java/club/joylink/rtss/vo/race/RaceSceneOuterClass.java @@ -3950,6 +3950,18 @@ public final class RaceSceneOuterClass { */ com.google.protobuf.ByteString getPlayerIdsBytes(int index); + + /** + * string scoring_rule_json = 5; + * @return The scoringRuleJson. + */ + java.lang.String getScoringRuleJson(); + /** + * string scoring_rule_json = 5; + * @return The bytes for scoringRuleJson. + */ + com.google.protobuf.ByteString + getScoringRuleJsonBytes(); } /** * 
@@ -3973,6 +3985,7 @@ public final class RaceSceneOuterClass {
       memberJson_ = "";
       playerIds_ =
           com.google.protobuf.LazyStringArrayList.emptyList();
+      scoringRuleJson_ = "";
     }
 
     @java.lang.Override
@@ -4149,6 +4162,45 @@ public final class RaceSceneOuterClass {
       return playerIds_.getByteString(index);
     }
 
+    public static final int SCORING_RULE_JSON_FIELD_NUMBER = 5;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object scoringRuleJson_ = "";
+    /**
+     * string scoring_rule_json = 5;
+     * @return The scoringRuleJson.
+     */
+    @java.lang.Override
+    public java.lang.String getScoringRuleJson() {
+      java.lang.Object ref = scoringRuleJson_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        scoringRuleJson_ = s;
+        return s;
+      }
+    }
+    /**
+     * string scoring_rule_json = 5;
+     * @return The bytes for scoringRuleJson.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getScoringRuleJsonBytes() {
+      java.lang.Object ref = scoringRuleJson_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        scoringRuleJson_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -4175,6 +4227,9 @@ public final class RaceSceneOuterClass {
       for (int i = 0; i < playerIds_.size(); i++) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, playerIds_.getRaw(i));
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(scoringRuleJson_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, scoringRuleJson_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -4201,6 +4256,9 @@ public final class RaceSceneOuterClass {
         size += dataSize;
         size += 1 * getPlayerIdsList().size();
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(scoringRuleJson_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, scoringRuleJson_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -4224,6 +4282,8 @@ public final class RaceSceneOuterClass {
           .equals(other.getMemberJson())) return false;
       if (!getPlayerIdsList()
           .equals(other.getPlayerIdsList())) return false;
+      if (!getScoringRuleJson()
+          .equals(other.getScoringRuleJson())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
@@ -4245,6 +4305,8 @@ public final class RaceSceneOuterClass {
         hash = (37 * hash) + PLAYER_IDS_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerIdsList().hashCode();
       }
+      hash = (37 * hash) + SCORING_RULE_JSON_FIELD_NUMBER;
+      hash = (53 * hash) + getScoringRuleJson().hashCode();
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -4385,6 +4447,7 @@ public final class RaceSceneOuterClass {
         memberJson_ = "";
         playerIds_ =
             com.google.protobuf.LazyStringArrayList.emptyList();
+        scoringRuleJson_ = "";
         return this;
       }
 
@@ -4431,6 +4494,9 @@ public final class RaceSceneOuterClass {
           playerIds_.makeImmutable();
           result.playerIds_ = playerIds_;
         }
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          result.scoringRuleJson_ = scoringRuleJson_;
+        }
       }
 
       @java.lang.Override
@@ -4470,6 +4536,11 @@ public final class RaceSceneOuterClass {
           }
           onChanged();
         }
+        if (!other.getScoringRuleJson().isEmpty()) {
+          scoringRuleJson_ = other.scoringRuleJson_;
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
@@ -4517,6 +4588,11 @@ public final class RaceSceneOuterClass {
                 playerIds_.add(s);
                 break;
               } // case 34
+              case 42: {
+                scoringRuleJson_ = input.readStringRequireUtf8();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
               default: {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                   done = true; // was an endgroup tag
@@ -4860,6 +4936,78 @@ public final class RaceSceneOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object scoringRuleJson_ = "";
+      /**
+       * string scoring_rule_json = 5;
+       * @return The scoringRuleJson.
+       */
+      public java.lang.String getScoringRuleJson() {
+        java.lang.Object ref = scoringRuleJson_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          scoringRuleJson_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * string scoring_rule_json = 5;
+       * @return The bytes for scoringRuleJson.
+       */
+      public com.google.protobuf.ByteString
+          getScoringRuleJsonBytes() {
+        java.lang.Object ref = scoringRuleJson_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          scoringRuleJson_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * string scoring_rule_json = 5;
+       * @param value The scoringRuleJson to set.
+       * @return This builder for chaining.
+       */
+      public Builder setScoringRuleJson(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        scoringRuleJson_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
+      /**
+       * string scoring_rule_json = 5;
+       * @return This builder for chaining.
+       */
+      public Builder clearScoringRuleJson() {
+        scoringRuleJson_ = getDefaultInstance().getScoringRuleJson();
+        bitField0_ = (bitField0_ & ~0x00000010);
+        onChanged();
+        return this;
+      }
+      /**
+       * string scoring_rule_json = 5;
+       * @param value The bytes for scoringRuleJson to set.
+       * @return This builder for chaining.
+       */
+      public Builder setScoringRuleJsonBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        checkByteStringIsUtf8(value);
+        scoringRuleJson_ = value;
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -5458,12 +5606,13 @@ public final class RaceSceneOuterClass {
       "ifyInfoVO\"3\n\022RaceScenePublishVO\022\017\n\007dafit" +
       "id\030\001 \001(\003\022\014\n\004name\030\003 \001(\t\"I\n\005Scene\022\013\n\003url\030\001" +
       " \001(\t\0223\n\022storage_simulation\030\002 \001(\0132\027.race." +
-      "StorageSimulation\"f\n\021StorageSimulation\022\025" +
-      "\n\rbg_scene_json\030\001 \001(\t\022\021\n\tstep_json\030\002 \001(\t" +
-      "\022\023\n\013member_json\030\003 \001(\t\022\022\n\nplayer_ids\030\004 \003(" +
-      "\t\"5\n\tRaceScene\"(\n\004Type\022\013\n\007Unknown\020\000\022\t\n\005L" +
-      "ocal\020\001\022\010\n\004Link\020\002B\033\n\031club.joylink.rtss.vo" +
-      ".raceb\006proto3"
+      "StorageSimulation\"\201\001\n\021StorageSimulation\022" +
+      "\025\n\rbg_scene_json\030\001 \001(\t\022\021\n\tstep_json\030\002 \001(" +
+      "\t\022\023\n\013member_json\030\003 \001(\t\022\022\n\nplayer_ids\030\004 \003" +
+      "(\t\022\031\n\021scoring_rule_json\030\005 \001(\t\"5\n\tRaceSce" +
+      "ne\"(\n\004Type\022\013\n\007Unknown\020\000\022\t\n\005Local\020\001\022\010\n\004Li" +
+      "nk\020\002B\033\n\031club.joylink.rtss.vo.raceb\006proto" +
+      "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -5499,7 +5648,7 @@ public final class RaceSceneOuterClass {
     internal_static_race_StorageSimulation_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_race_StorageSimulation_descriptor,
-        new java.lang.String[] { "BgSceneJson", "StepJson", "MemberJson", "PlayerIds", });
+        new java.lang.String[] { "BgSceneJson", "StepJson", "MemberJson", "PlayerIds", "ScoringRuleJson", });
     internal_static_race_RaceScene_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_race_RaceScene_fieldAccessorTable = new
diff --git a/src/main/resources/mybatis/mapper/racetr/RacetrScoringRuleDAO.xml b/src/main/resources/mybatis/mapper/racetr/RacetrScoringRuleDAO.xml
index 457cd8243..f7a1abc34 100644
--- a/src/main/resources/mybatis/mapper/racetr/RacetrScoringRuleDAO.xml
+++ b/src/main/resources/mybatis/mapper/racetr/RacetrScoringRuleDAO.xml
@@ -4,7 +4,6 @@
   
     
     
-    
     
     
     
@@ -72,7 +71,7 @@
     
   
   
-    id, `name`, task_id, creator_id, create_time, updater_id, update_time
+    id, `name`, creator_id, create_time, updater_id, update_time
   
   
     `rule`
@@ -142,12 +141,12 @@
     
   
   
-    insert into racetr_scoring_rule (`name`, task_id, creator_id, 
-      create_time, updater_id, update_time, 
-      `rule`)
-    values (#{name,jdbcType=VARCHAR}, #{taskId,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{rule,jdbcType=LONGVARBINARY})
+    insert into racetr_scoring_rule (`name`, creator_id, create_time, 
+      updater_id, update_time, `rule`
+      )
+    values (#{name,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updaterId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{rule,jdbcType=LONGVARBINARY}
+      )
   
   
     insert into racetr_scoring_rule
@@ -155,9 +154,6 @@
       
         `name`,
       
-      
-        task_id,
-      
       
         creator_id,
       
@@ -178,9 +174,6 @@
       
         #{name,jdbcType=VARCHAR},
       
-      
-        #{taskId,jdbcType=BIGINT},
-      
       
         #{creatorId,jdbcType=BIGINT},
       
@@ -213,9 +206,6 @@
       
         `name` = #{record.name,jdbcType=VARCHAR},
       
-      
-        task_id = #{record.taskId,jdbcType=BIGINT},
-      
       
         creator_id = #{record.creatorId,jdbcType=BIGINT},
       
@@ -240,7 +230,6 @@
     update racetr_scoring_rule
     set id = #{record.id,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=VARCHAR},
-      task_id = #{record.taskId,jdbcType=BIGINT},
       creator_id = #{record.creatorId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       updater_id = #{record.updaterId,jdbcType=BIGINT},
@@ -254,7 +243,6 @@
     update racetr_scoring_rule
     set id = #{record.id,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=VARCHAR},
-      task_id = #{record.taskId,jdbcType=BIGINT},
       creator_id = #{record.creatorId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       updater_id = #{record.updaterId,jdbcType=BIGINT},
@@ -269,9 +257,6 @@
       
         `name` = #{name,jdbcType=VARCHAR},
       
-      
-        task_id = #{taskId,jdbcType=BIGINT},
-      
       
         creator_id = #{creatorId,jdbcType=BIGINT},
       
@@ -293,7 +278,6 @@
   
     update racetr_scoring_rule
     set `name` = #{name,jdbcType=VARCHAR},
-      task_id = #{taskId,jdbcType=BIGINT},
       creator_id = #{creatorId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       updater_id = #{updaterId,jdbcType=BIGINT},
@@ -304,7 +288,6 @@
   
     update racetr_scoring_rule
     set `name` = #{name,jdbcType=VARCHAR},
-      task_id = #{taskId,jdbcType=BIGINT},
       creator_id = #{creatorId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       updater_id = #{updaterId,jdbcType=BIGINT},