活动专题添加小程序图片/缓存

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -107,8 +107,13 @@ public class CmPageCentreController extends BaseController {
         }
         cmPageCentreService.save(cmPageCentre);
         addMessage(redirectAttributes, "保存成功");
-        //清除产品仪器缓存
-        redisService.removePattern("instrumentData*");
+        if ("5".equals(cmPageCentre.getType())) {
+            //清除产品仪器缓存
+            redisService.removePattern("instrumentData*");
+        } else if ("6".equals(cmPageCentre.getType())) {
+            //清除活动专题缓存
+            redisService.removePattern("activityData*");
+        }
         return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + cmPageCentre.getPageId() + "&type=" + cmPageCentre.getType();
     }
 
@@ -198,6 +203,8 @@ public class CmPageCentreController extends BaseController {
             }
             //清除产品仪器缓存
             redisService.removePattern("instrumentData*");
+            //清除活动专题缓存
+            redisService.removePattern("activityData*");
             map.put("success", true);
             map.put("msg", "更新排序成功");
             return map;

src/main/java/com/caimei/modules/newhome/entity/NewPageFloorImage.java

@@ -42,10 +42,15 @@ public class NewPageFloorImage implements Serializable {
     private String link;
 
     /**
-     * 图片
+     * PC图片
      */
     private String image;
 
+    /**
+     * 小程序图片
+     */
+    private String appletsImage;
+
     /**
      * 小程序内容宣传图
      */
@@ -187,4 +192,12 @@ public class NewPageFloorImage implements Serializable {
     public void setAdsImage(String adsImage) {
         this.adsImage = adsImage;
     }
+
+    public String getAppletsImage() {
+        return appletsImage;
+    }
+
+    public void setAppletsImage(String appletsImage) {
+        this.appletsImage = appletsImage;
+    }
 }

src/main/java/com/caimei/modules/newhome/service/NewPageFloorService.java

@@ -101,6 +101,7 @@ public class NewPageFloorService extends CrudService<NewPageFloorDao, NewPageFlo
             for (NewPageFloorImage floorImage : floorImageList) {
                 //图片处理
                 floorImage.setImage(UploadPicUtils.saveImageToServer(floorImage.getImage(), null));
+                floorImage.setAppletsImage(UploadPicUtils.saveImageToServer(floorImage.getAppletsImage(), null));
                 //换行符处理
                 if (StringUtils.isNotBlank(floorImage.getContent())) {
                     floorImage.setContent(floorImage.getContent().replace("\n", ""));

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -225,30 +225,51 @@ public class NewPageFloorController extends BaseController {
             return "modules/newhome/addProductImage";
         } else {
             //图片建议尺寸
-            String imageSize = "";
+            String pcImageSize = "";
+            String appletsImageSize = "";
             if (templateType != null) {
                 if (templateType > 50) {
                     //移动端模板序号处理
                     templateType = templateType - 50;
                 }
                 if (templateType == 1) {
-                    imageSize = "224px*224px";
+                    pcImageSize = "224px*224px";
+                    appletsImageSize = "164px*164px";
                 } else if (templateType == 2) {
-                    imageSize = "384px*268px";
+                    pcImageSize = "384px*268px";
+                    appletsImageSize = "224px*156px";
                 } else if (templateType == 3) {
-                    imageSize = "168px*168px";
+                    pcImageSize = "168px*168px";
+                    appletsImageSize = "202px*202px";
                 } else if (templateType == 4) {
-                    imageSize = "584px*300px";
-                } else if (templateType == 5 || templateType == 6 || templateType == 7 || templateType == 8) {
-                    imageSize = "384px*220px";
-                } else if (templateType == 9) {
-                    imageSize = "584px*360px";
+                    pcImageSize = "584px*300px";
+                    appletsImageSize = "702px*360px";
+                } else if (templateType == 5 || templateType == 6) {
+                    pcImageSize = "384px*220px";
+                    if (templateType == 5) {
+                        appletsImageSize = "310px*220px";
+                    } else if (templateType == 6) {
+                        appletsImageSize = "339px*240px";
+                    }
+                } else if (templateType == 7) {
+                    pcImageSize = "284px*220px";
+                    appletsImageSize = "310px*240px";
+                } else if (templateType == 8 || templateType == 9) {
+                    pcImageSize = "584px*360px";
+                    if (templateType == 8) {
+                        appletsImageSize = "702px*360px";
+                    } else {
+                        appletsImageSize = "339px*210px";
+                    }
                 } else if (templateType == 10) {
-                    imageSize = "1184px*360px";
+                    pcImageSize = "1184px*360px";
+                    appletsImageSize = "750px*342px";
                 }
-                imageSize = "建议图片尺寸" + imageSize;
+                pcImageSize = "建议图片尺寸" + pcImageSize;
+                appletsImageSize = "建议图片尺寸" + appletsImageSize;
             }
-            model.addAttribute("imageSize", imageSize);
+            model.addAttribute("pcImageSize", pcImageSize);
+            model.addAttribute("appletsImageSize", appletsImageSize);
             model.addAttribute("type", type);
             model.addAttribute("floorImage", new NewPageFloorImage());
             return "modules/newhome/addActivityAdsImage";
@@ -275,6 +296,8 @@ public class NewPageFloorController extends BaseController {
         if (floorContent.getFloorId() != null) {
             return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor/?repage";
         } else if (StringUtils.isNotBlank(floorContent.getType())){
+            //清除活动专题缓存
+            redisService.removePattern("activityData*");
             return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + floorContent.getPageId() + "&type=6";
         } else {
             //清除产品仪器缓存

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -184,6 +184,7 @@
 		  content,
 		  link,
 		  image,
+		  appletsImage,
 		  adsImage,
 		  `label`,
 		  pcStatus,

src/main/resources/mappings/modules/newhome/NewPageFloorMapper.xml

@@ -153,8 +153,11 @@
 		  floorId,
 		  productId,
 		  `name`,
+		  content,
 		  link,
 		  image,
+		  appletsImage,
+		  adsImage,
 		  `label`,
 		  pcStatus,
 		  appletsStatus,
@@ -222,13 +225,13 @@
 	<insert id="insertFloorImage">
 		INSERT INTO `new_page_floor_image` (
 		  `floorId`, `productId`, `name`, `link`,
-		  `image`,`adsImage`, `label`, `content`, `pcStatus`, `appletsStatus`,
+		  `image`,`appletsImage`, `adsImage`, `label`, `content`, `pcStatus`, `appletsStatus`,
 		  `sort`, `createDate`, centreId
 		)
 		VALUES
 		  (
 			#{floorId}, #{productId}, #{name}, #{link},
-			#{image},#{adsImage}, #{label}, #{content}, #{pcStatus}, #{appletsStatus},
+			#{image},#{appletsImage}, #{adsImage}, #{label}, #{content}, #{pcStatus}, #{appletsStatus},
 			#{sort}, #{createDate}, #{centreId}
 		  )
 	</insert>

src/main/webapp/WEB-INF/views/modules/newhome/activityFloorContentForm.jsp

@@ -511,7 +511,8 @@
                                     <th style="width:20px;"><input class="check-all" type="checkbox"
                                                                    onclick="clickAllSelect(this)"/> 全选
                                     </th>
-                                    <th>图片</th>
+                                    <th>PC图片</th>
+                                    <th>小程序图片</th>
                                     <th>跳转链接</th>
                                     <th>小程序内容宣传图</th>
                                     <th>网站状态</th>
@@ -530,7 +531,8 @@
                                     <th style="width:20px;"><input class="check-all" type="checkbox"
                                                                    onclick="clickAllSelect(this)"/> 全选
                                     </th>
-                                    <th>图片</th>
+                                    <th>PC图片</th>
+                                    <th>小程序图片</th>
                                     <th>标题</th>
                                     <th>内容</th>
                                     <th>跳转链接</th>
@@ -1026,6 +1028,7 @@
                 adsImageList.push({
                     id: "${floorImage.id}",
                     image: "${floorImage.image}",
+                    appletsImage: "${floorImage.appletsImage}",
                     adsImage: "${floorImage.adsImage}",
                     link: "${floorImage.link}",
                     sort: "${floorImage.sort}",
@@ -1040,6 +1043,7 @@
                     id: "${floorImage.id}",
                     name: "${floorImage.name}",
                     image: "${floorImage.image}",
+                    appletsImage: "${floorImage.appletsImage}",
                     adsImage: "${floorImage.adsImage}",
                     content: "${floorImage.content}",
                     link: "${floorImage.link}",
@@ -1261,9 +1265,14 @@
                     items.createDate = '<fmt:formatDate value="<%=new Date()%>" pattern="yyyy-MM-dd HH:mm:ss"/>';
                     console.log(items);
                     if (type == 'adsImage') {
-                        //宣传图
+                        debugger
+                        // 宣传图活动
                         if (items.image == '') {
-                            alertx("请上传图片");
+                            alertx("请上传PC图片");
+                            return false;
+                        }
+                        if (items.appletsImage == '') {
+                            alertx("请上传小程序图片");
                             return false;
                         }
                         if (items.sort == '') {
@@ -1276,9 +1285,13 @@
                         $('#productImageTable').hide();
 
                     } else if (type == 'infoImage') {
-                        //信息宣传图
+                        //信息宣传图活动
                         if (items.image == '') {
-                            alertx("请上传图片");
+                            alertx("请上传PC图片");
+                            return false;
+                        }
+                        if (items.appletsImage == '') {
+                            alertx("请上传小程序图片");
                             return false;
                         }
                         if (items.name == '') {
@@ -1298,7 +1311,7 @@
                         $('#infoImageTable').show();
                         $('#productImageTable').hide();
                     } else {
-                        //商品图片
+                        //商品图片活动
                         if (items.productId == "") {
                             if (items.image == '') {
                                 alertx("请上传图片");
@@ -1344,6 +1357,9 @@
             '<td>' +
             '<img src="' + data.image + '" width="60px" border="none" title="启用">' +
             '</td>' +
+            (type == 'adsImage' || type == 'infoImage' ? (
+                '<td>' + '<img src="' + data.appletsImage + '" width="60px" border="none">' + '</td>'
+            ) : '') +
             (type == 'infoImage' ? (
                 ('<td>' + '<input value="' + data.name + '"  onchange="changeName(' + index + ',this)">' + '</td>') +
                 ('<td>' + '<input value="' + data.content + '"  onchange="changeContent(' + index + ',this)">' + '</td>')

src/main/webapp/WEB-INF/views/modules/newhome/addActivityAdsImage.jsp

@@ -116,14 +116,26 @@
     <form:hidden path="id" id="id"/>
     <sys:message content="${message}"/>
     <div class="control-group">
-        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>图片：</label>
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC图片：</label>
         <div class="controls upload-content iconBox">
             <div class="conList">
                 <form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
                 <sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
                               maxHeight="100"/>
                 <br>
-                <label>${imageSize}</label>
+                <label>${pcImageSize}</label>
+            </div>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序图片：</label>
+        <div class="controls upload-content iconBox">
+            <div class="conList">
+                <form:hidden id="appletsImage" path="appletsImage" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+                <sys:ckfinder input="appletsImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
+                              maxHeight="100"/>
+                <br>
+                <label>${appletsImageSize}</label>
             </div>
         </div>
     </div>
@@ -196,6 +208,7 @@
         $('.upload-content .conList').find('.cancel-upload').hide();
         var observeEle = document.getElementsByClassName('upload-content')[0];
         var observeEle1 = document.getElementsByClassName('upload-content')[1];
+        var observeEle2 = document.getElementsByClassName('upload-content')[2];
         var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
         var MutationObserverConfig = {
             childList: true,
@@ -219,6 +232,7 @@
         });
         observer.observe(observeEle, MutationObserverConfig);
         observer.observe(observeEle1, MutationObserverConfig);
+        observer.observe(observeEle2, MutationObserverConfig);
 
         $('body').on('click', '.upload-content li', function () {
             var index = $(this).closest('.conList').index() + 1,
@@ -248,6 +262,13 @@
                         $(ele).parents(".conList").next().removeClass("hide-pic")
                     }
                 })
+                $("#appletsImage").find("input.input-xlarge").each(function (i, ele) {
+                    if ($(ele).val()) {
+                        $(ele).next().find("li").css("z-index", "99");
+                        $(ele).parents(".conList").find(".cancel-upload").show();
+                        $(ele).parents(".conList").next().removeClass("hide-pic")
+                    }
+                })
                 $("#adsImage").find("input.input-xlarge").each(function (i, ele) {
                     if ($(ele).val()) {
                         $(ele).next().find("li").css("z-index", "99");
@@ -264,6 +285,7 @@
             "id": $('#id').val(),
             "productId": "",
             "image": $('#image').val(),
+            "appletsImage": $('#appletsImage').val(),
             "adsImage": $('#adsImage').val(),
             "name": $('#name').val(),
             "content": $('#content').val(),