排行榜

src/main/java/com/dlbridge/feign/bean/CmptScoreRule.java

@@ -51,5 +51,6 @@ public class CmptScoreRule{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime insertTime;
 
+    private Integer orderRule;
 
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/CmptScoreRule.java

 package com.dlbridge.jadp.plugins.cmpt.bean;
 
 import com.dlbridge.jadp.plugins.cmpt.utils.date.DateDeserializers;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -27,4 +26,8 @@ public class CmptScoreRule {
     @JsonDeserialize(using = DateDeserializers.ISO8601Long.class)
     private Date endTime;
 
+    private Integer scoreRule;
+
+    private Integer orderRule;
+
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.java

@@ -76,9 +76,9 @@ public interface CmptMapper {
 
     int isUploadProfile(Integer cmptId);
 
-    Map<String, String> getPhotoLocation(@Param("cmptId")Integer cmptId,@Param("roadId") Integer roadId);
+    Map<String, String> getPhotoLocation(@Param("cmptId") Integer cmptId,@Param("roadId") Integer roadId);
 
-    Map<String, String> getAllStatistic();
+    Map<String, String> getAllStatistic(@Param("userId") int userId);
 
     Map<String, String> getEnrollUsersByUserMapId(int userMapId);
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.xml

@@ -159,28 +159,32 @@
     </sql>
 
     <update id="updateCmpt">
-        update gk_cmpt
+        update gk_cmpt a
+              left join common.neucmpt b on a.cmpt_id=b.gtcmptid
+              left join raceenroll.competition c on b.gcmptid=c.cmptid
         <set>
             <if test="logo != null">
-                logo = #{logo},
+                a.logo = #{logo},
             </if>
             <if test="cmptbgColor != null">
-                bg_color = #{cmptbgColor},
+                a.bg_color = #{cmptbgColor},
             </if>
             <if test="cmptName != null">
-                cmpt_name = #{cmptName},
+                a.cmpt_name = #{cmptName},
             </if>
             <if test="startTime != null">
-                start_time = #{startTime},
+                a.start_time = #{startTime},
+                c.startTime = #{startTime},
             </if>
             <if test="cmptType != null">
-                cmpt_type = #{cmptType},
+                a.cmpt_type = #{cmptType},
             </if>
             <if test="endTime != null">
-                end_time = #{endTime}
+                a.end_time = #{endTime},
+                c.endTime = #{endTime}
             </if>
         </set>
-        where cmpt_id = #{cmptId}
+        where a.cmpt_id = #{cmptId}
     </update>
 
     <select id="getCommonUserId" resultType="java.lang.Integer">
@@ -263,21 +267,41 @@
     </select>
 
     <select id="getAllStatistic" resultType="java.util.HashMap">
-      <![CDATA[ select
+   select
           (SELECT count(1) from gk_cmpt a
         left join common.neucmpt b on a.cmpt_id=b.gtcmptid
-        left join raceenroll.competition c on b.gcmptid=c.cmptId where cmpt_status=2 and del_flag=0 and c.createUserId <> 427744) `all`,
+        left join raceenroll.competition c on b.gcmptid=c.cmptId where cmpt_status=2 and del_flag=0
+          <if test="0 > userId">
+            and c.createUserId <![CDATA[ <> ]]> 427744
+          </if>
+          <if test="userId > 0">
+                and c.createUserId = #{userId}
+          </if>
+        ) `all`,
           (SELECT count(1) from gk_cmpt a
         left join common.neucmpt b on a.cmpt_id=b.gtcmptid
         left join raceenroll.competition c on b.gcmptid=c.cmptId
-        where a.cmpt_status=2 and a.del_flag=0 and c.opentime < now() and c.deadline > now() and c.createUserId <> 427744) enroll,
+        where a.cmpt_status=2 and a.del_flag=0 and now() > c.opentime and c.deadline > now()
+        <if test="userId lt 0">
+            and c.createUserId <![CDATA[ <> ]]> 427744
+        </if>
+        <if test="userId > 0">
+            and c.createUserId = #{userId}
+        </if>
+        ) enroll,
         (
         SELECT count(1) from gk_cmpt a
         left join common.neucmpt b on a.cmpt_id=b.gtcmptid
         left join raceenroll.competition c on b.gcmptid=c.cmptId
-        where a.cmpt_status=2 and a.del_flag=0 and c.startTime < now() and c.endTime > now() and c.createUserId <> 427744) race
+        where a.cmpt_status=2 and a.del_flag=0 and now() > c.startTime and c.endTime > now()
+        <if test="userId lt 0">
+            and c.createUserId <![CDATA[ <> ]]> 427744
+        </if>
+        <if test="userId > 0">
+            and c.createUserId = #{userId}
+        </if>) race
         from dual
-        ]]>
+
     </select>
 
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.java

@@ -62,4 +62,6 @@ public interface CmptScoreRuleMapper {
     int countByStartAndEnd(@Param("cmptId") int cmptId,@Param("start") String start,@Param("end") String end);
 
     int deleteBatch(@Param("cmptId") int cmptId,@Param("start") String start,@Param("end")  String end);
+
+    void updateOrderRule(@Param("cmptId")Integer cmptId,@Param("orderRule") Integer orderRule);
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="getCmptScoreRuleByCmptId" resultType="CmptScoreRule">
-        select id,`index`,cmpt_id as cmptId,start_time as startTime,end_time as endTime
+        select id,`index`,cmpt_id as cmptId,start_time as startTime,end_time as endTime,order_rule orderRule
         from gk_cmpt_score_rule where cmpt_id=#{cmptId} order by `index`
     </select>
 
@@ -147,4 +147,10 @@
         set  a.isDelete=1, a.updateTime=now(),b.isDelete=1,b.updateTime=now()
         where a.cmptId=#{cmptId} and a.insertTime >= #{start}  and #{end} >= a.insertTime
     </update>
+
+    <update id="updateOrderRule">
+        update  gk_cmpt_score_rule
+        set order_rule = #{orderRule}
+        where cmpt_id=#{cmptId}
+    </update>
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/PartnerMapper.java

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+
+import com.dlbridge.jadp.plugins.cmpt.bean.Partner;
+
+public interface PartnerMapper {
+
+
+    Partner getPartnerById(String partnerId);
+
+
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/PartnerMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.PartnerMapper">
+
+    <select id="getPartnerById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Partner">
+      select app_id appId,app_secret appSecret,user_id userId,partner_id partnerId
+      from gk_app_info
+      where partner_id = #{partnerId}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleService.java

@@ -98,4 +98,8 @@ public class CmptScoreRuleService {
     public int deleteBatch(int cmptId, String start, String end) {
         return cmptScoreRuleMapper.deleteBatch(cmptId,start,end);
     }
+
+    public void updateOrderRule(Integer cmptId, Integer orderRule) {
+        cmptScoreRuleMapper.updateOrderRule(cmptId,orderRule);
+    }
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptService.java

@@ -204,8 +204,8 @@ public class CmptService {
         return cmptMapper.getPhotoLocation(cmptId,roadId);
     }
 
-    public Map<String, String> getAllStatistic() {
-        return cmptMapper.getAllStatistic();
+    public Map<String, String> getAllStatistic(int userId) {
+        return cmptMapper.getAllStatistic(userId);
     }
 
     public Map<String, String> getEnrollUsersByUserMapId(int userMapId) {

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/PartnerService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.Partner;
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.PartnerMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class PartnerService {
+
+    @Resource
+    PartnerMapper partnerMapper;
+
+
+    public Partner getPartnerById(String partnerId) {
+        return partnerMapper.getPartnerById(partnerId);
+    }
+}

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

+package com.dlbridge.jadp.plugins.cmpt.web;
+
+
+import com.dlbridge.jadp.plugins.cmpt.bean.Func;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptSettingService;
+import com.neusoft.www.utils.web.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("gk/func")
+public class FuncController {
+
+    @Autowired
+    CmptSettingService cmptSettingService;
+
+    @RequestMapping("updateName")
+    public Result updateName(Func func){
+        cmptSettingService.saveOrUpdate(func);
+        return Result.success().setContent("更新成功！");
+    }
+}

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

@@ -84,6 +84,10 @@ public class MicroApiController {
     @Resource
     private ValueOperations valueOperations;
 
+    @Resource
+    PartnerService partnerService;
+
+
     @Value("${geexek.cmpt.url}")
     private String timerURL;
 
@@ -148,10 +152,10 @@ public class MicroApiController {
             }
         }
         RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, phone);
-        if(user == null){
-            return Result.fail().setMsg("未找到报名信息！").setContent(info);
+        if(user != null){
+            info.setUserMapId(user.getUserMapId());
         }
-        info.setUserMapId(user.getUserMapId());
+
         return Result.success().setMsg("绑定成功！").setContent(info);
     }
 
@@ -211,10 +215,9 @@ public class MicroApiController {
                 }
             }
             RoadUser user = remoteService.getEnrollUsersByPhone(cmptId, purePhoneNumber);
-            if(user == null){
-                return Result.fail().setMsg("未找到报名信息！").setContent(info);
+            if(user != null){
+                info.setUserMapId(user.getUserMapId());
             }
-            info.setUserMapId(user.getUserMapId());
             return Result.success().setMsg("绑定成功！").setContent(info);
 
         } catch (Exception e) {
@@ -1205,8 +1208,13 @@ public class MicroApiController {
      */
     @GetMapping(value = "/cmpt/statistic")
     @ResponseBody
-    public Result statistic() {
-        Map<String,String> param = cmptService.getAllStatistic();
+    public Result statistic(@RequestParam(value = "partnerId",required = false) String partnerId) {
+        Partner partner = partnerService.getPartnerById(partnerId);
+        if(partner == null){
+            partner = new Partner();
+            partner.setUserId(-1);
+        }
+        Map<String,String> param = cmptService.getAllStatistic(partner.getUserId());
         return Result.success().setContent(param);
     }
 

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

+package com.dlbridge.jadp.plugins.cmpt.web;
+
+import com.dlbridge.jadp.common.interceptor.PageView;
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
+import com.neusoft.www.utils.web.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@Log4j2
+@RequestMapping("gk/rankSetting/")
+@ApiIgnore
+public class RankSettingController {
+
+    @Resource
+    private CmptService cmptService;
+
+    @Resource
+    CmptScoreRuleService cmptScoreRuleService;
+
+    @RequestMapping("index/{cmptId}")
+    @PageView
+    public ModelAndView getAlbumCounts(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
+        Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
+
+        List<CmptScoreRule> cmptScoreRules = cmptScoreRuleService.getCmptScoreRulesByCmptId(cmptId);
+
+        mv.addObject("cmpt", cmpt);
+        if(cmptScoreRules.size() > 0){
+            mv.addObject("currentRuleType", cmptScoreRules.get(0).getOrderRule());
+        }
+        mv.setViewName("cmpt/rankSetting");
+        return mv;
+    }
+
+
+    @RequestMapping("updateOrderRule/{cmptId}/{orderRule}")
+    @ResponseBody
+    public Result updateOrderRule(@PathVariable("cmptId") Integer cmptId,
+                                  @PathVariable("orderRule") Integer orderRule) {
+        cmptScoreRuleService.updateOrderRule(cmptId,orderRule);
+        return Result.success().setMsg("操作成功");
+    }
+
+}

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

@@ -77,6 +77,8 @@ public class ScoreSettingController {
     public Result testFallBack( Integer cmptId, ModelAndView mv){
         return Result.fail().setMsg("tesetttttttt");
     }
+
+
     @RequestMapping("saveRule/{cmptId}/{type}")
     @ResponseBody
     public Result saveRule(@PathVariable("cmptId") Integer cmptId,
@@ -102,6 +104,7 @@ public class ScoreSettingController {
             rule.setUpdateTime(LocalDateTime.now());
             rule.setScoreRule(type);
             rule.setScoreUploadTimes(999);
+            rule.setOrderRule(rules.get(0).getOrderRule());
             lists.add(rule);
         }
 

src/main/resources/application-dev.properties

@@ -98,7 +98,7 @@ spring.cloud.sentinel.skip-keys=cmptId
 spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
 
 ## nacos 地址
-spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.1.2:8848
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.1.3:8848
 spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
 spring.cloud.sentinel.datasource.ds.nacos.data-type=json
 spring.cloud.sentinel.datasource.ds.nacos.groupId=dev

src/main/resources/bootstrap.yml

@@ -4,11 +4,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: http://192.168.1.2:8848
+        server-addr: http://192.168.1.3:8848
         file-extension: properties
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
-      server-addr: http://192.168.1.2:8848
+      server-addr: http://192.168.1.3:8848
       discovery:
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
@@ -18,11 +18,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: http://192.168.1.2:8848
+        server-addr: http://192.168.1.3:8848
         file-extension: properties
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
-      server-addr: http://192.168.1.2:8848
+      server-addr: http://192.168.1.3:8848
       discovery:
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1

src/main/webapp/WEB-INF/views/cmpt/sure-letter.jsp

@@ -112,26 +112,26 @@
     <jsp:include page="../common/menu.jsp"></jsp:include>
     <div class="rght" id="letter">
         <div class="section">
-           <div class="func">
-               <span class="title-new">功能名称</span>
-               <div style="position: relative;">
-                   <input @input="count" class="input" type="text" v-model="letter.nameWeb" placeholder="请输入功能名称，最多五个字符">
-                   <span class="tip">{{letter.nameWeb.length}}/5</span>
-               </div>
-               <div style="position: relative;">
-                   <span class="road-notice"></span>
-                   <span class="road-notice-txt">
+        <div class="func">
+            <span class="title-new">功能名称</span>
+            <div style="position: relative;">
+                <input @input="count" class="input" type="text" v-model="letter.nameWeb" placeholder="请输入功能名称，最多五个字符">
+                <span class="tip">{{letter.nameWeb.length}}/5</span>
+            </div>
+            <div style="position: relative;">
+                <span class="road-notice"></span>
+                <span class="road-notice-txt">
                     此名称用于展示给选手，只能使用中文，<br/>且不能超过5个字。
                 </span>
-               </div>
-           </div>
-
-            <div class="saveDiv">
-                <span v-on:click="save" class="submit">保存</span>
             </div>
+        </div>
 
+        <div class="saveDiv">
+            <span v-on:click="save" class="submit">保存</span>
         </div>
 
+    </div>
+
 
 </div>
 <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -243,6 +243,13 @@
                         <span class="menu-txt">确认函</span>
                     </a>
                 </li>
+
+                <li class="rankSetting menu-sub-item">
+                    <a href="/gk/rankSetting/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
+                        <span class="left-arrow"></span>
+                        <span class="menu-txt">排行榜</span>
+                    </a>
+                </li>
             </ul>
         </li>
         </ul>
@@ -297,7 +304,7 @@
     var classes = ['cmptSetting', 'nameList', 'manual', 'contact','manage',
                     'route', 'road', 'equip', 'photo', 'news','cert','data',
                     'banner','score','auto','scan','review','customer','rule',
-                    'outter-link','sure-letter'];
+                    'outter-link','sure-letter','rankSetting'];
     let url = document.location.href;
     var done = false;
     for (var i in classes) {