fix(cmpt): banner优化

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

@@ -13,7 +13,11 @@ public class PartnerBanner {
     private String description;
     private String imgUrl;
     private String outUrl;
-    @JsonIgnore
+    // 类型配置（1 网页 2 小程序(appId,path) 3 短连接(#小程序://) 4 页面(小程序) 5文档word,pdf 6 图片 png 7 打开定位）
+    private String type;
+    // appId
+    private String appId;
+    private Integer status;
     private Integer seq;
     @JsonIgnore
     private String createDate;

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

@@ -38,4 +38,6 @@ public interface BannerMapper {
     PartnerBanner getPartnerBannerById(Integer id);
 
     Partner getPartnerIdByCmptId(Integer cmptId);
+
+    void updatePartnerBanner(@Param("banner") PartnerBanner banner);
 }

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

@@ -42,16 +42,28 @@
     </insert>
 
     <insert id="insertPartnerBanner">
-        insert into banner_partner(partner_id, name, description, img_url, out_url, create_date, seq)
-        values (#{banner.partnerId}, #{banner.name}, #{banner.description}, #{banner.imgUrl}, #{banner.outUrl}, now(),#{banner.seq})
+        insert into banner_partner(partner_id, name, description, img_url, out_url, create_date, seq,type,app_id,status)
+        values (#{banner.partnerId}, #{banner.name}, #{banner.description}, #{banner.imgUrl}, #{banner.outUrl}, now(),#{banner.seq},#{banner.type},#{banner.appId},#{banner.status})
     </insert>
 
     <update id="delPartnerBanner">
         update banner_partner set del_flag=1 where id=#{id}
     </update>
+    <update id="updatePartnerBanner">
+        update banner_partner
+        set name=#{banner.name},
+            description=#{banner.description},
+            img_url=#{banner.imgUrl},
+            out_url=#{banner.outUrl},
+            seq=#{banner.seq},
+            type=#{banner.type},
+            app_id=#{banner.appId},
+            status=#{banner.status}
+        where id=#{banner.id}
+    </update>
 
     <select id="queryAllPartnerBanner" resultType="com.dlbridge.jadp.plugins.cmpt.bean.PartnerBanner">
-        select id, partner_id partnerId, seq, name, description, img_url imgUrl, out_url outUrl
+        select id, partner_id partnerId, seq, name, description, img_url imgUrl, out_url outUrl,app_id appId,type,status
         from banner_partner
         where partner_id = #{partnerId}
           and del_flag = 0
@@ -64,7 +76,7 @@
     </select>
 
     <select id="getPartnerBannerById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.PartnerBanner">
-        select id, partner_id partnerId, seq, name, description, img_url imgUrl, out_url outUrl
+        select id, partner_id partnerId, seq, name, description, img_url imgUrl, out_url outUrl,app_id appId,type,status
         from banner_partner
         where id = #{id} and del_flag = 0
     </select>

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

@@ -76,10 +76,14 @@ public class BannerService {
         if(partner != null && StringUtils.isNotBlank(partner.getPartnerId())){
             partnerId = partner.getPartnerId();
         }
-        Integer maxSeq = bannerMapper.getMaxSeqPartnerBanner(partnerId);
-        banner.setSeq(maxSeq == null ? 1 : ++maxSeq);
+        // Integer maxSeq = bannerMapper.getMaxSeqPartnerBanner(partnerId);
+        // banner.setSeq(maxSeq == null ? 1 : ++maxSeq);
         banner.setPartnerId(partnerId);
-        bannerMapper.insertPartnerBanner(banner);
+        if(banner.getId() == null){
+            bannerMapper.insertPartnerBanner(banner);
+        }else{
+            bannerMapper.updatePartnerBanner(banner);
+        }
         return bannerMapper.getPartnerBannerById(banner.getId());
     }
 
@@ -90,4 +94,8 @@ public class BannerService {
     public void delPartnerBanner(Integer id) {
         bannerMapper.delPartnerBanner(id);
     }
+
+    public List<PartnerBanner> queryAllPartnerBannerByPartnerId(String partnerId) {
+        return bannerMapper.queryAllPartnerBanner(partnerId);
+    }
 }

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

@@ -95,25 +95,47 @@ public class BannerController {
     @RequestMapping("partner/{cmptId}")
     @PageView
     public ModelAndView queryAllPartnerBanner(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
-        List<PartnerBanner> banners = bannerService.queryAllPartnerBanner(cmptId);
+        // List<PartnerBanner> banners = bannerService.queryAllPartnerBanner(cmptId);
         Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
         mv.addObject("cmpt", cmpt);
-        mv.addObject("banners", banners);
-        mv.setViewName("cmpt/banner");
+        // mv.addObject("banners", banners);
+        mv.setViewName("cmpt/partnerBanner");
         return mv;
     }
 
+    /**
+     * 查询组委会轮播图列表
+     * @param cmptId
+     * @return
+     */
+    @RequestMapping("partner/list/{cmptId}")
+    @ResponseBody
+    public Result queryAllPartnerBanner(@PathVariable("cmptId") Integer cmptId) {
+        List<PartnerBanner> banners = bannerService.queryAllPartnerBanner(cmptId);
+        return Result.success().setContent(banners);
+    }
+    /**
+     * 查询组委会轮播图列表
+     * @param partnerId
+     * @return
+     */
+    @RequestMapping("partner/query/{partnerId}")
+    @ResponseBody
+    public Result queryAllPartnerBannerByPartnerId(@PathVariable("partnerId") String partnerId) {
+        List<PartnerBanner> banners = bannerService.queryAllPartnerBannerByPartnerId(partnerId);
+        return Result.success().setContent(banners);
+    }
+
     /**
      * 组委会轮播图保存
      * @param banner
-     * @param mv
      * @return
      */
     @RequestMapping("savePartnerBanner")
     @ResponseBody
-    public Result savePartnerBanner(@RequestBody PartnerBanner banner, ModelAndView mv) {
+    public Result savePartnerBanner(@RequestBody PartnerBanner banner) {
         if(banner.getCmptId() == null){
-            return com.neusoft.www.utils.web.Result.fail().setMsg("赛事ID不能为空！").setCode(403);
+            return Result.fail().setMsg("赛事ID不能为空！").setCode(403);
         }
         banner = bannerService.saveOrUpdatePartnerBanner(banner);
         return  Result.success().setContent(banner);

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

@@ -341,6 +341,13 @@
                                             <span class="menu-txt">分类管理</span>
                                         </a>
                                     </li>
+                                    <li class="parnterBanner menu-sub-item">
+                                        <a
+                                            href="/gk/banner/partner/${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>
@@ -403,7 +410,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', 'rankSetting', 'service', "module"];
+                'outter-link', 'sure-letter', 'rankSetting', 'service', "module","parnterBanner"];
             let url = document.location.href;
             var done = false;
             for (var i in classes) {