wrj 1 жил өмнө
parent
commit
221c655c7c

+ 4 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCollectController.java

@@ -7,6 +7,7 @@ import com.ylx.common.utils.uuid.IdUtils;
 import com.ylx.massage.domain.TCollect;
 import com.ylx.massage.service.TCollectService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +36,7 @@ public class TCollectController {
      * @param collect
      * @return
      */
+    @ApiOperation("添加收藏")
     @RequestMapping(value = "/wx/addCollect", method = RequestMethod.POST)
     public R addCollect(@RequestBody TCollect collect) {
         try {
@@ -56,6 +58,7 @@ public class TCollectController {
      * @param param
      * @return
      */
+    @ApiOperation("获取收藏")
     @RequestMapping(value = "/wx/getCollect", method = RequestMethod.POST)
     public R getCollect(@RequestBody TCollect param) {
         List<TCollect> list = collectService.getAll(param);
@@ -68,6 +71,7 @@ public class TCollectController {
      * @param param
      * @return
      */
+    @ApiOperation("取消收藏")
     @RequestMapping(value = "/wx/delCollect", method = RequestMethod.POST)
     public R delCollect(@RequestBody TCollect param) {
 

+ 2 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TLbtController.java

@@ -3,6 +3,7 @@ package com.ylx.web.controller.massage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.common.constant.MassageConstants;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.utils.uuid.IdUtils;
 import com.ylx.massage.domain.TLbt;
@@ -87,7 +88,7 @@ public class TLbtController {
     public R del(@RequestBody TLbt tLbt) {
         TLbt tSpflNew = new TLbt();
         tSpflNew.setcId(tLbt.getcId());
-        tSpflNew.setnDel(1);
+        tSpflNew.setnDel(MassageConstants.INTEGER_ONE);
         return R.ok(lbtService.updateById(tSpflNew));
     }
 

+ 19 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/domain/TLbt.java

@@ -63,6 +63,15 @@ public class TLbt implements Serializable {
     @ApiModelProperty("文本内容")
     private String cContent;
 
+
+
+    /**
+     * 序号
+     */
+    @TableField("c_sort")
+    @ApiModelProperty("序号")
+    private Integer cSort;
+
     public String getcId() {
         return cId;
     }
@@ -79,6 +88,7 @@ public class TLbt implements Serializable {
         this.cImgUrl = cImgUrl;
     }
 
+
     public Integer getnDel() {
         return nDel;
     }
@@ -87,6 +97,7 @@ public class TLbt implements Serializable {
         this.nDel = nDel;
     }
 
+
     public String getcDescribe() {
         return cDescribe;
     }
@@ -102,4 +113,12 @@ public class TLbt implements Serializable {
     public void setcContent(String cContent) {
         this.cContent = cContent;
     }
+
+    public Integer getcSort() {
+        return cSort;
+    }
+
+    public void setcSort(Integer cSort) {
+        this.cSort = cSort;
+    }
 }

+ 0 - 29
nightFragrance-massage/src/main/java/com/ylx/massage/utils/CountdownWithTimer.java

@@ -1,29 +0,0 @@
-package com.ylx.massage.utils;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class CountdownWithTimer {
-    public static void main(String[] args) {
-        int countdownSeconds = 3000;
-
-        Timer timer = new Timer();
-        TimerTask task = new TimerTask() {
-            private int remainingSeconds = countdownSeconds;
-
-            @Override
-            public void run() {
-                if (remainingSeconds > 0) {
-                    System.out.println("1111: " + remainingSeconds);
-                    remainingSeconds--;
-                } else {
-                    this.cancel(); // 当倒计时结束时取消任务
-                    System.out.println("!!!!!");
-                }
-            }
-        };
-
-        // 设置定时器在1秒后首次执行任务,之后每隔1秒执行一次
-        timer.scheduleAtFixedRate(task, 1000, 1000);
-    }
-}

+ 2 - 1
nightFragrance-massage/src/main/resources/mapper/massage/TLbtMapper.xml

@@ -9,11 +9,12 @@
         <result column="n_del" property="nDel" />
         <result column="c_describe" property="cDescribe" />
         <result column="c_content" property="cContent" />
+        <result column="c_sort" property="cSort" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        c_id, c_img_url, n_del, c_describe, c_content
+        c_id, c_img_url, n_del, c_describe, c_content, c_sort
     </sql>
 
 </mapper>