From 01498494b8cde011222ad7199deb0197ecb691f0 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Sat, 30 Aug 2025 08:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heyu/api/data/dao/vv/VvResourceDao.java | 15 ++++---- .../api/data/entity/vv/VvAdminEntity.java | 17 +++++++-- .../api/data/entity/vv/VvResourceEntity.java | 1 + .../com/test/xxx/mysql/SqlParseUtilsTest.java | 4 +-- .../alibaba/request/mm/VVAdminRequest.java | 6 ++++ .../mm/resource/VvAdminResourceRequest.java | 35 +++++++++---------- .../alibaba/request/vv/AppOrderRequest.java | 2 +- ...troller.java => AdminLoginController.java} | 8 +++-- .../mm/AdminResourceController.java | 8 +++-- 9 files changed, 59 insertions(+), 37 deletions(-) rename api-web/api-interface/src/main/java/com/heyu/api/controller/mm/{AdminController.java => AdminLoginController.java} (93%) diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvResourceDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvResourceDao.java index e413ce2..dde0256 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvResourceDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvResourceDao.java @@ -41,18 +41,17 @@ public interface VvResourceDao extends BaseMapper { int deleteVvResourceById(@Param("id") Long id); - @OrderBy(VvResourceEntity.id_) + @OrderBy(VvResourceEntity.default_sort) List selectByCondition(IPage page, - @IF String fileName, + @IF @LIKE String fileName, @IF String type, @IF Long parentId, - @IF @GE Long minCreateTimestamp, - @IF @LE Long maxCreateTimestamp, - @IF @LE Long minModifyTimestamp, - @IF @GE Long maxModifyTimestamp, + @IF @GE @Column(VvResourceEntity.create_timestamp) Long minCreateTimestamp, + @IF @LE @Column(VvResourceEntity.create_timestamp) Long maxCreateTimestamp, + @IF @LE @Column(VvResourceEntity.modify_timestamp)Long minModifyTimestamp, + @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.default_sort) String defaultSort + @IF @OrderBy(VvResourceEntity.modify_timestamp) String modifyTimestampSort diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvAdminEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvAdminEntity.java index 572ae59..1936e0e 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvAdminEntity.java +++ b/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 diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java index 87d44b6..353f70f 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvResourceEntity.java +++ b/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 文件夹 diff --git a/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java b/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java index e00f21f..5489790 100644 --- a/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java +++ b/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 tuple = TestParseUtils.testSql(VvPackageDao::selectVvPackageByTrackNumbers).getData(); + Tuple2 tuple = TestParseUtils.testSql(VvAdminDao::selectVvAdminByUserName).getData(); System.out.println(tuple.getSecond()); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VVAdminRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VVAdminRequest.java index 6831c99..2b9a2fc 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VVAdminRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceRequest.java index e7d0723..e745cb0 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/resource/VvAdminResourceRequest.java +++ b/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; } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java index f32e19a..1eabba1 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java +++ b/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; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLoginController.java similarity index 93% rename from api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminController.java rename to api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLoginController.java index 9053660..6d167bc 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminController.java +++ b/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); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java index c826dd9..179b363 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminResourceController.java +++ b/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.getDefaultSort() + adminResourceRequest.getModifyTimestampSort() ); }