大赛管理功能

This commit is contained in:
tiger_zhou 2024-03-08 10:51:08 +08:00
parent 985c1de837
commit f95ed6a898
2 changed files with 26 additions and 28 deletions

@ -1 +1 @@
Subproject commit 6eb2b603c7661ba1ffcf1d6659708ac5b859e328 Subproject commit 2aedc24640de82379bc4ebb48e428fd57cfc5e77

View File

@ -1881,10 +1881,10 @@ public final class RaceScoringRule {
*分值 *分值
* </pre> * </pre>
* *
* <code>float score = 2;</code> * <code>uint32 score = 2;</code>
* @return The score. * @return The score.
*/ */
float getScore(); int getScore();
/** /**
* <pre> * <pre>
@ -2061,17 +2061,17 @@ public final class RaceScoringRule {
} }
public static final int SCORE_FIELD_NUMBER = 2; public static final int SCORE_FIELD_NUMBER = 2;
private float score_ = 0F; private int score_ = 0;
/** /**
* <pre> * <pre>
*分值 *分值
* </pre> * </pre>
* *
* <code>float score = 2;</code> * <code>uint32 score = 2;</code>
* @return The score. * @return The score.
*/ */
@java.lang.Override @java.lang.Override
public float getScore() { public int getScore() {
return score_; return score_;
} }
@ -2247,8 +2247,8 @@ public final class RaceScoringRule {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
} }
if (java.lang.Float.floatToRawIntBits(score_) != 0) { if (score_ != 0) {
output.writeFloat(2, score_); output.writeUInt32(2, score_);
} }
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(criteria_)) { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(criteria_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, criteria_); com.google.protobuf.GeneratedMessageV3.writeString(output, 4, criteria_);
@ -2271,9 +2271,9 @@ public final class RaceScoringRule {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
} }
if (java.lang.Float.floatToRawIntBits(score_) != 0) { if (score_ != 0) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeFloatSize(2, score_); .computeUInt32Size(2, score_);
} }
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(criteria_)) { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(criteria_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, criteria_); size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, criteria_);
@ -2302,9 +2302,8 @@ public final class RaceScoringRule {
if (!getName() if (!getName()
.equals(other.getName())) return false; .equals(other.getName())) return false;
if (java.lang.Float.floatToIntBits(getScore()) if (getScore()
!= java.lang.Float.floatToIntBits( != other.getScore()) return false;
other.getScore())) return false;
if (!getCriteria() if (!getCriteria()
.equals(other.getCriteria())) return false; .equals(other.getCriteria())) return false;
if (!getChildrenList() if (!getChildrenList()
@ -2325,8 +2324,7 @@ public final class RaceScoringRule {
hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode(); hash = (53 * hash) + getName().hashCode();
hash = (37 * hash) + SCORE_FIELD_NUMBER; hash = (37 * hash) + SCORE_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits( hash = (53 * hash) + getScore();
getScore());
hash = (37 * hash) + CRITERIA_FIELD_NUMBER; hash = (37 * hash) + CRITERIA_FIELD_NUMBER;
hash = (53 * hash) + getCriteria().hashCode(); hash = (53 * hash) + getCriteria().hashCode();
if (getChildrenCount() > 0) { if (getChildrenCount() > 0) {
@ -2471,7 +2469,7 @@ public final class RaceScoringRule {
super.clear(); super.clear();
bitField0_ = 0; bitField0_ = 0;
name_ = ""; name_ = "";
score_ = 0F; score_ = 0;
criteria_ = ""; criteria_ = "";
if (childrenBuilder_ == null) { if (childrenBuilder_ == null) {
children_ = java.util.Collections.emptyList(); children_ = java.util.Collections.emptyList();
@ -2558,7 +2556,7 @@ public final class RaceScoringRule {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
onChanged(); onChanged();
} }
if (other.getScore() != 0F) { if (other.getScore() != 0) {
setScore(other.getScore()); setScore(other.getScore());
} }
if (!other.getCriteria().isEmpty()) { if (!other.getCriteria().isEmpty()) {
@ -2628,11 +2626,11 @@ public final class RaceScoringRule {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} // case 10 } // case 10
case 21: { case 16: {
score_ = input.readFloat(); score_ = input.readUInt32();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
break; break;
} // case 21 } // case 16
case 34: { case 34: {
criteria_ = input.readStringRequireUtf8(); criteria_ = input.readStringRequireUtf8();
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
@ -2765,17 +2763,17 @@ public final class RaceScoringRule {
return this; return this;
} }
private float score_ ; private int score_ ;
/** /**
* <pre> * <pre>
*分值 *分值
* </pre> * </pre>
* *
* <code>float score = 2;</code> * <code>uint32 score = 2;</code>
* @return The score. * @return The score.
*/ */
@java.lang.Override @java.lang.Override
public float getScore() { public int getScore() {
return score_; return score_;
} }
/** /**
@ -2783,11 +2781,11 @@ public final class RaceScoringRule {
*分值 *分值
* </pre> * </pre>
* *
* <code>float score = 2;</code> * <code>uint32 score = 2;</code>
* @param value The score to set. * @param value The score to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setScore(float value) { public Builder setScore(int value) {
score_ = value; score_ = value;
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
@ -2799,12 +2797,12 @@ public final class RaceScoringRule {
*分值 *分值
* </pre> * </pre>
* *
* <code>float score = 2;</code> * <code>uint32 score = 2;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearScore() { public Builder clearScore() {
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
score_ = 0F; score_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -4091,7 +4089,7 @@ public final class RaceScoringRule {
"\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022)\n\013modify_info\030" + "\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022)\n\013modify_info\030" +
"\003 \001(\0132\024.common.ModifyInfoVO\"\214\001\n\004Rule\022\036\n\005" + "\003 \001(\0132\024.common.ModifyInfoVO\"\214\001\n\004Rule\022\036\n\005" +
"units\030\001 \003(\0132\017.race.Rule.Unit\032d\n\004Unit\022\014\n\004" + "units\030\001 \003(\0132\017.race.Rule.Unit\032d\n\004Unit\022\014\n\004" +
"name\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\020\n\010criteria\030\004 " + "name\030\001 \001(\t\022\r\n\005score\030\002 \001(\r\022\020\n\010criteria\030\004 " +
"\001(\t\022!\n\010children\030\005 \003(\0132\017.race.Rule.Unit\022\n" + "\001(\t\022!\n\010children\030\005 \003(\0132\017.race.Rule.Unit\022\n" +
"\n\002id\030\006 \001(\tB\033\n\031club.joylink.rtss.vo.raceb" + "\n\002id\030\006 \001(\tB\033\n\031club.joylink.rtss.vo.raceb" +
"\006proto3" "\006proto3"