易发布 bug修改

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

@@ -14,4 +14,6 @@ public class CmptTemplate {
     private String templateName;
 
     private String templateBg;
+
+    private String bgColor;
 }

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

@@ -83,4 +83,7 @@ public interface CmptMapper {
     Map<String, String> getEnrollUsersByUserMapId(int userMapId);
 
     RoadUser getEnrollUsersByPhone(@Param("cmptId") Integer cmptId,@Param("callPhone")  String phone);
+
+    List<Cmpt> queryMyCmpt(@Param("userId") String userId);
+
 }

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

@@ -151,11 +151,12 @@
             and now() >= c.startTime and c.endTime >= now()
         </if>
         <if test="param.userId > 0">
-            and c.createUserId=#{param.userId}  and a.cmpt_status = 2
+            and c.createUserId=#{param.userId} and a.cmpt_status = 2
         </if>
         <if test="param.userId lt  0">
             and c.createUserId <![CDATA[ <> ]]> 427744
             and c.createUserId <![CDATA[ <> ]]> 2148892
+            and c.createUserId <![CDATA[ <> ]]> 14866
             and a.cmpt_status = 2
         </if>
     </sql>
@@ -277,6 +278,7 @@
           <if test="0 > userId">
             and c.createUserId <![CDATA[ <> ]]> 427744
             and c.createUserId <![CDATA[ <> ]]> 2148892
+            and c.createUserId <![CDATA[ <> ]]> 14866
           </if>
           <if test="userId > 0">
                 and c.createUserId = #{userId}
@@ -289,6 +291,7 @@
         <if test="userId lt 0">
             and c.createUserId <![CDATA[ <> ]]> 427744
             and c.createUserId <![CDATA[ <> ]]> 2148892
+            and c.createUserId <![CDATA[ <> ]]> 14866
         </if>
         <if test="userId > 0">
             and c.createUserId = #{userId}
@@ -302,6 +305,7 @@
         <if test="userId lt 0">
             and c.createUserId <![CDATA[ <> ]]> 427744
             and c.createUserId <![CDATA[ <> ]]> 2148892
+            and c.createUserId <![CDATA[ <> ]]> 14866
         </if>
         <if test="userId > 0">
             and c.createUserId = #{userId}
@@ -323,4 +327,23 @@
         from common.neucmpt a inner join raceenroll.competitionusermap b on a.gcmptid=b.cmptid
         where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1 limit 1
     </select>
+
+
+    <select id="queryMyCmpt" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt">
+        select a.cmpt_id,
+        a.cmpt_name as cmptName,
+        a.logo,
+        date_format(start_time,'%Y-%m-%d') startTime,
+        a.bg_color as cmptbgColor,
+        a.create_by AS "createBy",
+        a.create_date AS "createDate",
+        a.update_by AS "updateBy",
+        a.update_date AS "updateDate",
+        a.del_flag AS "delFlag"
+        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.del_flag=0
+         and c.createUserId = #{userId}
+        order by c.startTime desc
+    </select>
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/Cmpt.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 
 /**
@@ -16,6 +17,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
+@ToString
 public class Cmpt extends JaapRecord<Cmpt> {
 
     private static final long serialVersionUID = 1L;

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

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 赛事
@@ -37,8 +38,9 @@ public class CmptService {
 
     public Cmpt queryCmptBycmptId(Integer cmptId) {
         try {
+            long start = System.currentTimeMillis();
             Cmpt cmpt = remoteService.getCmptByCmptId(cmptId);
-
+            log.info("耗时cmpt1:"+(System.currentTimeMillis()-start));
             if(cmpt == null) {
                 log.error("not find related cmpt id : " + cmptId);
                 return new Cmpt().setCmptId(cmptId);
@@ -47,9 +49,10 @@ public class CmptService {
             log.info(cmpt);
 
             Cmpt localCmpt = cmptMapper.queryCmptBycmptId(cmptId);
-
+            log.info("耗时cmpt2:"+(System.currentTimeMillis()-start));
             if (localCmpt == null) {
                 save(cmpt);
+                log.info("耗时cmpt3:"+(System.currentTimeMillis()-start));
                 return cmptMapper.queryCmptBycmptId(cmptId);
             } else {
                 localCmpt.setCmptName(cmpt.getCmptName());
@@ -57,6 +60,7 @@ public class CmptService {
                 localCmpt.setEndTime(cmpt.getEndTime());
                 localCmpt.setCmptType(cmpt.getCmptType());
                 update(localCmpt);
+                log.info("耗时cmpt4:"+(System.currentTimeMillis()-start));
                 return localCmpt;
             }
         }catch (Exception ex){
@@ -125,15 +129,27 @@ public class CmptService {
     }
 
     public Page<List<Cmpt>> queryCmpt(Pageable page, Map<String,String> param) {
+        long start = System.currentTimeMillis();
         long count = cmptMapper.countCount(param);
+        log.info("耗时1："+(System.currentTimeMillis()-start));
         List<Cmpt> list = cmptMapper.queryCmpt(page, param);
-
+        log.info("耗时2："+(System.currentTimeMillis()-start));
         list.forEach(cmpt -> {
             Object o = valueOperations.get("gk:view:" + cmpt.getCmptId());
             if(o != null){
                 cmpt.setView((Integer) o);
             }
-            cmpt.setEnroll(remoteService.getCmptEnrollCount(cmpt.getCmptId()));
+
+            log.info("耗时3："+(System.currentTimeMillis()-start));
+            Object countStr = valueOperations.get("count:cmptid:" + cmpt.getCmptId());
+            if(countStr != null){
+                cmpt.setEnroll(Integer.valueOf(countStr.toString()));
+            }else{
+                int cmptEnrollCount = remoteService.getCmptEnrollCount(cmpt.getCmptId());
+                cmpt.setEnroll(cmptEnrollCount);
+                valueOperations.set("count:cmptid:"+cmpt.getCmptId(),cmptEnrollCount+"",30, TimeUnit.MINUTES);
+                log.info("耗时4："+(System.currentTimeMillis()-start));
+            }
         });
         return PageFactory.setContent(list, page, count);
     }
@@ -241,4 +257,8 @@ public class CmptService {
     public RoadUser getEnrollUsersByPhone(Integer cmptId, String phone) {
         return cmptMapper.getEnrollUsersByPhone(cmptId,phone);
     }
+
+    public List<Cmpt> queryMyCmpt(String userId) {
+        return cmptMapper.queryMyCmpt(userId);
+    }
 }

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

@@ -2,13 +2,15 @@ package com.dlbridge.jadp.plugins.cmpt.service;
 
 import com.dlbridge.jadp.plugins.cmpt.bean.CmptTemplate;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.TemplateMapper;
-import javafx.beans.binding.ObjectBinding;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class TemplateService {
@@ -87,7 +89,7 @@ public class TemplateService {
                 itemMap.put("new_gk_itemId", new_gk_itemId);
                 gkItemMapList.add(itemMap);
                 // 查询 certificate 表
-                List<Map<String, Object>> certificateList = templateMapper.queryGeerunnerCertificateByRoadId(Integer.valueOf(cmptItemList.get(i).get("item_id").toString()));
+                /*List<Map<String, Object>> certificateList = templateMapper.queryGeerunnerCertificateByRoadId(Integer.valueOf(cmptItemList.get(i).get("item_id").toString()));
                 if(certificateList.size()>0) {
                     // 复制 certificate 表
                     for (int j = 0; j < certificateList.size(); j++) {
@@ -106,13 +108,13 @@ public class TemplateService {
                 // 复制 cmpt_rich_text 赛事富文本表
                 templateMapper.copyGeerunnerCmptRichText(gmap1);
                 // 复制 cmpt_userdefine 报名配置表
-                templateMapper.copyGeerunnerCmptUserdefine(gmap1);
+                templateMapper.copyGeerunnerCmptUserdefine(gmap1);*/
 
             }
         }
 
         // 查询 cmpt_discount 优惠方案
-        List<Map<String, Object>> cmptDiscounts = templateMapper.queryGeerunnerCmptDiscountByCmptId(gk_compId);
+        /*List<Map<String, Object>> cmptDiscounts = templateMapper.queryGeerunnerCmptDiscountByCmptId(gk_compId);
         if(cmptDiscounts.size()>0) {
             for (int i = 0; i < cmptDiscounts.size(); i++) {
                 // 复制 cmpt_discount 优惠方案
@@ -131,10 +133,10 @@ public class TemplateService {
                     templateMapper.copyGeerunnerCmptDiscountMapping(gmap2);
                 }
             }
-        }
+        }*/
 
         // 查询 cmpt_extra_charge表的groupId
-        List<Map<String, Object>> groupIds = templateMapper.queryGeerunnerCmptExtraChargeGroupIdByCmptId(gk_compId);
+        /*List<Map<String, Object>> groupIds = templateMapper.queryGeerunnerCmptExtraChargeGroupIdByCmptId(gk_compId);
         if (groupIds.size()>0) {
             Map<String, Object> gmap3 = new HashMap<>();
             gmap3.put("new_gk_cmptId", new_gk_cmptId);
@@ -164,13 +166,13 @@ public class TemplateService {
                     templateMapper.copyGeerunnerCmptExtraCharge(gmap3);
                 }
             }
-        }
+        }*/
 
         // 复制 cmpt_medal 赛事奖牌表
-        templateMapper.copyGeerunnerCmptMedal(gmap);
+        //templateMapper.copyGeerunnerCmptMedal(gmap);
 
         // 查询 gps_path
-        List<Map<String, Object>> gpsPathList = templateMapper.queryGeerunnerGpsPathByCmptId(gk_compId);
+        /*List<Map<String, Object>> gpsPathList = templateMapper.queryGeerunnerGpsPathByCmptId(gk_compId);
         if(gpsPathList.size()>0) {
             Map<String, Object> gmap4 = new HashMap<>();
             gmap4.put("new_gk_cmptId", new_gk_cmptId);
@@ -189,7 +191,7 @@ public class TemplateService {
                 gmap4.put("new_gk_pathId",new_gk_pathId);
                 templateMapper.copyGeerunnerGpsPlacemark(gmap4);
             }
-        }
+        }*/
 
         // 复制 time_seg
         List<Map<String, Object>> gkSegList = new ArrayList<>(); // 存储seq 新旧id关系
@@ -212,7 +214,7 @@ public class TemplateService {
             }
         }
 
-        // time_checkpoint 计时点
+        /*// time_checkpoint 计时点
         List<Map<String, Object>> timeCheckpointList = templateMapper.queryGeerunnerTimeCheckpointByCmptId(gk_compId);
         if (timeCheckpointList.size()>0) {
             Map<String, Object> gmap6 = new HashMap<>();
@@ -261,7 +263,7 @@ public class TemplateService {
                     templateMapper.copyGeerunnerTimeRanking(gmap7);
                 }
             }
-        }
+        }*/
         /****************************复制 geerunner 库的信息 结束****************************/
         /****************************复制 gksite 库的信息 开始****************************/
         // 复制 gk_cmpt 赛事主表
@@ -271,7 +273,7 @@ public class TemplateService {
         smap.put("gk_userId",gk_userId);
         templateMapper.copyGkSiteGkCmpt(smap);
         // 查询 banner 表
-        List<Map<String, Object>> bannerList = templateMapper.queryGksiteBannerByCmptId(gk_compId);
+        /*List<Map<String, Object>> bannerList = templateMapper.queryGksiteBannerByCmptId(gk_compId);
         if(bannerList.size()>0) {
             Map<String, Object> smap1 = new HashMap<>();
             smap1.put("new_gk_cmptId",new_gk_cmptId);
@@ -284,7 +286,7 @@ public class TemplateService {
                 // 复制 banner_statistic 表
                 templateMapper.copyGkSiteBannerStatistic(smap1);
             }
-        }
+        }*/
 
         // 复制 gk_cmpt_func 表 各种配置的开关
         templateMapper.copyGkSiteGkCmptFunc(smap);
@@ -332,7 +334,7 @@ public class TemplateService {
         pmap.clear();
         pmap.put("compId",race_cmptId);
         pmap.put("new_race_cmptId",new_race_cmptId);
-        templateMapper.copyRaceCmptPartnerMap(pmap);
+        //templateMapper.copyRaceCmptPartnerMap(pmap);
         // 复制raceenroll.competitioncustom
         templateMapper.copyRaceCompetitioncustom(pmap);
         // 查询赛事下的项目列表
@@ -357,13 +359,13 @@ public class TemplateService {
             pmap1.put("userId",userId);
             pmap1.put("roadId",roads.get(i).get("roadId"));
             pmap1.put("new_race_roadId",new_race_roadId);
-            templateMapper.copyRaceCompetitionroadrole(pmap1);
+            //templateMapper.copyRaceCompetitionroadrole(pmap1);
             // 查询 extrapay 表赛事项目额外费项表
             List<Map<String, Object>> extrapays = templateMapper.queryRaceExtrapayByRoadId(Integer.valueOf(roads.get(i).get("roadId").toString()));
             pmap_extrapay.put("new_race_roadId",new_race_roadId);
             pmap_payitem.put("new_race_roadId",new_race_roadId);
             pmap_payitem.put("roadId",roads.get(i).get("roadId"));
-            for (int j = 0; j < extrapays.size(); j++) {
+            /*for (int j = 0; j < extrapays.size(); j++) {
                 // 复制 extrapay 表 赛事项目额外费项表
                 pmap_extrapay.put("id", extrapays.get(j).get("id"));
                 templateMapper.copyRaceExtrapay(pmap_extrapay);
@@ -374,7 +376,7 @@ public class TemplateService {
                 templateMapper.copyRacePayitem(pmap_payitem);
                 // 复制 road_extrapay_relation 表
                 templateMapper.copyRaceRoadExtrapayRelation(pmap_payitem);
-            }
+            }*/
             // 存储新旧roadId关系
             Map<String, Object> roadIdMap = new HashMap<>();
             roadIdMap.put("roadId",Integer.valueOf(roads.get(i).get("roadId").toString()));
@@ -385,7 +387,7 @@ public class TemplateService {
             templateMapper.copyRaceUserdefined(pmap_payitem);
         }
         // 查询项目优惠通道信息 discount表
-        Map<String, Object> pmap2 = new HashMap<>();
+        /*Map<String, Object> pmap2 = new HashMap<>();
         Map<String, Object> pmap_roadchannel = new HashMap<>();
         List<Map<String, Object>> discounts = templateMapper.queryRaceDiscountByCompId(race_cmptId);
         for (int i = 0; i < discounts.size(); i++) {
@@ -426,7 +428,7 @@ public class TemplateService {
                     }
                 }
             }
-        }
+        }*/
 
         // 查询赛事号码牌规则信息
         List<Map<String, Object>> markNoRules = templateMapper.queryRaceMarkNoRuleByCompId(race_cmptId);

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

@@ -201,7 +201,8 @@ public class CmptController {
      */
     @ResponseBody
     @RequestMapping(value = "saveCmpt", method = RequestMethod.POST)
-    public com.neusoft.www.utils.web.Result saveCmpt(Cmpt cmpt) {
+    public com.neusoft.www.utils.web.Result saveCmpt(@RequestBody Cmpt cmpt) {
+        log.info("保存的入参："+cmpt);
         if (cmpt.getCmptId() == null) {
             cmptService.save(cmpt);
         } else {

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

@@ -293,10 +293,12 @@ public class MicroApiController {
     public Page<List<Cmpt>> cmpt(@ApiIgnore Pageable page, String keyword,HttpServletRequest request) {
         int type = NumberUtils.toInt(request.getParameter("type"), 0);
         String partnerId = request.getParameter("partnerId");
+        String creator = request.getParameter("userId");
         Partner partner = cmptService.getPartnerById(partnerId);
         log.info("partner:"+partner);
         Map<String,String> param = new HashMap<>();
         param.put("userId",partner.getUserId()+"");
+        param.put("creator",creator);
         param.put("type",type+"");
         param.put("keyword",keyword);
         Page<List<Cmpt>> result = cmptService.queryCmpt(page, param);
@@ -304,6 +306,17 @@ public class MicroApiController {
         return result;
     }
 
+
+    @GetMapping(value = "/queryMyCmpt")
+    public Result<List<Cmpt>> queryMyCmpt(@ApiIgnore Pageable page, String keyword,HttpServletRequest request) {
+        String userId = request.getParameter("userId");
+        if (StringUtils.isBlank(userId)) {
+            return Result.fail().setMsg("参数不正常！");
+        }
+        List<Cmpt> result = cmptService.queryMyCmpt(userId);
+        return Result.success().setContent(result);
+    }
+
     @GetMapping(value = "/func/{cmptId}")
     @ApiResponses({
             @ApiResponse(code = 200, message = "成功"),

src/main/resources/application.properties

-spring.profiles.active=dev
+spring.profiles.active=dev
\ No newline at end of file

src/main/webapp/static/js/index.js

@@ -18,6 +18,7 @@ $(function () {
         }
         $.ajax({
             url: '/gk/cmpt/saveCmpt',
+            contentType:"application/json",
             data: {'cmptId': cmptId, 'cmptbgColor': "#"+bg, 'logo': logo},
             type: 'post',
             success: function (data) {