From 45f2ed3a2a04b62eb3f5dacc7288fb5750dc047f Mon Sep 17 00:00:00 2001 From: wxl <727869402@qq.com> Date: Wed, 8 Jan 2025 23:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E5=BC=80=E5=8F=91=E5=90=8E=E5=8F=B0=E4=BD=9C?= =?UTF-8?q?=E8=80=85=E5=92=8C=E7=AC=94=E8=AE=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQLREADME.md | 7 + .../dd/admin/business/api/AuthAuthorApi.java | 4 + .../dd/admin/business/api/AuthNoteApi.java | 2 - .../com/dd/admin/business/api/LoginApi.java | 7 +- .../business/author/domain/AuthorDto.java | 3 +- .../business/author/mapper/AuthorMapper.java | 2 + .../author/mapper/xml/AuthorMapper.xml | 27 +- .../service/impl/AuthorServiceImpl.java | 5 +- .../admin/business/note/domain/NoteDto.java | 5 + .../dd/admin/business/note/domain/NoteVo.java | 1 + .../dd/admin/business/note/entity/Note.java | 16 +- .../business/note/mapper/xml/NoteMapper.xml | 27 +- .../security/interceptor/ApiInterceptor.java | 7 +- web/.env.development | 2 + web/src/api/business/card/card.js | 41 - web/src/api/business/category/category.js | 41 - .../api/business/detailServer/detailServer.js | 41 - web/src/api/business/member/member.js | 49 - web/src/api/business/memberCard/memberCard.js | 49 - web/src/api/business/pay/pay.js | 25 - web/src/api/business/product/product.js | 41 - web/src/api/business/sell/sell.js | 48 - web/src/api/business/sellDetail/sellDetail.js | 41 - web/src/api/business/sellJson/sellJson.js | 41 - web/src/api/business/sellPay/sellPay.js | 41 - web/src/api/business/server/server.js | 41 - web/src/api/business/stats/stats.js | 10 - web/src/api/business/stock/stock.js | 49 - .../api/business/stockDetail/stockDetail.js | 41 - web/src/main.js | 3 + web/src/views/business/author/authorList.vue | 314 +++--- web/src/views/business/author/editAuthor.vue | 71 +- web/src/views/business/card/addCard.vue | 132 --- web/src/views/business/card/cardList.vue | 333 ------ web/src/views/business/card/editCard.vue | 128 --- .../views/business/cashier/cashierDesk.vue | 1000 ----------------- web/src/views/business/cashier/chooseSell.vue | 53 - .../views/business/cashier/chooseServer.vue | 56 - web/src/views/business/cashier/payType.vue | 161 --- .../business/cashier/pendingSellList.vue | 289 ----- web/src/views/business/cashier/serverList.vue | 271 ----- .../views/business/category/addCategory.vue | 98 -- .../views/business/category/categoryList.vue | 249 ---- .../views/business/category/editCategory.vue | 104 -- .../detailServer/addSellDetailServer.vue | 156 --- .../detailServer/detailServerList.vue | 343 ------ .../detailServer/editSellDetailServer.vue | 157 --- web/src/views/business/member/addMember.vue | 112 -- web/src/views/business/member/editMember.vue | 124 -- web/src/views/business/member/memberList.vue | 245 ---- .../business/memberCard/addMemberCard.vue | 181 --- .../business/memberCard/editMemberCard.vue | 182 --- .../business/memberCard/memberCardList.vue | 393 ------- web/src/views/business/note/editNote.vue | 67 +- web/src/views/business/note/noteList.vue | 238 ++-- web/src/views/business/product/addProduct.vue | 242 ---- .../views/business/product/editProduct.vue | 243 ---- .../views/business/product/productList.vue | 360 ------ web/src/views/business/sell/addSell.vue | 181 --- web/src/views/business/sell/editSell.vue | 182 --- web/src/views/business/sell/sellList.vue | 473 -------- .../business/sellDetail/addSellDetail.vue | 191 ---- .../business/sellDetail/editSellDetail.vue | 192 ---- .../business/sellDetail/sellDetailList.vue | 413 ------- .../views/business/sellJson/addSelljson.vue | 91 -- .../views/business/sellJson/editSelljson.vue | 92 -- .../views/business/sellJson/sellJsonList.vue | 213 ---- web/src/views/business/sellPay/addSellpay.vue | 101 -- .../views/business/sellPay/editSellpay.vue | 102 -- .../views/business/sellPay/sellPayList.vue | 233 ---- web/src/views/business/server/addServer.vue | 115 -- web/src/views/business/server/editServer.vue | 117 -- web/src/views/business/server/serverList.vue | 254 ----- web/src/views/business/stock/addStock.vue | 228 ---- web/src/views/business/stock/addStockOut.vue | 228 ---- .../views/business/stock/chooseProduct.vue | 53 - web/src/views/business/stock/editStock.vue | 182 --- web/src/views/business/stock/productList.vue | 426 ------- web/src/views/business/stock/stockList.vue | 281 ----- web/src/views/business/stock/stockOutList.vue | 281 ----- .../business/stockDetail/addStockDetail.vue | 121 -- .../business/stockDetail/editStockDetail.vue | 122 -- .../business/stockDetail/stockDetailList.vue | 273 ----- web/src/views/common/TestChooseRadioList.vue | 207 ---- .../views/common/business/categorySelect.vue | 59 - web/src/views/dashboard/index.vue | 545 ++++----- web/src/views/login/index.vue | 237 ---- web/src/views/login/index1.vue | 331 ------ web/src/views/login/login.vue | 408 +++++-- 89 files changed, 940 insertions(+), 13011 deletions(-) create mode 100644 SQLREADME.md delete mode 100644 web/src/api/business/card/card.js delete mode 100644 web/src/api/business/category/category.js delete mode 100644 web/src/api/business/detailServer/detailServer.js delete mode 100644 web/src/api/business/member/member.js delete mode 100644 web/src/api/business/memberCard/memberCard.js delete mode 100644 web/src/api/business/pay/pay.js delete mode 100644 web/src/api/business/product/product.js delete mode 100644 web/src/api/business/sell/sell.js delete mode 100644 web/src/api/business/sellDetail/sellDetail.js delete mode 100644 web/src/api/business/sellJson/sellJson.js delete mode 100644 web/src/api/business/sellPay/sellPay.js delete mode 100644 web/src/api/business/server/server.js delete mode 100644 web/src/api/business/stats/stats.js delete mode 100644 web/src/api/business/stock/stock.js delete mode 100644 web/src/api/business/stockDetail/stockDetail.js delete mode 100644 web/src/views/business/card/addCard.vue delete mode 100644 web/src/views/business/card/cardList.vue delete mode 100644 web/src/views/business/card/editCard.vue delete mode 100644 web/src/views/business/cashier/cashierDesk.vue delete mode 100644 web/src/views/business/cashier/chooseSell.vue delete mode 100644 web/src/views/business/cashier/chooseServer.vue delete mode 100644 web/src/views/business/cashier/payType.vue delete mode 100644 web/src/views/business/cashier/pendingSellList.vue delete mode 100644 web/src/views/business/cashier/serverList.vue delete mode 100644 web/src/views/business/category/addCategory.vue delete mode 100644 web/src/views/business/category/categoryList.vue delete mode 100644 web/src/views/business/category/editCategory.vue delete mode 100644 web/src/views/business/detailServer/addSellDetailServer.vue delete mode 100644 web/src/views/business/detailServer/detailServerList.vue delete mode 100644 web/src/views/business/detailServer/editSellDetailServer.vue delete mode 100644 web/src/views/business/member/addMember.vue delete mode 100644 web/src/views/business/member/editMember.vue delete mode 100644 web/src/views/business/member/memberList.vue delete mode 100644 web/src/views/business/memberCard/addMemberCard.vue delete mode 100644 web/src/views/business/memberCard/editMemberCard.vue delete mode 100644 web/src/views/business/memberCard/memberCardList.vue delete mode 100644 web/src/views/business/product/addProduct.vue delete mode 100644 web/src/views/business/product/editProduct.vue delete mode 100644 web/src/views/business/product/productList.vue delete mode 100644 web/src/views/business/sell/addSell.vue delete mode 100644 web/src/views/business/sell/editSell.vue delete mode 100644 web/src/views/business/sell/sellList.vue delete mode 100644 web/src/views/business/sellDetail/addSellDetail.vue delete mode 100644 web/src/views/business/sellDetail/editSellDetail.vue delete mode 100644 web/src/views/business/sellDetail/sellDetailList.vue delete mode 100644 web/src/views/business/sellJson/addSelljson.vue delete mode 100644 web/src/views/business/sellJson/editSelljson.vue delete mode 100644 web/src/views/business/sellJson/sellJsonList.vue delete mode 100644 web/src/views/business/sellPay/addSellpay.vue delete mode 100644 web/src/views/business/sellPay/editSellpay.vue delete mode 100644 web/src/views/business/sellPay/sellPayList.vue delete mode 100644 web/src/views/business/server/addServer.vue delete mode 100644 web/src/views/business/server/editServer.vue delete mode 100644 web/src/views/business/server/serverList.vue delete mode 100644 web/src/views/business/stock/addStock.vue delete mode 100644 web/src/views/business/stock/addStockOut.vue delete mode 100644 web/src/views/business/stock/chooseProduct.vue delete mode 100644 web/src/views/business/stock/editStock.vue delete mode 100644 web/src/views/business/stock/productList.vue delete mode 100644 web/src/views/business/stock/stockList.vue delete mode 100644 web/src/views/business/stock/stockOutList.vue delete mode 100644 web/src/views/business/stockDetail/addStockDetail.vue delete mode 100644 web/src/views/business/stockDetail/editStockDetail.vue delete mode 100644 web/src/views/business/stockDetail/stockDetailList.vue delete mode 100644 web/src/views/common/TestChooseRadioList.vue delete mode 100644 web/src/views/common/business/categorySelect.vue delete mode 100644 web/src/views/login/index.vue delete mode 100644 web/src/views/login/index1.vue diff --git a/SQLREADME.md b/SQLREADME.md new file mode 100644 index 0000000..f581007 --- /dev/null +++ b/SQLREADME.md @@ -0,0 +1,7 @@ +#### 删除无用字段 +ALTER TABLE `business_note` +DROP COLUMN `AUTHOR_AVATAR`, +DROP COLUMN `UP_COUNT`, +DROP COLUMN `STAR_COUNT`; + + diff --git a/src/main/java/com/dd/admin/business/api/AuthAuthorApi.java b/src/main/java/com/dd/admin/business/api/AuthAuthorApi.java index 4235d75..9da261c 100644 --- a/src/main/java/com/dd/admin/business/api/AuthAuthorApi.java +++ b/src/main/java/com/dd/admin/business/api/AuthAuthorApi.java @@ -18,6 +18,7 @@ import com.dd.admin.business.upNotes.service.UpNotesService; import com.dd.admin.business.upReplys.service.UpReplysService; import com.dd.admin.common.aop.operationLog.aop.OperLog; import com.dd.admin.common.aop.operationLog.aop.OperType; +import com.dd.admin.common.exception.ApiException; import com.dd.admin.common.model.result.ResultBean; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiModel; @@ -51,6 +52,9 @@ public class AuthAuthorApi { public ResultBean getMine() { String authorId = String.valueOf(request.getAttribute("authorId")); Author author = authorService.getById(authorId); + if(author==null){ + throw new ApiException(700,"当前用户信息不存在~"); + } if(author.getBirth()!=null){ author.setAge(DateUtil.ageOfNow(author.getBirth())); } diff --git a/src/main/java/com/dd/admin/business/api/AuthNoteApi.java b/src/main/java/com/dd/admin/business/api/AuthNoteApi.java index eaad42b..625f16a 100644 --- a/src/main/java/com/dd/admin/business/api/AuthNoteApi.java +++ b/src/main/java/com/dd/admin/business/api/AuthNoteApi.java @@ -282,7 +282,6 @@ public class AuthNoteApi { Note note = BeanUtil.copyProperties(noteDto, Note.class); note.setAuthorId(author.getAuthorId()); note.setAuthorName(author.getAuthorName()); - note.setAuthorAvatar(author.getAvatarUrl()); note.setIpAddress(IPUtils.getIpAddr(request)); // 请求IP note.setIpRealAddress(AddressUtils.getRealAddress(note.getIpAddress())); noteService.save(note); @@ -321,7 +320,6 @@ public class AuthNoteApi { Note note = BeanUtil.copyProperties(noteDto, Note.class); note.setAuthorId(author.getAuthorId()); note.setAuthorName(author.getAuthorName()); - note.setAuthorAvatar(author.getAvatarUrl()); note.setIpAddress(IPUtils.getIpAddr(request)); // 请求IP note.setIpRealAddress(AddressUtils.getRealAddress(note.getIpAddress())); noteService.updateById(note); diff --git a/src/main/java/com/dd/admin/business/api/LoginApi.java b/src/main/java/com/dd/admin/business/api/LoginApi.java index f4391d1..8f9227b 100644 --- a/src/main/java/com/dd/admin/business/api/LoginApi.java +++ b/src/main/java/com/dd/admin/business/api/LoginApi.java @@ -58,8 +58,13 @@ public class LoginApi { //验证后登陆 Author author = authorService.selectAuthorByPhoneNumber(phoneLoginDto.getPhoneNumber()); if(author==null){ - author = authorService.createNewAuthor(phoneLoginDto.getPhoneNumber()); + author = authorService.createNewAuthor(phoneLoginDto.getPhoneNumber()); + }else if(author.getDeleted().equals(1)){ + throw new ApiException("当前用户状态异常~"); } +// else if(author.getAuthorStatus().equals(1)){ +// throw new ApiException("当前用户已冻结~"); +// } //根据用户id生成token final String token = jwtTokenUtil.generateTokenByUserId(author.getAuthorId()); author.setToken(token); diff --git a/src/main/java/com/dd/admin/business/author/domain/AuthorDto.java b/src/main/java/com/dd/admin/business/author/domain/AuthorDto.java index 67b262b..de69d52 100644 --- a/src/main/java/com/dd/admin/business/author/domain/AuthorDto.java +++ b/src/main/java/com/dd/admin/business/author/domain/AuthorDto.java @@ -112,5 +112,6 @@ public class AuthorDto { @ApiModelProperty(value = "手机号") private String phoneNumber; - + @ApiModelProperty(value = "关键字搜索") + private String keyword; } diff --git a/src/main/java/com/dd/admin/business/author/mapper/AuthorMapper.java b/src/main/java/com/dd/admin/business/author/mapper/AuthorMapper.java index 2ea45ca..9d7721d 100644 --- a/src/main/java/com/dd/admin/business/author/mapper/AuthorMapper.java +++ b/src/main/java/com/dd/admin/business/author/mapper/AuthorMapper.java @@ -26,5 +26,7 @@ public interface AuthorMapper extends BaseMapper { List selectAuthorList(@Param("authorDto") AuthorDto authorDto); + Author selectAuthorByPhoneNumber(@Param("phoneNumber") String phoneNumber); + Long selectAuthorUpAndStarTotalCount(@Param("authorId") String authorId); } diff --git a/src/main/java/com/dd/admin/business/author/mapper/xml/AuthorMapper.xml b/src/main/java/com/dd/admin/business/author/mapper/xml/AuthorMapper.xml index 6465958..54f3970 100644 --- a/src/main/java/com/dd/admin/business/author/mapper/xml/AuthorMapper.xml +++ b/src/main/java/com/dd/admin/business/author/mapper/xml/AuthorMapper.xml @@ -39,9 +39,26 @@ + diff --git a/src/main/java/com/dd/admin/business/author/service/impl/AuthorServiceImpl.java b/src/main/java/com/dd/admin/business/author/service/impl/AuthorServiceImpl.java index b6b8fcd..357a264 100644 --- a/src/main/java/com/dd/admin/business/author/service/impl/AuthorServiceImpl.java +++ b/src/main/java/com/dd/admin/business/author/service/impl/AuthorServiceImpl.java @@ -47,10 +47,7 @@ public class AuthorServiceImpl extends ServiceImpl impleme @Override public Author selectAuthorByPhoneNumber(String phoneNumber) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Author::getPhoneNumber,phoneNumber); - Author author = baseMapper.selectOne(queryWrapper); - return author; + return baseMapper.selectAuthorByPhoneNumber(phoneNumber); } @Override diff --git a/src/main/java/com/dd/admin/business/note/domain/NoteDto.java b/src/main/java/com/dd/admin/business/note/domain/NoteDto.java index 1242590..de51ea1 100644 --- a/src/main/java/com/dd/admin/business/note/domain/NoteDto.java +++ b/src/main/java/com/dd/admin/business/note/domain/NoteDto.java @@ -11,12 +11,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import com.dd.admin.common.model.UpdateGroup; +import org.springframework.format.annotation.DateTimeFormat; /** @@ -100,5 +102,8 @@ public class NoteDto { //传入此参数 如果你点赞了会显示相应状态 private String followId; + @ApiModelProperty(value = "关键字搜索") + private String keyword; + private Integer noteStatus; } diff --git a/src/main/java/com/dd/admin/business/note/domain/NoteVo.java b/src/main/java/com/dd/admin/business/note/domain/NoteVo.java index ac4af85..ae3b741 100644 --- a/src/main/java/com/dd/admin/business/note/domain/NoteVo.java +++ b/src/main/java/com/dd/admin/business/note/domain/NoteVo.java @@ -95,4 +95,5 @@ public class NoteVo { @ApiModelProperty(value = "图片集合") private List imgList; + private Integer noteStatus; } diff --git a/src/main/java/com/dd/admin/business/note/entity/Note.java b/src/main/java/com/dd/admin/business/note/entity/Note.java index ab332db..d6955bb 100644 --- a/src/main/java/com/dd/admin/business/note/entity/Note.java +++ b/src/main/java/com/dd/admin/business/note/entity/Note.java @@ -58,10 +58,6 @@ public class Note implements Serializable { @TableField("AUTHOR_ID") private String authorId; - @ApiModelProperty(value = "作者头像") - @TableField("AUTHOR_AVATAR") - private String authorAvatar; - @ApiModelProperty(value = "作者名字") @TableField("AUTHOR_NAME") private String authorName; @@ -96,13 +92,7 @@ public class Note implements Serializable { @TableField("IP_REAL_ADDRESS") private String ipRealAddress; - @ApiModelProperty(value = "点赞数") - @TableField("UP_COUNT") - private Long upCount; - - @ApiModelProperty(value = "收藏数") - @TableField("STAR_COUNT") - private Long starCount; - - + @ApiModelProperty(value = "0正常") + @TableField("NOTE_STATUS") + private Integer noteStatus; } diff --git a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml index 7816143..981062e 100644 --- a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml +++ b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml @@ -11,7 +11,6 @@ - @@ -20,8 +19,6 @@ - - @@ -31,26 +28,25 @@