From 1cecb8330f27da040716d32228fd746aa421ec66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Sat, 17 Jan 2026 18:21:56 +0800 Subject: [PATCH] refactor: update controller to use MiniScoringService Phase 1, Step 1.3.3: Delegate scoring to service layer - Add IMiniScoringService dependency to controller - Replace 43 lines of business logic with service call - Controller now delegates scoring to service - All tests passing Related to Phase 1 refactoring plan --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 630 -> 637 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 630 -> 637 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2360 -> 2360 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 636 -> 636 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 636 -> 636 bytes .../assets/.usage-cache.bin.bkp/xl.meta | Bin 575 -> 575 bytes .../buckets/assets/.usage-cache.bin/xl.meta | Bin 575 -> 575 bytes .../controller/MartialMiniController.java | 45 +----------------- 9 files changed, 2 insertions(+), 43 deletions(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index f27e03cc76a6905cae07ab232c6c36fed1fdfe21..dbb0846c2cea99be7aee54876ea4b3edf24c8145 100644 GIT binary patch delta 445 zcmaFP`kZxw22X9L)KPZkBP{h31gs{S7z=c4;c?Ra?QOqEP9c8J2j;UA%j?-7Y9{`% zQ82VLHb^lyG)_%UF)&QCFfvavNVG7tFi$Z^F)}txNu3I&!G9)WINp=Vg@j1S)N>4RFs-m!muPS zwW8!~vF`HXlEk8t)Rf~qtRNMc*-5*k#qSX=0Gfg(vn1={}jQmrM}cQ!<@hjBsuen@rrKdIZ-=eVv*cf?FrE OMKuP&-6ivLe+&Sp8<0Q% delta 445 zcmaFP`kZxw22aiGxs7GkM_BFz_ZCbvF&3yV&fzdy=E&0hH2-mQ=ro&&<@Ib3H532X zC|FurBqk*%8JL=;B^ev18kwe=Cz+U-n^+o~SsEKB8cmL1)T_UC$S9AoaY!r z;NH32J0Gihq?yb1cbZH+X)Z6MxndQYLiA5!;DaUzOK`Jt{MrbOa$iN%~f;9D;jJ`q0GvaBduz^o!+l5L`EzZDj!nZj(CS OI)tO+_Q@3e)dv7RHIRA$ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta index 35267d2f50e201a79d05dd4a3744d3bfe320e912..607af5e51af98dd7342a2495b37357497b3dc7d2 100644 GIT binary patch delta 365 zcmeyy@|R_T22X9L)YSP)j<7Jj;VqqLVl1#k`P+LLC)f2;;w$EvxLt{wSRSW-YE?jD zQHf)4W>sqO#ET54mVj75dZ}+nW^U?biEfA?6aSd1FG(#)OuwmMX=!Ypl45CLWS*34 zm}Ze|nwXqql9ZBaYGRg_Vq}^!*^p7qd12YP^rX`a=fVqbTQN2+$t%stIr572y7f%Q zz&UO_oDUNmvzni?YSLIk=nf001R{!i;GiB ziaQo1XG~aBTy=@DHP&NMezDx5vSNnCDY-zRxT<(I0}~TB2Ln6E%td7x)8#-628M;n yhZgFCbWU2fs93p*0jQ6Gfs>)q^nwBZrXq$f4ZJnXekJ>o62v_CGPXWhv>O0!GmWSK delta 357 zcmey%@{MJJ22aiGxdDQ!jiRE$XhgSt8 z7L_;#XI7;aPrS%*cnOFFq?h`JWag$`mgt5UGVzb;iRm{Lj17}g3{ox3 zO_D4uEK@Bl4U8?!jSUQqERzk=j7*c07nYq%Pdd$T?wI2PVaCQKd8IiyM;;62%Ux{x zTIjWmztH2vxMNXr z#)L)1RSb*riy0P`6*DYO$psR{RmHPGCM+t;n9i^;`Ordrkito84ZuM65@Tzu2T+F` s6B9QF1G^j-!vYx&1+JsN9D5iPQVw)-ER)#7adSIQ)%iJ+S$d+10L-_I?f?J) diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta index f008cb7352f3b4f5811058cf6c92d356ba0952a0..88c6d4e42ab66886229afb50c3e18e00c6c3a98f 100644 GIT binary patch delta 350 zcmeyy@|R_T22X9LRN4*QBP>Rf|8Y+=F%~F^mRzvF%Iomv*4kdv4S#n|ERRz^wJIR7 zsKhZivnsWC;zfp2OF%3jz0@}(GdK0JL^s5ciGOSqEG>=AQ&KD~jLegg4bv==O%s!o zOp;PkO-;72A|QL%Cr15h6W i11CeJ=>-G+O+^e}8hC4%{Yv&FC5U+9C<95FL$x&YoXUN{z8uvlRJ&i=(oQ4 zS8e>Iy!6bE?mpWp4vnq)e_a?v8RoJwq;O6?$S74Wy~-!CxFob7C9x#+I1eiW5M*Y@ z?UUiv)><8$omt?KnwXQBmwsreb7FEvYV)$h;^Nej;*Leh850&2S1~NgFJ@R&R?M(C zB^O8(R~63&nXsrVV>-jaJnKWdbMkzHgAO68#y=Z1eCr?<<|HIcpQxFYj18c@3j1zmcJpiJ6{>xuv<8 Nxw)C)<{OL&>;TGrJmLTV delta 161 zcmdlXv_oiu22aiGx&060kFdD?ciJ$~#8}`$3kUZv8E@gvt)2U<8h6%CEU#ySsG0c3 zMj^@AB*oG+#oXK=B{>BM64MMUl9H26O%03;l2R=#CPy%;=|#wi1u-@*$t%stIm*7~ z@r`q&&1ro%*fQh L%xv=w#sqc%snR`J diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta index 6b6828d4e1dacd05105e5240517d1b29cbf5cbe5..62da2199b889acedbdd2c1051f6def12d19dc509 100644 GIT binary patch delta 178 zcmeyv@`q)D22X9LWPYaA5f(}A*^?)l7z?yjTwaqH=5)W|@xz|z4Lku8%j?-7Y9{_k z3Nkm*kb^ zPN}CbniHCz2iY`;<<`9E>2#vaem*dExUi&_fFo-Xe6z($|te7B(xwU du_X044=V!@WM(JrlJ=8%F^Q>yr9zL@762~sM=byV delta 178 zcmeyv@`q)D22aiGIgcLY9AR0jJn79u6JvpUids$C#cn$5%p5h3D1J(rSYFQtQ8V#R zQmBEkp{YfxrBRx>S*m%mNvcVbiKU^LnTd&!sj+2Js>#B#bLmN^8O|lI{jbc}xFoMM zC+En^i+@a?6rVkEeu_o(c`mi1zjteF@GR9jb@`ZX{M_Kn9b%I=Ga5-tukuMOE(tA2 eNi0b{&cn(81ew`!`=rZO#7ttUV2S9cwgmvql1kP9 diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta index bb13d93c93ba92b6cc998fc3fc0ddcc8ed2bb17f..f2d0e0c224f6bd757c1a9c5a15ccd720cdd06937 100644 GIT binary patch delta 175 zcmeyv@`q)D22X9Lq`cvyBP^V4i}fa&7z@ZOfBXGpox_A4mFk#hYOSUd%j?-7Y9{`% zQ7|z!HA^-~wM@AO*~ie#>L5NHqP&xwPp7&``*c$8I7cMR{10rmxLCiB$lKe a=V4_4g3RosUDAFsFD5ZnuvF-=+5!NRDnsP} delta 175 zcmeyv@`q)D22aiGIi0r_9AQydm(@4X#8@CZCHP>LruVy!zUVxM=*?Xd%j?-7Y9{`% zQ7|wzG_^>zG)gl!OEph6Ni|6_u{1O@GchqTHMUGjHJKd2sHb~pcclblIjDL^r7roh_0F}vBNB2gvoqds{vqqelpDxbvSlF)*b#FEtG aJgf{rkeQvdOGfc;(Bz+tPAoM+b>{%6RY8sb delta 176 zcmdnbvY%yw22aiGIRz}VC>$=K2&&D<>6G|9l!)Y#N0EzKe+Ey>Ix(QtAEqn_^U9UGCHv=(NHo20KU*jAOHXW diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta index bf04417173f7fe7f89e2340231f609793a410525..1430a16b56fd41fe9981cf87ce251f44354fc792 100644 GIT binary patch delta 191 zcmdnbvY%yw22X9LqSer}G~jMzhH8nFeGG=BtVrF7CIAJlN zcFt#F%K*-@Fg>~ffuwGAY;44=Kkhs%%=DbexB0Dg9?HCV=GIDm%Z-boxD5L*;U|^y sld}OU8yl)jVRLj;M1& diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index 4cc94a4..521a10d 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -72,6 +72,7 @@ public class MartialMiniController extends BladeController { private final BladeRedis bladeRedis; private final IMartialResultService resultService; private final IMiniAuthService miniAuthService; + private final IMiniScoringService miniScoringService; private final IMartialRegistrationOrderService registrationOrderService; private final MartialScheduleStatusMapper scheduleStatusMapper; private final MartialScheduleGroupMapper scheduleGroupMapper; @@ -90,49 +91,7 @@ public class MartialMiniController extends BladeController { return miniAuthService.login(dto); } public R submitScore(@RequestBody org.springblade.modules.martial.pojo.dto.MiniScoreSubmitDTO dto) { - MartialScore score = new MartialScore(); - - // 将String类型的ID转换为Long，避免JavaScript大数精度丢失 - score.setAthleteId(parseLong(dto.getAthleteId())); - score.setJudgeId(parseLong(dto.getJudgeId())); - score.setScore(dto.getScore()); - score.setProjectId(parseLong(dto.getProjectId())); - score.setCompetitionId(parseLong(dto.getCompetitionId())); - score.setVenueId(parseLong(dto.getVenueId())); - score.setScheduleId(parseLong(dto.getScheduleId())); - score.setNote(dto.getNote()); - score.setScoreTime(LocalDateTime.now()); - - if (dto.getDeductions() != null && !dto.getDeductions().isEmpty()) { - // 将String类型的扣分项ID转换为Long - List deductionIds = dto.getDeductions().stream() - .map(this::parseLong) - .filter(id -> id != null) - .collect(Collectors.toList()); - score.setDeductionItems(com.alibaba.fastjson.JSON.toJSONString(deductionIds)); - } - - Long judgeId = parseLong(dto.getJudgeId()); - if (judgeId != null) { - var judge = judgeService.getById(judgeId); - if (judge != null) { - score.setJudgeName(judge.getName()); - } - } - - boolean success = scoreService.save(score); - - // 评分保存成功后，计算并更新选手总分 - if (success) { - Long athleteId = parseLong(dto.getAthleteId()); - Long projectId = parseLong(dto.getProjectId()); - Long venueId = parseLong(dto.getVenueId()); - if (athleteId != null && projectId != null) { - updateAthleteTotalScore(athleteId, projectId, venueId); - } - } - - return success ? R.success("评分提交成功") : R.fail("评分提交失败"); + return miniScoringService.submitScore(dto); } /**