增加悦跑圈数据同步开关

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptScoreFieldController.java

@@ -72,6 +72,28 @@ public class CmptScoreFieldController {
         return Result.success();
     }
 
+    @RequestMapping("saveOrUpdateJoy")
+    @ResponseBody
+    private Result saveOrUpdateJoy(@RequestParam("cmptId") int cmptId,
+                                   @RequestParam("isOpen") int open){
+        if(open == 1){
+            CmptScoreField field = cmptScoreFieldService.getCmptScoreFieldByCmptIdAndType(cmptId, 5);
+            if(field == null){
+                field = new CmptScoreField();
+            }
+            field.setCmptId(cmptId);
+            field.setFieldType(5);
+            field.setIsDelete(0);
+            field.setFieldName("悦跑圈成绩同步");
+            field.setFiledIndex(0);
+            cmptScoreFieldService.saveOrUpdate(field);
+            return Result.success().setContent(field.getId());
+        }else{
+            cmptScoreFieldService.deleteOcrFiled(cmptId,5);
+        }
+        return Result.success();
+    }
+
 
     @RequestMapping("del/{id}")
     @ResponseBody

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -409,6 +409,10 @@ public class MicroApiController {
     }
 
 
+    /**
+     * 小程序赛事列表接口
+     * @return 赛事列表
+     */
     @PostMapping(value = "/cmpt")
     @ApiResponses({
             @ApiResponse(code = 200, message = "成功"),

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RankSettingController.java

@@ -37,11 +37,12 @@ public class RankSettingController {
         List<CmptScoreRule> cmptScoreRules = cmptScoreRuleService.getCmptScoreRulesByCmptId(cmptId);
 
         mv.addObject("cmpt", cmpt);
+        int rankCount = -1;
         if(cmptScoreRules.size() > 0){
             mv.addObject("currentRuleType", cmptScoreRules.get(0).getOrderRule());
-            int rankCount = cmptScoreRules.get(0).getDisplayCount() == null ? -1 : cmptScoreRules.get(0).getDisplayCount();
-            mv.addObject("displayCount", rankCount);
+            rankCount = cmptScoreRules.get(0).getDisplayCount() == null ? -1 : cmptScoreRules.get(0).getDisplayCount();
         }
+        mv.addObject("displayCount", rankCount);
         mv.setViewName("cmpt/rankSetting");
         return mv;
     }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java

@@ -80,9 +80,14 @@ public class ScoreController {
             mv.addObject("isClose",false);
         }
         FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(cmptId);
+        // OCR识别开关
         Optional<CmptScoreField> first = cmptScoreFieldService.getCmptScoreFieldByCmptId(cmptId)
                 .stream().filter(cmptScoreField -> cmptScoreField.getFieldType() == 3).findFirst();
+        // 悦跑圈同步开关
+        Optional<CmptScoreField> joyrun = cmptScoreFieldService.getCmptScoreFieldByCmptId(cmptId)
+                .stream().filter(cmptScoreField -> cmptScoreField.getFieldType() == 5).findFirst();
         mv.addObject("hasOcr",first.isPresent());
+        mv.addObject("hasJoyrun",joyrun.isPresent());
         mv.addObject("rules",rules);
         mv.addObject("fields",fields);
         mv.addObject("setting",settingByCmptId);

src/main/webapp/WEB-INF/views/cmpt/score.jsp

@@ -109,6 +109,16 @@
                                 </div>
                             </td>
                         </tr>
+                        <tr id="joyrun"   data-type="5" data-index="1">
+                            <td class="name">悦跑圈成绩同步</td>
+                            <td style="text-align: center;position: relative;font-size: 16px;"><span>照片</span></td>
+                            <td class="ocr-opt">
+                                <div class="radio ${hasJoyrun?'checked':'unchecked'} joyrunSyn" data-type="5" data-visibility="1">
+                                    <span class="txt">${hasJoyrun?'启动':'未启动'}</span>
+                                    <span class="dot"></span>
+                                </div>
+                            </td>
+                        </tr>
                     </c:if>
 
 

src/main/webapp/static/js/score.js

@@ -49,8 +49,6 @@ $(document).ready(function () {
 
 
     $('body').on('click', '.status', function () {
-        var attr = $(this).attr('data-attr');
-        console.log(attr);
         var checked = $(this).hasClass('checked');
         var param = {}
         param.cmptId = getCmptId()
@@ -70,18 +68,43 @@ $(document).ready(function () {
             type: 'post',
             data: param,
             success: function (data) {
-                /*if(param.isOpen==0){
-                    $('.rule-field tr[data-type=3]').remove();
-                }else{
-                    var ocr = $('#ocr').clone().clone();
-                    $(ocr).attr('data-id',data.content);
-                    $(ocr).insertBefore($('table tbody tr:eq(0)'));
-                }*/
+                if (data.status) {
+                    layer.msg("操作成功！")
+                } else {
+                    layer.msg("操作失败！")
+                }
             }
         });
+    });
 
-
-    })
+    $('body').on('click', '.joyrunSyn', function () {
+        var checked = $(this).hasClass('checked');
+        var param = {}
+        param.cmptId = getCmptId()
+        if (checked) {
+            $(this).removeClass("checked");
+            $(this).addClass("unchecked");
+            $(this).find('.txt').text('未启动')
+            param.isOpen = 0;
+        } else {
+            $(this).removeClass("unchecked");
+            $(this).addClass("checked");
+            $(this).find('.txt').text('启动');
+            param.isOpen = 1;
+        }
+        $.ajax({
+            url: "/api/cmptScoreField/saveOrUpdateJoy",
+            type: 'post',
+            data: param,
+            success: function (data) {
+                if (data.status) {
+                    layer.msg("操作成功！")
+                } else {
+                    layer.msg("操作失败！")
+                }
+            }
+        });
+    });
 
 
     $('.sure').click(function () {