From 67c666776242193faf94590a49de8ffc80a65d88 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Tue, 9 Apr 2024 13:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E5=AF=8C=E6=96=87=E6=9C=AC=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=AE=BF=E9=97=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayletRevenueRecordAppController.java | 2 +- .../app/PlayletTaskAppController.java | 2 +- .../app/PlayletUserAccountAppController.java | 66 +++++------------ .../app/PlayletUserInvoiceAppController.java | 71 ++++++------------- ...serWithdrawDepositRecordAppController.java | 69 +++++------------- ...etUserWithdrawalPasswordAppController.java | 54 +++----------- .../app/PlayletUserAccountAppService.java | 2 +- .../PlayletPublicDetailAppServiceImpl.java | 10 ++- .../PlayletUserAccountAppServiceImpl.java | 4 +- .../templates/system/playlet/detail/add.html | 13 ++-- .../templates/system/playlet/detail/edit.html | 9 +-- .../playlet/framework/config/ShiroConfig.java | 2 + .../system/domain/PlayletPublicDetail.java | 4 ++ 13 files changed, 96 insertions(+), 212 deletions(-) diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java index b6b58b5..1cc97dc 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java @@ -27,9 +27,9 @@ import java.util.List; * @Description: 短剧任务收益Controller */ @Controller +@Api(tags = "短剧*短剧收益") @RequestMapping("/app/record") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) -@Api(tags = "短剧*短剧收益") public class PlayletRevenueRecordAppController extends BaseController { private final PlayletRevenueRecordAppService service; diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java index abe45b4..8b867a5 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; * @Description: 短剧任务app控制层 */ @Slf4j -@Api(tags = "短剧任务app控制层") +@Api(tags = "短剧*短剧任务") @RestController @RequestMapping(value = "/app/task") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java index 39ab898..1766e1b 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java @@ -1,18 +1,13 @@ package com.playlet.web.controller.app; import com.github.pagehelper.PageInfo; -import com.playlet.common.annotation.Log; -import com.playlet.common.core.controller.BaseController; -import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; -import com.playlet.common.core.page.TableDataInfo; -import com.playlet.common.enums.BusinessType; import com.playlet.system.domain.PlayletUserAccount; import com.playlet.web.service.app.PlayletUserAccountAppService; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,16 +20,10 @@ import java.util.List; */ @Controller @RequestMapping("/app/account") -public class PlayletUserAccountAppController extends BaseController { - private String prefix = "system/account"; +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletUserAccountAppController { - @Autowired - private PlayletUserAccountAppService playletUserAccountAppService; - - @GetMapping() - public String account() { - return prefix + "/account"; - } + private final PlayletUserAccountAppService playletUserAccountAppService; /** * 查询用户提现基础列表 @@ -54,61 +43,40 @@ public class PlayletUserAccountAppController extends BaseController { @PostMapping("/list") @ResponseBody @ApiOperation(value = "查询短剧用户提现账户列表") - public TableDataInfo list(PlayletUserAccount playletUserAccount) { - startPage(); - List list = playletUserAccountAppService.selectPlayletUserAccountList(playletUserAccount); - return getDataTable(list); - } - - /** - * 新增短剧用户提现账户 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; + public Result> list(@RequestBody PlayletUserAccount playletUserAccount) { + return Result.success(playletUserAccountAppService.selectPlayletUserAccountList(playletUserAccount)); } /** * 新增保存短剧用户提现账户 */ - @Log(title = "短剧用户提现账户", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody @ApiOperation(value = "新增保存短剧用户提现账户") - public AjaxResult addSave(PlayletUserAccount playletUserAccount) { - return toAjax(playletUserAccountAppService.insertPlayletUserAccount(playletUserAccount)); - } - - /** - * 修改短剧用户提现账户 - */ - @GetMapping("/edit/{id}") - @ApiOperation(value = "修改短剧用户提现账户") - public String edit(@PathVariable("id") Long id, ModelMap mmap) { - PlayletUserAccount playletUserAccount = playletUserAccountAppService.selectPlayletUserAccountById(id); - mmap.put("playletUserAccount", playletUserAccount); - return prefix + "/edit"; + public Result addSave(@RequestBody PlayletUserAccount playletUserAccount) { + playletUserAccountAppService.insertPlayletUserAccount(playletUserAccount); + return Result.success(); } /** * 修改保存短剧用户提现账户 */ - @Log(title = "短剧用户提现账户", businessType = BusinessType.UPDATE) - @PostMapping("/edit") @ResponseBody + @PostMapping("/edit") @ApiOperation(value = "修改保存短剧用户提现账户") - public AjaxResult editSave(PlayletUserAccount playletUserAccount) { - return toAjax(playletUserAccountAppService.updatePlayletUserAccount(playletUserAccount)); + public Result editSave(@RequestBody PlayletUserAccount playletUserAccount) { + playletUserAccountAppService.updatePlayletUserAccount(playletUserAccount); + return Result.success(); } /** * 删除短剧用户提现账户 */ - @Log(title = "短剧用户提现账户", businessType = BusinessType.DELETE) - @PostMapping("/remove") @ResponseBody + @PostMapping("/remove") @ApiOperation(value = "删除短剧用户提现账户") - public AjaxResult remove(String ids) { - return toAjax(playletUserAccountAppService.deletePlayletUserAccountByIds(ids)); + public Result remove(@RequestParam(value = "id") Long id) { + playletUserAccountAppService.deletePlayletUserAccountById(id); + return Result.success(); } } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserInvoiceAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserInvoiceAppController.java index d4b3afb..dca3fd0 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserInvoiceAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserInvoiceAppController.java @@ -1,18 +1,14 @@ package com.playlet.web.controller.app; import com.github.pagehelper.PageInfo; -import com.playlet.common.annotation.Log; -import com.playlet.common.core.controller.BaseController; -import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; -import com.playlet.common.core.page.TableDataInfo; -import com.playlet.common.enums.BusinessType; import com.playlet.system.domain.PlayletUserInvoice; import com.playlet.web.service.app.PlayletUserInvoiceAppService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,24 +21,18 @@ import java.util.List; */ @Controller @RequestMapping("/app/invoice") -public class PlayletUserInvoiceAppController extends BaseController { +@Api(tags = "小程序*开票信息接口") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletUserInvoiceAppController { - private String prefix = "system/invoice"; - - @Autowired - private PlayletUserInvoiceAppService playletUserInvoiceAppService; - - @GetMapping() - public String invoice() { - return prefix + "/invoice"; - } + private final PlayletUserInvoiceAppService playletUserInvoiceAppService; /** * 查询用户开票信息基础列表 */ @ResponseBody @PostMapping("/getInvoiceList") - @ApiOperation(value = "分页查询短剧基础列表") + @ApiOperation(value = "分页查询开票信息") public Result> getInvoiceList(@RequestBody PlayletUserInvoice invoice, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { @@ -54,58 +44,43 @@ public class PlayletUserInvoiceAppController extends BaseController { */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(PlayletUserInvoice playletUserInvoice) { - startPage(); - List list = playletUserInvoiceAppService.selectPlayletUserInvoiceList(playletUserInvoice); - return getDataTable(list); + @ApiOperation(value = "查询开票信息列表") + public Result> list(@RequestBody PlayletUserInvoice playletUserInvoice) { + return Result.success(playletUserInvoiceAppService.selectPlayletUserInvoiceList(playletUserInvoice)); } - /** - * 新增用户开票信息 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } /** * 新增保存用户开票信息 */ - @Log(title = "用户开票信息", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(PlayletUserInvoice playletUserInvoice) { - return toAjax(playletUserInvoiceAppService.insertPlayletUserInvoice(playletUserInvoice)); - } - - /** - * 修改用户开票信息 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Long id, ModelMap mmap) { - PlayletUserInvoice playletUserInvoice = playletUserInvoiceAppService.selectPlayletUserInvoiceById(id); - mmap.put("playletUserInvoice", playletUserInvoice); - return prefix + "/edit"; + @ApiOperation(value = "新增开票信息") + public Result addSave(@RequestBody PlayletUserInvoice playletUserInvoice) { + playletUserInvoiceAppService.insertPlayletUserInvoice(playletUserInvoice); + return Result.success(); } /** * 修改保存用户开票信息 */ - @Log(title = "用户开票信息", businessType = BusinessType.UPDATE) - @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(PlayletUserInvoice playletUserInvoice) { - return toAjax(playletUserInvoiceAppService.updatePlayletUserInvoice(playletUserInvoice)); + @PostMapping("/edit") + @ApiOperation(value = "修改开票信息") + public Result editSave(@RequestBody PlayletUserInvoice playletUserInvoice) { + playletUserInvoiceAppService.updatePlayletUserInvoice(playletUserInvoice); + return Result.success(); } /** * 删除用户开票信息 */ - @Log(title = "用户开票信息", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) { - return toAjax(playletUserInvoiceAppService.deletePlayletUserInvoiceByIds(ids)); + @ApiOperation(value = "删除开票信息") + public Result remove(@RequestParam(value = "id") Long id) { + playletUserInvoiceAppService.deletePlayletUserInvoiceById(id); + return Result.success(); } } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawDepositRecordAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawDepositRecordAppController.java index fa166c5..f763b06 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawDepositRecordAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawDepositRecordAppController.java @@ -1,23 +1,14 @@ package com.playlet.web.controller.app; import com.github.pagehelper.PageInfo; -import com.playlet.common.annotation.Log; -import com.playlet.common.core.controller.BaseController; -import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; -import com.playlet.common.core.page.TableDataInfo; -import com.playlet.common.enums.BusinessType; -import com.playlet.common.utils.poi.ExcelUtil; -import com.playlet.system.domain.PlayletItem; import com.playlet.system.domain.PlayletUserWithdrawDepositRecord; -import com.playlet.system.service.IPlayletUserWithdrawDepositRecordService; import com.playlet.web.service.app.IPlayletUserWithdrawDepositRecordAppService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -29,18 +20,12 @@ import java.util.List; * @Description: 用户交易记录appController */ @Controller +@Api(tags = "小程序*用户交易记录") @RequestMapping("/app/userWithdrawRecord") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) -public class PlayletUserWithdrawDepositRecordAppController extends BaseController { - private String prefix = "system/record"; +public class PlayletUserWithdrawDepositRecordAppController { - private final IPlayletUserWithdrawDepositRecordAppService service; - - @RequiresPermissions("system:record:view") - @GetMapping() - public String record() { - return prefix + "/record"; - } + private final IPlayletUserWithdrawDepositRecordAppService depositRecordAppService; @ResponseBody @PostMapping("/getWithdrawDepositList") @@ -48,7 +33,7 @@ public class PlayletUserWithdrawDepositRecordAppController extends BaseControlle public Result> getWithdrawDepositList(@RequestBody PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize) { - return Result.success(service.getWithdrawDepositList(playletUserWithdrawDepositRecord, pageNum, pageSize)); + return Result.success(depositRecordAppService.getWithdrawDepositList(playletUserWithdrawDepositRecord, pageNum, pageSize)); } /** @@ -57,62 +42,42 @@ public class PlayletUserWithdrawDepositRecordAppController extends BaseControlle @PostMapping("/list") @ResponseBody @ApiOperation(value = "查询用户交易记录列表") - public TableDataInfo list(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { - startPage(); - List list = service.selectPlayletUserWithdrawDepositRecordList(playletUserWithdrawDepositRecord); - return getDataTable(list); + public Result> list(@RequestBody PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { + return Result.success(depositRecordAppService.selectPlayletUserWithdrawDepositRecordList(playletUserWithdrawDepositRecord)); } - /** - * 新增用户交易记录 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } - /** * 新增保存用户交易记录 */ - @Log(title = "用户交易记录", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody @ApiOperation(value = "新增保存用户交易记录") - public AjaxResult addSave(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { - return toAjax(service.insertPlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord)); - } - - /** - * 修改用户交易记录 - */ - @GetMapping("/edit/{id}") - @ApiOperation(value = "修改用户交易记录") - public String edit(@PathVariable("id") Long id, ModelMap mmap) { - PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord = service.selectPlayletUserWithdrawDepositRecordById(id); - mmap.put("playletUserWithdrawDepositRecord", playletUserWithdrawDepositRecord); - return prefix + "/edit"; + public Result addSave(@RequestBody PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { + depositRecordAppService.insertPlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord); + return Result.success(); } /** * 修改保存用户交易记录 */ - @Log(title = "用户交易记录", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody @ApiOperation(value = "修改保存用户交易记录") - public AjaxResult editSave(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { - return toAjax(service.updatePlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord)); + public Result editSave(@RequestBody PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { + depositRecordAppService.updatePlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord); + return Result.success(); } /** * 删除用户交易记录 */ - @Log(title = "用户交易记录", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody @ApiOperation(value = "删除用户交易记录") - public AjaxResult remove(String ids) { - return toAjax(service.deletePlayletUserWithdrawDepositRecordByIds(ids)); + public Result remove(@RequestParam(value = "id") Long id) { + depositRecordAppService.deletePlayletUserWithdrawDepositRecordById(id); + return Result.success(); } + } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawalPasswordAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawalPasswordAppController.java index 07fb1bd..a71b2ce 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawalPasswordAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserWithdrawalPasswordAppController.java @@ -1,26 +1,16 @@ package com.playlet.web.controller.app; -import com.playlet.common.annotation.Log; -import com.playlet.common.core.controller.BaseController; -import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; -import com.playlet.common.core.page.TableDataInfo; -import com.playlet.common.enums.BusinessType; -import com.playlet.common.utils.poi.ExcelUtil; import com.playlet.system.domain.PlayletUserWithdrawalPassword; -import com.playlet.system.service.IPlayletUserWithdrawalPasswordService; import com.playlet.web.service.app.IPlayletUserWithdrawalPasswordAppService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * @Date: 2024-03-30 12:27 * @Author: 但星霖 @@ -28,56 +18,33 @@ import java.util.List; * @Description: 用户提现密码app Controller */ @Controller +@Api(tags = "小程序*提现密码") @RequestMapping("/app/userWithdrawalPassword") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) -public class PlayletUserWithdrawalPasswordAppController extends BaseController { - private String prefix = "system/password"; +public class PlayletUserWithdrawalPasswordAppController { + private final IPlayletUserWithdrawalPasswordAppService appService; - @GetMapping() - public String password() { - return prefix + "/password"; - } - - /** - * 新增用户提现密码 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } - /** * 新增保存用户提现密码 */ - @Log(title = "用户提现密码", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody @ApiOperation(value = "新增保存用户提现密码") - public AjaxResult addSave(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { - return toAjax(appService.insertData(playletUserWithdrawalPassword)); - } - - /** - * 修改用户提现密码 - */ - @GetMapping("/edit/{id}") - @ApiOperation(value = "修改用户提现密码") - public String edit(@PathVariable("id") Long id, ModelMap mmap) { - PlayletUserWithdrawalPassword playletUserWithdrawalPassword = appService.selectPlayletUserWithdrawalPasswordById(id); - mmap.put("playletUserWithdrawalPassword", playletUserWithdrawalPassword); - return prefix + "/edit"; + public Result addSave(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { + appService.insertData(playletUserWithdrawalPassword); + return Result.success(); } /** * 修改保存用户提现密码 */ - @Log(title = "用户提现密码", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody @ApiOperation(value = "修改保存用户提现密码") - public AjaxResult editSave(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { - return toAjax(appService.updateData(playletUserWithdrawalPassword)); + public Result editSave(@RequestBody PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { + appService.updateData(playletUserWithdrawalPassword); + return Result.success(); } @ApiOperation(value = "用户确认密码") @@ -86,4 +53,5 @@ public class PlayletUserWithdrawalPasswordAppController extends BaseController { public Result statisticsTime(@RequestBody PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { return Result.success(appService.validatePassword(playletUserWithdrawalPassword)); } + } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAccountAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAccountAppService.java index fb0b1c6..52f47c4 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAccountAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserAccountAppService.java @@ -53,7 +53,7 @@ public interface PlayletUserAccountAppService { * @param id 短剧用户提现账户主键 * @return 结果 */ - int deletePlayletUserAccountById(Long id); + void deletePlayletUserAccountById(Long id); /** * 批量删除短剧用户提现账户 diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletPublicDetailAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletPublicDetailAppServiceImpl.java index 480f02d..16ec5fe 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletPublicDetailAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletPublicDetailAppServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.playlet.system.domain.PlayletPublicAccount; import com.playlet.system.domain.PlayletPublicDetail; +import com.playlet.system.service.IPlayletPublicAccountService; import com.playlet.system.service.IPlayletPublicDetailService; import com.playlet.web.service.app.PlayletPublicDetailAppService; import lombok.RequiredArgsConstructor; @@ -20,16 +21,23 @@ public class PlayletPublicDetailAppServiceImpl implements PlayletPublicDetailApp private final IPlayletPublicDetailService iPlayletPublicDetailService; + private final IPlayletPublicAccountService iPlayletPublicAccountService; + @Override public PageInfo getList(PlayletPublicDetail playletPublicDetail, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List list = iPlayletPublicDetailService.selectPlayletPublicDetailList(playletPublicDetail); + list.forEach(model->{ + model.setPlayletPublicAccount(iPlayletPublicAccountService.selectPlayletPublicAccountById(model.getPublicId())); + }); return PageInfo.of(list); } @Override public PlayletPublicDetail getById(Long id) { - return iPlayletPublicDetailService.getById(id); + PlayletPublicDetail model = iPlayletPublicDetailService.getById(id); + model.setPlayletPublicAccount(iPlayletPublicAccountService.selectPlayletPublicAccountById(model.getPublicId())); + return model; } } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAccountAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAccountAppServiceImpl.java index 706520e..edf45c7 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAccountAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserAccountAppServiceImpl.java @@ -63,7 +63,7 @@ public class PlayletUserAccountAppServiceImpl implements PlayletUserAccountAppSe } @Override - public int deletePlayletUserAccountById(Long id) { - return playletUserAccountService.deletePlayletUserAccountById(id); + public void deletePlayletUserAccountById(Long id) { + playletUserAccountService.removeById(id); } } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html index 4d2a883..5d5aa9d 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html @@ -27,24 +27,21 @@
- +
- -
+
- +
- -
+
- -
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html index e43b848..a5d328a 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html @@ -30,22 +30,19 @@
- -
+
- -
+
- -
+
diff --git a/playlet-framework/src/main/java/com/playlet/framework/config/ShiroConfig.java b/playlet-framework/src/main/java/com/playlet/framework/config/ShiroConfig.java index 844dd10..498e7db 100644 --- a/playlet-framework/src/main/java/com/playlet/framework/config/ShiroConfig.java +++ b/playlet-framework/src/main/java/com/playlet/framework/config/ShiroConfig.java @@ -288,6 +288,8 @@ public class ShiroConfig filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); + // 图片附件 + filterChainDefinitionMap.put("/profile/upload/**/**/**/**", "anon"); // 接口文档 filterChainDefinitionMap.put("/tool/swagger", "anon"); filterChainDefinitionMap.put("/tool/swagger/**", "anon"); diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicDetail.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicDetail.java index e295a7c..df355a9 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicDetail.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicDetail.java @@ -1,6 +1,7 @@ package com.playlet.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.playlet.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -53,5 +54,8 @@ public class PlayletPublicDetail extends BaseEntity @ApiModelProperty(value = "点赞数") private String starCount; + @TableField(exist = false) + @ApiModelProperty(value = "归属公众号信息") + private PlayletPublicAccount playletPublicAccount; }