Merge remote-tracking branch 'origin/master'

platform-admin/src/main/java/com/platform/controller/AdvertisementItemController.java

@@ -150,4 +150,30 @@ public class AdvertisementItemController {
         }
         return R.error("操作失败");
     }
+
+    /**
+     * 修改广告页商品
+     */
+    @RequestMapping("/updateAdvertisementItem")
+    @ResponseBody
+    public R updateAdvertisementItem(@RequestParam Map<String, Object> map) {
+        int res = advertisementItemService.updateAdvertisementItem(map);
+        if (res > 0) {
+            return R.ok();
+        } else if (res == -1) {
+            return R.error("参数不能为空");
+        } else if (res == -2) {
+            return R.error("序号不能跟原来相同");
+        } else if (res == -3) {
+            return R.error("序号必须是正整数");
+        }
+        return R.error("操作失败");
+    }
+
+    @RequestMapping("/getAdSort")
+    @ResponseBody
+    public R getAdSort(@RequestParam Map<String, Object> map) {
+        Integer sort = advertisementItemService.getAdSort(map);
+        return R.ok().put("sort", sort);
+    }
 }

platform-admin/src/main/java/com/platform/controller/api/uploadController.java

@@ -29,7 +29,7 @@ public class uploadController {
     @RequestMapping(value = "/uploadFile", produces = "application/json;charset=UTF-8")
     public String upload(MultipartFile file) {
         try {
-            String secondaryFolderName = "Afrishop";
+            String secondaryFolderName = "afrishop";
             // 获取文件名
             String fileName = file.getOriginalFilename();
             // 获取文件后缀

platform-admin/src/main/java/com/platform/dao/AdvertisementItemDao.java

@@ -3,6 +3,7 @@ package com.platform.dao;
 import com.platform.entity.AdvertisementItemEntity;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,11 +18,18 @@ public interface AdvertisementItemDao extends BaseDao<AdvertisementItemEntity> {
 
     int deleteByItem(@Param("itemId") String itemId, @Param("adId") String adId);
 
-    int getMaxSort();
+    int getMaxSort(@Param("adId") String adId);
 
     int setItemTop(@Param("top") Integer top, @Param("itemId") String itemId, @Param("adId") String adId);
 
     AdvertisementItemEntity getAdItemById(@Param("itemId") String itemId, @Param("adId") String adId);
 
     int updateAdItem(AdvertisementItemEntity advertisementItemEntity);
+
+    int existItemSort(@Param("adId") String adId, @Param("sort") Integer sort);
+
+    List<AdvertisementItemEntity> changeSortBack(@Param("firstSort") Integer firstSort, @Param("endSort") Integer endSort, @Param("adId") String adId);
+
+    List<AdvertisementItemEntity> changeSortFront(@Param("firstSort") Integer firstSort, @Param("endSort") Integer endSort, @Param("adId") String adId);
+
 }

platform-admin/src/main/java/com/platform/entity/AdvertisementItemEntity.java

@@ -8,7 +8,7 @@ import java.util.Date;
  * 表名 advertisement_item
  *
  * @author lipengjun
- * @date 2020-10-07 15:50:04
+ * @date 2020-10-13 17:30:21
  */
 public class AdvertisementItemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -22,13 +22,17 @@ public class AdvertisementItemEntity implements Serializable {
      */
     private String itemId;
     /**
-     * 置顶
+     * 是否置顶 0:  不置顶 1：置顶
      */
     private Integer isTop;
     /**
      * 排序
      */
     private Integer sort;
+    /**
+     * 商品添加时间
+     */
+    private Date createTime;
 
     /**
      * 设置：广告投放ID
@@ -57,14 +61,14 @@ public class AdvertisementItemEntity implements Serializable {
         return itemId;
     }
     /**
-     * 设置：置顶
+     * 设置：是否置顶 0:  不置顶 1：置顶
      */
     public void setIsTop(Integer isTop) {
         this.isTop = isTop;
     }
 
     /**
-     * 获取：置顶
+     * 获取：是否置顶 0:  不置顶 1：置顶
      */
     public Integer getIsTop() {
         return isTop;
@@ -82,4 +86,17 @@ public class AdvertisementItemEntity implements Serializable {
     public Integer getSort() {
         return sort;
     }
+    /**
+     * 设置：商品添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：商品添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
 }

platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntityExtends.java

@@ -14,6 +14,15 @@ public class TbCfStationItemEntityExtends extends TbCfStationItemEntity implemen
     private String uname;
     private Integer isTop;
     private Integer sort;
+    private Integer itemSort;
+
+    public Integer getItemSort() {
+        return itemSort;
+    }
+
+    public void setItemSort(Integer itemSort) {
+        this.itemSort = itemSort;
+    }
 
     public String getUname() {
         return uname;

platform-admin/src/main/java/com/platform/service/AdvertisementItemService.java

 package com.platform.service;
 
 import com.platform.entity.AdvertisementItemEntity;
+import io.swagger.models.auth.In;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -75,4 +76,8 @@ public interface AdvertisementItemService {
     int deleteByItem(String itemId, String adId);
 
     int setItemTop(String itemId, String adId);
+
+    int updateAdvertisementItem(@RequestParam Map<String, Object> map);
+
+    Integer getAdSort(Map<String, Object> map);
 }

platform-admin/src/main/java/com/platform/service/impl/AdvertisementItemServiceImpl.java

@@ -4,13 +4,18 @@ import com.platform.dao.AdvertisementItemDao;
 import com.platform.entity.AdvertisementItemEntity;
 import com.platform.service.AdvertisementItemService;
 import com.platform.utils.IdUtil;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Service实现类
@@ -23,6 +28,8 @@ public class AdvertisementItemServiceImpl implements AdvertisementItemService {
     @Autowired
     private AdvertisementItemDao advertisementItemDao;
 
+    final ReentrantLock lock = new ReentrantLock();
+
     @Override
     public AdvertisementItemEntity queryObject(String adId) {
         return advertisementItemDao.queryObject(adId);
@@ -40,9 +47,14 @@ public class AdvertisementItemServiceImpl implements AdvertisementItemService {
 
     @Override
     public int save(AdvertisementItemEntity advertisementItem) {
-        advertisementItem.setIsTop(0);
-        advertisementItem.setSort(0);
-        return advertisementItemDao.save(advertisementItem);
+//        advertisementItem.setIsTop(0);
+        lock.lock();
+        int maxSort = advertisementItemDao.getMaxSort(advertisementItem.getAdId());
+        advertisementItem.setSort(++maxSort);
+        advertisementItem.setCreateTime(new Date());
+        int res = advertisementItemDao.save(advertisementItem);
+        lock.unlock();
+        return res;
     }
 
     @Override
@@ -90,7 +102,7 @@ public class AdvertisementItemServiceImpl implements AdvertisementItemService {
             if (count >= 60) {
                 return -1;
             }
-            int maxSort = advertisementItemDao.getMaxSort();
+            int maxSort = advertisementItemDao.getMaxSort(null);
             byId.setSort(++maxSort);
             byId.setIsTop(1);
         } else {
@@ -100,4 +112,96 @@ public class AdvertisementItemServiceImpl implements AdvertisementItemService {
         }
         return advertisementItemDao.updateAdItem(byId);
     }
+
+    //商品排序需求
+    //1、要更改的序号与原序号相同，不做处理
+    //2、要更改的序号没被商品占有，直接修改序号
+    //3、将序号调至后面
+    //4、将序号调至前面
+    @Override
+    public int updateAdvertisementItem(Map<String, Object> map) {
+        int res = 0;
+        String itemId = map.get("itemId").toString();
+        String adId = map.get("adId").toString();
+        String sort = map.get("sort").toString();
+        if (!StringUtils.isNumeric(sort)) {
+            return -3;
+        }
+        Integer itemSort = Integer.parseInt(sort);
+        String regex = "^[1-9]+[0-9]*$";
+        Pattern p = Pattern.compile(regex);
+        Matcher matcher = p.matcher(sort);
+        if (!matcher.matches()) {
+            return -3;
+        }
+        if (itemId == null || itemId == "") {
+            return -1;
+        }
+        if (adId == null || adId == "") {
+            return -1;
+        }
+        if (sort == null || sort == "") {
+            return -1;
+        }
+
+        AdvertisementItemEntity byId = advertisementItemDao.getAdItemById(itemId, adId);
+        if (byId == null) {
+            return res;
+        }
+        //情况1
+        String firstSort = String.valueOf(byId.getSort());
+        if (sort.equals(firstSort)) {
+            return -2;
+        }
+        //情况2
+        int count = advertisementItemDao.existItemSort(adId, itemSort);
+        if (count == 0) {
+            byId.setSort(itemSort);
+            res = advertisementItemDao.updateAdItem(byId);
+        } else {
+            //要更换的序号被占有
+            //情况3 (2-->8)
+            Integer sort1 = byId.getSort();
+            if (sort1 < itemSort) {
+                List<AdvertisementItemEntity> list = advertisementItemDao.changeSortBack(sort1 + 1, itemSort, adId);
+                for (AdvertisementItemEntity ad : list) {
+                    ad.setSort(ad.getSort() - 1);
+                    advertisementItemDao.updateAdItem(ad);
+                }
+            } else {
+                //情况4 (8-->2)
+                List<AdvertisementItemEntity> list = advertisementItemDao.changeSortFront(itemSort, sort1 - 1, adId);
+                for (AdvertisementItemEntity ad : list) {
+                    ad.setSort(ad.getSort() + 1);
+                    advertisementItemDao.updateAdItem(ad);
+                }
+            }
+            byId.setSort(itemSort);
+            res = advertisementItemDao.updateAdItem(byId);
+
+        }
+
+        return res;
+    }
+
+    @Override
+    public Integer getAdSort(Map<String, Object> map) {
+        String itemId = map.get("itemId").toString();
+        String adId = map.get("adId").toString();
+
+        if (itemId == null || itemId == "") {
+            return null;
+        }
+        if (adId == null || adId == "") {
+            return null;
+        }
+        AdvertisementItemEntity byId = advertisementItemDao.getAdItemById(itemId, adId);
+        if (byId != null) {
+            Integer sort = byId.getSort();
+            if (sort != null) {
+                return byId.getSort();
+            }
+        }
+        return 0;
+    }
 }

platform-admin/src/main/resources/com/platform/dao/AdvertisementItemDao.xml

@@ -8,6 +8,7 @@
         <result property="itemId" column="item_id"/>
         <result property="isTop" column="is_top"/>
         <result property="sort" column="sort"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.platform.entity.AdvertisementItemEntity">
@@ -15,7 +16,8 @@
 			`ad_id`,
 			`item_id`,
 			`is_top`,
-			`sort`
+			`sort`,
+			`create_time`
 		from advertisement_item
 		where ad_id = #{id}
 	</select>
@@ -25,12 +27,18 @@
 			`ad_id`,
 			`item_id`,
 			`is_top`,
-			`sort`
+			`sort`,
+			`create_time`
 		from advertisement_item
 		where ad_id = #{adId}
 		and item_id=#{itemId}
 	</select>
 
+
+    <select id="existItemSort" resultType="int">
+        select count(1) from advertisement_item where ad_id = #{adId} and sort=#{sort}
+    </select>
+
     <select id="getAdItemCount" resultType="int">
         select count(1) from advertisement_item where ad_id = #{adId}
         <if test="itemId != null and itemId.trim() != ''">
@@ -43,7 +51,30 @@
     </update>
 
     <select id="getMaxSort" resultType="int">
-        select max(sort) from advertisement_item
+        select IFNULL(max(sort),0) from advertisement_item
+        <if test="adId != null and adId.trim() != ''">
+            where ad_id=#{adId}
+        </if>
+    </select>
+
+    <select id="changeSortBack" resultType="com.platform.entity.AdvertisementItemEntity">
+        select
+			`ad_id`,
+			`item_id`,
+			`is_top`,
+			`sort`,
+			`create_time`
+			from advertisement_item where sort BETWEEN #{firstSort} AND #{endSort} and ad_id=#{adId}
+    </select>
+
+    <select id="changeSortFront" resultType="com.platform.entity.AdvertisementItemEntity">
+        select
+			`ad_id`,
+			`item_id`,
+			`is_top`,
+			`sort`,
+			`create_time`
+			from advertisement_item where sort BETWEEN #{firstSort} AND #{endSort} and ad_id=#{adId}
     </select>
 
     <delete id="deleteByItem">
@@ -55,7 +86,8 @@
         `ad_id`,
         `item_id`,
         `is_top`,
-        `sort`
+        `sort`,
+        `create_time`
         from advertisement_item
         WHERE 1=1
         <if test="name != null and name.trim() != ''">
@@ -87,12 +119,14 @@
 			`ad_id`,
 			`item_id`,
 			`is_top`,
-			`sort`)
+			`sort`,
+			`create_time`)
 		values(
 			#{adId},
 			#{itemId},
 			#{isTop},
-			#{sort})
+			#{sort},
+			#{createTime})
 	</insert>
 
     <update id="update" parameterType="com.platform.entity.AdvertisementItemEntity">
@@ -100,7 +134,8 @@
         <set>
             <if test="itemId != null">`item_id` = #{itemId},</if>
             <if test="isTop != null">`is_top` = #{isTop},</if>
-            <if test="sort != null">`sort` = #{sort}</if>
+            <if test="sort != null">`sort` = #{sort},</if>
+            <if test="createTime != null">`create_time` = #{createTime}</if>
         </set>
         where ad_id = #{adId}
     </update>

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -95,14 +95,14 @@
         t.goodstwotype_title title,
         o.goodstype_title goodtype,
         a.is_top,
-        a.sort
+        a.sort itemSort
         from advertisement_item a
         left join tb_cf_station_item i on i.item_id=a.item_id
         left JOIN tb_cf_goodstype o ON o.goodstype_id = i.item_category
         left JOIN tb_cf_goodstwotype t ON i.item_categorytwo=t.goodstwotype_id
         left JOIN tb_cf_descripiton d ON i.item_descrition_id=d.descripition_id
-        where a.ad_id=#{adId} and i.enable_flag!=0
-        order by a.is_top desc,a.sort desc,i.create_time desc
+        where a.ad_id=#{adId}
+        order by itemSort asc
         <if test="offset != null and limit != null">
             limit #{offset}, #{limit}
         </if>

platform-admin/src/main/resources/dev/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30

platform-admin/src/main/resources/prod/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=diaoyun666
+#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=root
+#jdbc.password=diaoyun666
 
-#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-#jdbc.username: root
-#jdbc.password: Diaoyunnuli.8
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.username: root
+jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30 

platform-admin/src/main/test/test/ImpartCode.java

@@ -24,6 +24,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 商品导入功能
@@ -481,4 +483,6 @@ public class ImpartCode {
 		return output.toByteArray();
 	}
 
+
+
 }

platform-admin/src/main/webapp/WEB-INF/page/sys/advertisement.html

@@ -288,6 +288,18 @@
             </Form-item>
         </i-form>
     </Card>
+    <Modal
+            v-model="modal1"
+            title="商品排序"
+            @on-ok="deal"
+            width="600px"
+            @on-cancel="cancel">
+        <i-form ref="formValidate" :model="advertisement" :rules="ruleValidate" :label-width="80">
+            <Form-item label="序号" prop="sort">
+                <i-input v-model="sort" placeholder="序号" style="width: 160px"/>
+            </Form-item>
+        </i-form>
+    </Modal>
 </div>
 
 <script src="${rc.contextPath}/js/sys/advertisement.js?_${date.systemTime}"></script>

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfproblem.html

@@ -52,9 +52,10 @@
             <br/>
             <Form-item label="答案" prop="answer" style="width: 800px">
                 <!-- 加载编辑器的容器 -->
-                <script id="container" name="content" type="text/plain">
-                </script>
+<!--                <script id="container" name="content" type="text/plain">-->
+<!--                </script>-->
                 <!--<i-input v-model="tbCfProblem.answer" placeholder="答案"/>-->
+                <textarea v-model="tbCfProblem.answer" style="width: 600px;height: 300px;"></textarea>
             </Form-item>
             <Form-item label="是否展示" prop="enableFlag" style="width: 800px">
                 <i-select placeholder="请选择" v-model="tbCfProblem.enableFlag">

platform-admin/src/main/webapp/js/sys/tbcfproblem.js

@@ -5,7 +5,7 @@ $(function () {
             {label: 'problemId', name: 'problemId', index: 'problem_id', key: true, hidden: true},
             {label: '问题明细', name: 'question', index: 'question', width: 80},
             {label: '类型 ', name: 'type', index: 'type', width: 80, formatter: typeFormat},
-            {label: '答案', name: 'answer', index: 'answer', width: 80, formatter: contentFormat},
+            // {label: '答案', name: 'answer', index: 'answer', width: 80, formatter: contentFormat},
             {label: '是否展示', name: 'enableFlag', index: 'enable_flag', width: 80, formatter: validFormat},
             {label: '排序', name: 'sort', index: 'sort', width: 80},
             {label: '创建时间', name: 'createTime', index: 'create_time', width: 80}],
@@ -17,25 +17,25 @@ $(function () {
  * 增加修改的编辑器
  * @type {UE.ui.Editor|*}
  */
-var ue = UE.getEditor('container');
-
-/**
- * 获取文本框内容
- * @returns {*|String|void}
- */
-function getContent() {
-    var htmlContent = ue.getContent();
-    return htmlContent;
-}
-
-/**
- * 显示内容
- * @param content
- */
-function showContent(problemId) {
-    $('#contentModal').modal('show');
-    vm.getInfo(problemId, true);
-};
+// var ue = UE.getEditor('container');
+//
+// /**
+//  * 获取文本框内容
+//  * @returns {*|String|void}
+//  */
+// function getContent() {
+//     var htmlContent = ue.getContent();
+//     return htmlContent;
+// }
+//
+// /**
+//  * 显示内容
+//  * @param content
+//  */
+// function showContent(problemId) {
+//     $('#contentModal').modal('show');
+//     vm.getInfo(problemId, true);
+// };
 
 
 let vm = new Vue({
@@ -93,8 +93,8 @@ let vm = new Vue({
             vm.getInfo(problemId);
         },
         saveOrUpdate: function (event) {
-            var answer = getContent();
-            vm.tbCfProblem.answer = encodeURI(answer);
+            // var answer = getContent();
+            // vm.tbCfProblem.answer = encodeURI(answer);
             let url = vm.tbCfProblem.problemId == null ? "../tbcfproblem/save" : "../tbcfproblem/update";
             Ajax.request({
                 url: url,
@@ -103,7 +103,7 @@ let vm = new Vue({
                 contentType: "application/json",
                 successCallback: function (r) {
                     alert('操作成功', function (index) {
-                        ue.setContent("");
+                        // ue.setContent("");
                         vm.reload();
                     });
                 }
@@ -135,9 +135,9 @@ let vm = new Vue({
                 async: true,
                 successCallback: function (r) {
                     console.log(r)
-                    r.tbCfProblem.answer = decodeURI(r.tbCfProblem.answer);
+                    // r.tbCfProblem.answer = decodeURI(r.tbCfProblem.answer);
                     vm.tbCfProblem = r.tbCfProblem;
-                    ue.setContent(vm.tbCfProblem.answer);
+                    // ue.setContent(vm.tbCfProblem.answer);
                     if (!!isShowDetail) {
                         var answer = "无内容，请点击修改，添加内容";
                         if (!!vm.tbCfProblem.answer) {