提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvResourceDao.java

@@ -41,18 +41,17 @@ public interface VvResourceDao extends BaseMapper<VvResourceEntity> {
     int deleteVvResourceById(@Param("id") Long id);
 
 
-    @OrderBy(VvResourceEntity.id_)
+    @OrderBy(VvResourceEntity.default_sort)
     List<VvResourceEntity> selectByCondition(IPage page,
-                                             @IF String fileName,
+                                             @IF @LIKE String fileName,
                                              @IF String type,
                                              @IF Long parentId,
-                                             @IF @GE Long minCreateTimestamp,
+                                             @IF @GE @Column(VvResourceEntity.create_timestamp) Long minCreateTimestamp,
-                                             @IF @LE Long maxCreateTimestamp,
+                                             @IF @LE @Column(VvResourceEntity.create_timestamp) Long maxCreateTimestamp,
-                                             @IF @LE Long minModifyTimestamp,
+                                             @IF @LE  @Column(VvResourceEntity.modify_timestamp)Long minModifyTimestamp,
-                                             @IF @GE Long maxModifyTimestamp,
+                                             @IF @GE  @Column(VvResourceEntity.modify_timestamp) Long maxModifyTimestamp,
                                              @IF @OrderBy(VvResourceEntity.create_timestamp) String createTimestampSort,
-                                             @IF @OrderBy(VvResourceEntity.modify_timestamp) String modifyTimestampSort,
+                                             @IF @OrderBy(VvResourceEntity.modify_timestamp) String modifyTimestampSort
-                                             @IF @OrderBy(VvResourceEntity.default_sort) String defaultSort
 
 
 

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvAdminEntity.java

@@ -1,16 +1,27 @@
 package com.heyu.api.data.entity.vv;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.lz.mybatis.plugin.annotations.AS;
 
-import java.math.BigDecimal;
+import java.util.Date;
-import java.util.Date;import java.util.Date;
 /**
 *用户登录表
 * @author quyixiao
 * @since 2025-08-23
+ *
+ *
+ * feature_cc = 3
+ * feature_cc = 3
+ *
+ * feature_cc = 4
+ *
+ * update vv_admin set feature_cc = feature_cc + 1 , user_name = 'admin' where id = 1 and feature_cc = 3
+ *
+ *
+ *
+ *
 */
 
 @Data

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java

@@ -41,6 +41,7 @@ private static final long serialVersionUID = 1L;
     //修改时间
     private Date modifyTime;
     //资源链接
+    // 如果是文件夹，就什么都不传
     private String resourceUrl;
 
     //图片或视频， image  , video , file  文件夹

api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java

@@ -1,6 +1,6 @@
 package com.test.xxx.mysql;
 
-import com.heyu.api.data.dao.vv.VvPackageDao;
+import com.heyu.api.data.dao.vv.VvAdminDao;
 import com.lz.mybatis.plugin.utils.TestParseUtils;
 import com.lz.mybatis.plugin.utils.t.Tuple2;
 import org.junit.Test;
@@ -11,7 +11,7 @@ SqlParseUtilsTest {
     @Test
     public void test1() {
 
-        Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvPackageDao::selectVvPackageByTrackNumbers).getData();
+        Tuple2<Boolean, String> tuple = TestParseUtils.testSql(VvAdminDao::selectVvAdminByUserName).getData();
 
         System.out.println(tuple.getSecond());
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VVAdminRequest.java

@@ -7,9 +7,15 @@ import lombok.Data;
 public class VVAdminRequest {
 
 
+    /***
+     * 用户名
+     */
     private String username;
 
 
+    /***
+     * 密码
+     */
     private String password;
 
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceRequest.java

@@ -15,15 +15,25 @@ public class VvAdminResourceRequest {
 
     /***
      * 类型
-     *     image
+     *     image  图片
      *
-     *     video
+     *     video  视频
      *
-     *
+     *     file 文件夹
-     *     file
      */
     private String type ;
 
+
+
+
+    //资源名称
+    private String fileName;
+
+
+    //父亲id
+    private Long parentId;
+
+
     //创建时间撮
     private Long minCreateTimestamp;
 
@@ -32,34 +42,21 @@ public class VvAdminResourceRequest {
      */
     private Long maxCreateTimestamp;
 
-
-    //资源名称
-    private String fileName;
-    //父亲id
-    private Long parentId;
-
-
     //修改时间
     private Long minModifyTimestamp;
 
-
     //修改时间
     private Long maxModifyTimestamp;
 
-
     /***
-     * 按创建时间排序
+     * 按创建时间排序  ASC  , DESC
      */
     private String createTimestampSort;
 
 
     /***
-     * 按创建时间排序
+     * 按修改时间时间排序  ASC  , DESC
      */
     private String modifyTimestampSort;
 
-    /***
-     *
-     */
-    private String defaultSort;
 }

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java

@@ -38,7 +38,7 @@ public class AppOrderRequest {
     private String createTimestampSort;
 
 
-    //wait_pay:待支付,待发货：wait_shipping,  已经发货: shipping , 已接收，delivered， all_refund:全部退款，part_refund,部分退款
+    //wait_pay:待支付,待发货：wait_shipping,  已经发货: shipping , 已接收，delivered
     private String status;
 
 

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLoginController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/mm/admin")
-public class AdminController {
+public class AdminLoginController {
 
 
     @Autowired
@@ -32,12 +32,17 @@ public class AdminController {
      * 列表
      * http://localhost:8888/mm/admin/login
      *
+     * https://api.1024api.com/api-interface//mm/admin/login
+     *
      * {"username":"admin","password":"admin123"}
      */
     @RequestMapping("/login")
     public R list(@RequestBody VVAdminRequest vvAdminRequest) {
         VVAdminDTO vvAdminDTO = new VVAdminDTO();
+
         VvAdminEntity vvAdminEntity = vvAdminDao.selectVvAdminByUserName(vvAdminRequest.getUsername());
+
+        // admin123   !=  '1'  or 1 = 1
         if (vvAdminEntity.getPassword().equals(vvAdminRequest.getPassword())) {
             vvAdminDTO.setUsername(vvAdminRequest.getUsername());
             String token = MD5Utils.getMD5(System.currentTimeMillis() + "admin");
@@ -47,7 +52,6 @@ public class AdminController {
 
             vvLoginLogDao.deleteVvLoginLogRealByUserName(vvAdminRequest.getUsername());
 
-
             vvLoginLogEntity.setUsername(vvAdminRequest.getUsername());
             vvLoginLogEntity.setToken(token);
             vvLoginLogDao.insertOrUpdateVvLoginLog(vvLoginLogEntity);

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java

@@ -28,6 +28,11 @@ public class AdminResourceController {
     private VvResourceDao vvResourceDao;
 
 
+    /***
+     * https://api.1024api.com/api-interface//mm/resource/list
+     *
+     *  http://localhost:8888/mm/resource/list
+     */
     @RequestMapping("/list")
     public R list(@RequestBody VvAdminResourceRequest adminResourceRequest) {
         PPageUtils pageUtils = PPageUtils.startPage(adminResourceRequest.getPageNum(), adminResourceRequest.getPageSize())
@@ -43,8 +48,7 @@ public class AdminResourceController {
                                 adminResourceRequest.getMinModifyTimestamp(),
                                 adminResourceRequest.getMaxModifyTimestamp(),
                                 adminResourceRequest.getCreateTimestampSort(),
-                                adminResourceRequest.getModifyTimestampSort(),
+                                adminResourceRequest.getModifyTimestampSort()
-                                adminResourceRequest.getDefaultSort()
 
                         );
                     }