From 4d606cde3afbc845da454abc5fb0741b6f0981f1 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Fri, 13 Sep 2024 11:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/config/shiro/ShiroConfig.java | 3 +- .../controller/AtComplaintLogController.java | 171 +++++++++ .../atComplaintLog/entity/AtComplaintLog.java | 71 ++++ .../mapper/AtComplaintLogMapper.java | 17 + .../mapper/xml/AtComplaintLogMapper.xml | 5 + .../service/IAtComplaintLogService.java | 14 + .../service/impl/AtComplaintLogServiceImpl.java | 19 + .../atComplaintLog/vue/AtComplaintLogList.vue | 196 +++++++++++ .../vue/modules/AtComplaintLogForm.vue | 124 +++++++ .../modules/AtComplaintLogModal.Style#Drawer.vue | 84 +++++ .../vue/modules/AtComplaintLogModal.vue | 60 ++++ .../atComplaintLog/vue3/AtComplaintLog.api.ts | 61 ++++ .../atComplaintLog/vue3/AtComplaintLog.data.ts | 66 ++++ .../atComplaintLog/vue3/AtComplaintLogList.vue | 162 +++++++++ .../vue3/components/AtComplaintLogModal.vue | 58 ++++ .../controller/AtMasterPieceController.java | 342 +++++++++--------- .../atMasterPiece/entity/AtMasterPiece.java | 137 ++++---- .../atMasterPiece/mapper/AtMasterPieceMapper.java | 34 +- .../mapper/xml/AtMasterPieceMapper.xml | 8 +- .../service/IAtMasterPieceService.java | 28 +- .../service/impl/AtMasterPieceServiceImpl.java | 38 +- .../atMasterPiece/vue/AtMasterPieceList.vue | 386 +++++++++++---------- .../vue/modules/AtMasterPieceForm.vue | 241 +++++++------ .../modules/AtMasterPieceModal.Style#Drawer.vue | 166 ++++----- .../vue/modules/AtMasterPieceModal.vue | 118 +++---- .../atMasterPiece/vue3/AtMasterPiece.api.ts | 122 +++---- .../atMasterPiece/vue3/AtMasterPiece.data.ts | 128 ++++--- .../atMasterPiece/vue3/AtMasterPieceList.vue | 322 ++++++++--------- .../vue3/components/AtMasterPieceModal.vue | 114 +++--- .../controller/AtThumbsLogController.java | 171 +++++++++ .../modules/atThumbsLog/entity/AtThumbsLog.java | 71 ++++ .../atThumbsLog/mapper/AtThumbsLogMapper.java | 17 + .../atThumbsLog/mapper/xml/AtThumbsLogMapper.xml | 5 + .../atThumbsLog/service/IAtThumbsLogService.java | 14 + .../service/impl/AtThumbsLogServiceImpl.java | 19 + .../modules/atThumbsLog/vue/AtThumbsLogList.vue | 196 +++++++++++ .../atThumbsLog/vue/modules/AtThumbsLogForm.vue | 124 +++++++ .../vue/modules/AtThumbsLogModal.Style#Drawer.vue | 84 +++++ .../atThumbsLog/vue/modules/AtThumbsLogModal.vue | 60 ++++ .../modules/atThumbsLog/vue3/AtThumbsLog.api.ts | 61 ++++ .../modules/atThumbsLog/vue3/AtThumbsLog.data.ts | 66 ++++ .../modules/atThumbsLog/vue3/AtThumbsLogList.vue | 162 +++++++++ .../vue3/components/AtThumbsLogModal.vue | 58 ++++ .../noticeapicontroller/IndexApiController.java | 16 +- .../api/noticeapicontroller/InfoApiController.java | 38 +- .../jeecg/modules/apiservice/IndexApiService.java | 8 +- .../jeecg/modules/apiservice/InfoApiService.java | 15 + .../apiservice/impl/IndexApiServiceImpl.java | 94 ++++- .../apiservice/impl/InfoApiServiceImpl.java | 88 +++++ 49 files changed, 3587 insertions(+), 1075 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/controller/AtComplaintLogController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/entity/AtComplaintLog.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/AtComplaintLogMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/xml/AtComplaintLogMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/IAtComplaintLogService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/impl/AtComplaintLogServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/AtComplaintLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/components/AtComplaintLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/controller/AtThumbsLogController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/entity/AtThumbsLog.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/AtThumbsLogMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/xml/AtThumbsLogMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/IAtThumbsLogService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/impl/AtThumbsLogServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/AtThumbsLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/components/AtThumbsLogModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index ac2ddd6..8cb0cdc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -73,9 +73,10 @@ public class ShiroConfig { } - //开启小程序不需要token的接口过滤 （现在先全开放后面再来改） + //开启小程序不需要token的接口过滤 （现在先全开放后面再来改）e filterChainDefinitionMap.put("/api/login/**", "anon"); filterChainDefinitionMap.put("/api/index/**", "anon"); + filterChainDefinitionMap.put("/api/order/**", "anon"); filterChainDefinitionMap.put("/api/info/**", "anon"); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/controller/AtComplaintLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/controller/AtComplaintLogController.java new file mode 100644 index 0000000..309ff21 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/controller/AtComplaintLogController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.atComplaintLog.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.atComplaintLog.entity.AtComplaintLog; +import org.jeecg.modules.atComplaintLog.service.IAtComplaintLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 举报投诉日志表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Api(tags="举报投诉日志表") +@RestController +@RequestMapping("/atComplaintLog/atComplaintLog") +@Slf4j +public class AtComplaintLogController extends JeecgController { + @Autowired + private IAtComplaintLogService atComplaintLogService; + + /** + * 分页列表查询 + * + * @param atComplaintLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "举报投诉日志表-分页列表查询") + @ApiOperation(value="举报投诉日志表-分页列表查询", notes="举报投诉日志表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AtComplaintLog atComplaintLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(atComplaintLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = atComplaintLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param atComplaintLog + * @return + */ + @AutoLog(value = "举报投诉日志表-添加") + @ApiOperation(value="举报投诉日志表-添加", notes="举报投诉日志表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody AtComplaintLog atComplaintLog) { + atComplaintLogService.save(atComplaintLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param atComplaintLog + * @return + */ + @AutoLog(value = "举报投诉日志表-编辑") + @ApiOperation(value="举报投诉日志表-编辑", notes="举报投诉日志表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AtComplaintLog atComplaintLog) { + atComplaintLogService.updateById(atComplaintLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "举报投诉日志表-通过id删除") + @ApiOperation(value="举报投诉日志表-通过id删除", notes="举报投诉日志表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + atComplaintLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "举报投诉日志表-批量删除") + @ApiOperation(value="举报投诉日志表-批量删除", notes="举报投诉日志表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.atComplaintLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "举报投诉日志表-通过id查询") + @ApiOperation(value="举报投诉日志表-通过id查询", notes="举报投诉日志表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AtComplaintLog atComplaintLog = atComplaintLogService.getById(id); + if(atComplaintLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(atComplaintLog); + } + + /** + * 导出excel + * + * @param request + * @param atComplaintLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AtComplaintLog atComplaintLog) { + return super.exportXls(request, atComplaintLog, AtComplaintLog.class, "举报投诉日志表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AtComplaintLog.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/entity/AtComplaintLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/entity/AtComplaintLog.java new file mode 100644 index 0000000..1069aa9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/entity/AtComplaintLog.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.atComplaintLog.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 举报投诉日志表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Data +@TableName("at_complaint_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="at_complaint_log对象", description="举报投诉日志表") +public class AtComplaintLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**类型 */ + @Excel(name = "类型 ", width = 15) + @ApiModelProperty(value = "类型 ") + private java.lang.Integer type; + /**举报溯源*/ + @Excel(name = "举报溯源", width = 15) + @ApiModelProperty(value = "举报溯源") + private java.lang.String orderId; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String complaint; + /**原因标识*/ + @Excel(name = "原因标识", width = 15) + @ApiModelProperty(value = "原因标识") + private java.lang.String complaintId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/AtComplaintLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/AtComplaintLogMapper.java new file mode 100644 index 0000000..6b184c7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/AtComplaintLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.atComplaintLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.atComplaintLog.entity.AtComplaintLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 举报投诉日志表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface AtComplaintLogMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/xml/AtComplaintLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/xml/AtComplaintLogMapper.xml new file mode 100644 index 0000000..7f39bf4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/mapper/xml/AtComplaintLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/IAtComplaintLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/IAtComplaintLogService.java new file mode 100644 index 0000000..a21c22f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/IAtComplaintLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.atComplaintLog.service; + +import org.jeecg.modules.atComplaintLog.entity.AtComplaintLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 举报投诉日志表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface IAtComplaintLogService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/impl/AtComplaintLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/impl/AtComplaintLogServiceImpl.java new file mode 100644 index 0000000..7c724f6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/service/impl/AtComplaintLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.atComplaintLog.service.impl; + +import org.jeecg.modules.atComplaintLog.entity.AtComplaintLog; +import org.jeecg.modules.atComplaintLog.mapper.AtComplaintLogMapper; +import org.jeecg.modules.atComplaintLog.service.IAtComplaintLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 举报投诉日志表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Service +public class AtComplaintLogServiceImpl extends ServiceImpl implements IAtComplaintLogService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/AtComplaintLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/AtComplaintLogList.vue new file mode 100644 index 0000000..4a2fab0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/AtComplaintLogList.vue @@ -0,0 +1,196 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogForm.vue new file mode 100644 index 0000000..a032214 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.Style#Drawer.vue new file mode 100644 index 0000000..fdc7640 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.vue new file mode 100644 index 0000000..43d724f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue/modules/AtComplaintLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.api.ts new file mode 100644 index 0000000..8cf9630 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/atComplaintLog/atComplaintLog/list', + save='/atComplaintLog/atComplaintLog/add', + edit='/atComplaintLog/atComplaintLog/edit', + deleteOne = '/atComplaintLog/atComplaintLog/delete', + deleteBatch = '/atComplaintLog/atComplaintLog/deleteBatch', + importExcel = '/atComplaintLog/atComplaintLog/importExcel', + exportXls = '/atComplaintLog/atComplaintLog/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.data.ts new file mode 100644 index 0000000..907e3c0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLog.data.ts @@ -0,0 +1,66 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '类型 ', + align:"center", + dataIndex: 'type' + }, + { + title: '举报溯源', + align:"center", + dataIndex: 'orderId' + }, + { + title: '内容', + align:"center", + dataIndex: 'complaint' + }, + { + title: '原因标识', + align:"center", + dataIndex: 'complaintId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '类型 ', + field: 'type', + component: 'InputNumber', + }, + { + label: '举报溯源', + field: 'orderId', + component: 'Input', + }, + { + label: '内容', + field: 'complaint', + component: 'Input', + }, + { + label: '原因标识', + field: 'complaintId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLogList.vue new file mode 100644 index 0000000..1156abd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/AtComplaintLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/components/AtComplaintLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/components/AtComplaintLogModal.vue new file mode 100644 index 0000000..59aeaca --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintLog/vue3/components/AtComplaintLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java index fee7f5f..dc6c3a1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java @@ -1,171 +1,171 @@ -package org.jeecg.modules.atMasterPiece.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; -import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 代表作品表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -@Api(tags="代表作品表") -@RestController -@RequestMapping("/atMasterPiece/atMasterPiece") -@Slf4j -public class AtMasterPieceController extends JeecgController { - @Autowired - private IAtMasterPieceService atMasterPieceService; - - /** - * 分页列表查询 - * - * @param atMasterPiece - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "代表作品表-分页列表查询") - @ApiOperation(value="代表作品表-分页列表查询", notes="代表作品表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(AtMasterPiece atMasterPiece, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(atMasterPiece, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = atMasterPieceService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param atMasterPiece - * @return - */ - @AutoLog(value = "代表作品表-添加") - @ApiOperation(value="代表作品表-添加", notes="代表作品表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody AtMasterPiece atMasterPiece) { - atMasterPieceService.save(atMasterPiece); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param atMasterPiece - * @return - */ - @AutoLog(value = "代表作品表-编辑") - @ApiOperation(value="代表作品表-编辑", notes="代表作品表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody AtMasterPiece atMasterPiece) { - atMasterPieceService.updateById(atMasterPiece); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "代表作品表-通过id删除") - @ApiOperation(value="代表作品表-通过id删除", notes="代表作品表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - atMasterPieceService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "代表作品表-批量删除") - @ApiOperation(value="代表作品表-批量删除", notes="代表作品表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.atMasterPieceService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "代表作品表-通过id查询") - @ApiOperation(value="代表作品表-通过id查询", notes="代表作品表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - AtMasterPiece atMasterPiece = atMasterPieceService.getById(id); - if(atMasterPiece==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(atMasterPiece); - } - - /** - * 导出excel - * - * @param request - * @param atMasterPiece - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, AtMasterPiece atMasterPiece) { - return super.exportXls(request, atMasterPiece, AtMasterPiece.class, "代表作品表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, AtMasterPiece.class); - } - -} +package org.jeecg.modules.atMasterPiece.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; +import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 代表作品表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Api(tags="代表作品表") +@RestController +@RequestMapping("/atMasterPiece/atMasterPiece") +@Slf4j +public class AtMasterPieceController extends JeecgController { + @Autowired + private IAtMasterPieceService atMasterPieceService; + + /** + * 分页列表查询 + * + * @param atMasterPiece + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "代表作品表-分页列表查询") + @ApiOperation(value="代表作品表-分页列表查询", notes="代表作品表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AtMasterPiece atMasterPiece, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(atMasterPiece, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = atMasterPieceService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param atMasterPiece + * @return + */ + @AutoLog(value = "代表作品表-添加") + @ApiOperation(value="代表作品表-添加", notes="代表作品表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody AtMasterPiece atMasterPiece) { + atMasterPieceService.save(atMasterPiece); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param atMasterPiece + * @return + */ + @AutoLog(value = "代表作品表-编辑") + @ApiOperation(value="代表作品表-编辑", notes="代表作品表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AtMasterPiece atMasterPiece) { + atMasterPieceService.updateById(atMasterPiece); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "代表作品表-通过id删除") + @ApiOperation(value="代表作品表-通过id删除", notes="代表作品表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + atMasterPieceService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "代表作品表-批量删除") + @ApiOperation(value="代表作品表-批量删除", notes="代表作品表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.atMasterPieceService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "代表作品表-通过id查询") + @ApiOperation(value="代表作品表-通过id查询", notes="代表作品表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AtMasterPiece atMasterPiece = atMasterPieceService.getById(id); + if(atMasterPiece==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(atMasterPiece); + } + + /** + * 导出excel + * + * @param request + * @param atMasterPiece + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AtMasterPiece atMasterPiece) { + return super.exportXls(request, atMasterPiece, AtMasterPiece.class, "代表作品表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AtMasterPiece.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java index d9acb07..eb7259e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java @@ -1,62 +1,75 @@ -package org.jeecg.modules.atMasterPiece.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 代表作品表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -@Data -@TableName("at_masterpiece") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="at_masterpiece对象", description="代表作品表") -public class AtMasterPiece implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**用户*/ - @Excel(name = "用户", width = 15) - @ApiModelProperty(value = "用户") - private java.lang.String userId; - /**作品图片*/ - @Excel(name = "作品图片", width = 15) - @ApiModelProperty(value = "作品图片") - private java.lang.String image; - /**作品标题*/ - @Excel(name = "作品标题", width = 15) - @ApiModelProperty(value = "作品标题") - private java.lang.String title; -} +package org.jeecg.modules.atMasterPiece.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 代表作品表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Data +@TableName("at_masterpiece") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="at_masterpiece对象", description="代表作品表") +public class AtMasterPiece implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**作品图片*/ + @Excel(name = "作品图片", width = 15) + @ApiModelProperty(value = "作品图片") + private java.lang.String image; + /**作品标题*/ + @Excel(name = "作品标题", width = 15) + @ApiModelProperty(value = "作品标题") + private java.lang.String title; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String vod; + /**文本内容*/ + @Excel(name = "文本内容", width = 15) + @ApiModelProperty(value = "文本内容") + private java.lang.String context; + /**投票次数*/ + @Excel(name = "投票次数", width = 15) + @ApiModelProperty(value = "投票次数") + private java.lang.Integer num; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java index f3620d1..21b7bc0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java @@ -1,17 +1,17 @@ -package org.jeecg.modules.atMasterPiece.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 代表作品表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -public interface AtMasterPieceMapper extends BaseMapper { - -} +package org.jeecg.modules.atMasterPiece.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 代表作品表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface AtMasterPieceMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/xml/AtMasterPieceMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/xml/AtMasterPieceMapper.xml index 2b73f45..3751d5c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/xml/AtMasterPieceMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/xml/AtMasterPieceMapper.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java index a7d2efd..bf46b87 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.atMasterPiece.service; - -import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 代表作品表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -public interface IAtMasterPieceService extends IService { - -} +package org.jeecg.modules.atMasterPiece.service; + +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 代表作品表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface IAtMasterPieceService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java index b57bf05..6b0fc8b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java @@ -1,19 +1,19 @@ -package org.jeecg.modules.atMasterPiece.service.impl; - -import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; -import org.jeecg.modules.atMasterPiece.mapper.AtMasterPieceMapper; -import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 代表作品表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -@Service -public class AtMasterPieceServiceImpl extends ServiceImpl implements IAtMasterPieceService { - -} +package org.jeecg.modules.atMasterPiece.service.impl; + +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; +import org.jeecg.modules.atMasterPiece.mapper.AtMasterPieceMapper; +import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 代表作品表 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Service +public class AtMasterPieceServiceImpl extends ServiceImpl implements IAtMasterPieceService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue index 22916bb..cb479ba 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue @@ -1,184 +1,204 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue index 8c1ce0c..6dcb7c5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue @@ -1,114 +1,129 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.Style#Drawer.vue index 2ea2aaa..232b398 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.Style#Drawer.vue @@ -1,84 +1,84 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.vue index d0276e3..d3478f7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceModal.vue @@ -1,60 +1,60 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.api.ts index 52f99f0..d60332f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.api.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.api.ts @@ -1,61 +1,61 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/atMasterPiece/atMasterPiece/list', - save='/atMasterPiece/atMasterPiece/add', - edit='/atMasterPiece/atMasterPiece/edit', - deleteOne = '/atMasterPiece/atMasterPiece/delete', - deleteBatch = '/atMasterPiece/atMasterPiece/deleteBatch', - importExcel = '/atMasterPiece/atMasterPiece/importExcel', - exportXls = '/atMasterPiece/atMasterPiece/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/atMasterPiece/atMasterPiece/list', + save='/atMasterPiece/atMasterPiece/add', + edit='/atMasterPiece/atMasterPiece/edit', + deleteOne = '/atMasterPiece/atMasterPiece/delete', + deleteBatch = '/atMasterPiece/atMasterPiece/deleteBatch', + importExcel = '/atMasterPiece/atMasterPiece/importExcel', + exportXls = '/atMasterPiece/atMasterPiece/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts index 7ca7ac6..3c6b355 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts @@ -1,46 +1,82 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '用户', - align:"center", - dataIndex: 'userId' - }, - { - title: '作品图片', - align:"center", - dataIndex: 'image', - customRender:render.renderAvatar, - }, - { - title: '作品标题', - align:"center", - dataIndex: 'title' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '用户', - field: 'userId', - component: 'Input', - }, - { - label: '作品图片', - field: 'image', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '作品标题', - field: 'title', - component: 'Input', - }, -]; +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '作品图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '作品标题', + align:"center", + dataIndex: 'title' + }, + { + title: '视频', + align:"center", + dataIndex: 'vod', + slots: { customRender: 'fileSlot' }, + }, + { + title: '文本内容', + align:"center", + dataIndex: 'context' + }, + { + title: '投票次数', + align:"center", + dataIndex: 'num' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '作品图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '作品标题', + field: 'title', + component: 'Input', + }, + { + label: '视频', + field: 'vod', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '文本内容', + field: 'context', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '投票次数', + field: 'num', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPieceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPieceList.vue index a872f6b..8ff9b5d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPieceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPieceList.vue @@ -1,162 +1,162 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/components/AtMasterPieceModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/components/AtMasterPieceModal.vue index 97a7305..7ff6338 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/components/AtMasterPieceModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/components/AtMasterPieceModal.vue @@ -1,58 +1,58 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/controller/AtThumbsLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/controller/AtThumbsLogController.java new file mode 100644 index 0000000..260ae99 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/controller/AtThumbsLogController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.atThumbsLog.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import org.jeecg.modules.atThumbsLog.service.IAtThumbsLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 点赞记录 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Api(tags="点赞记录") +@RestController +@RequestMapping("/atThumbsLog/atThumbsLog") +@Slf4j +public class AtThumbsLogController extends JeecgController { + @Autowired + private IAtThumbsLogService atThumbsLogService; + + /** + * 分页列表查询 + * + * @param atThumbsLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "点赞记录-分页列表查询") + @ApiOperation(value="点赞记录-分页列表查询", notes="点赞记录-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(AtThumbsLog atThumbsLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(atThumbsLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = atThumbsLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param atThumbsLog + * @return + */ + @AutoLog(value = "点赞记录-添加") + @ApiOperation(value="点赞记录-添加", notes="点赞记录-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody AtThumbsLog atThumbsLog) { + atThumbsLogService.save(atThumbsLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param atThumbsLog + * @return + */ + @AutoLog(value = "点赞记录-编辑") + @ApiOperation(value="点赞记录-编辑", notes="点赞记录-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody AtThumbsLog atThumbsLog) { + atThumbsLogService.updateById(atThumbsLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "点赞记录-通过id删除") + @ApiOperation(value="点赞记录-通过id删除", notes="点赞记录-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + atThumbsLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "点赞记录-批量删除") + @ApiOperation(value="点赞记录-批量删除", notes="点赞记录-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.atThumbsLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "点赞记录-通过id查询") + @ApiOperation(value="点赞记录-通过id查询", notes="点赞记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + AtThumbsLog atThumbsLog = atThumbsLogService.getById(id); + if(atThumbsLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(atThumbsLog); + } + + /** + * 导出excel + * + * @param request + * @param atThumbsLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AtThumbsLog atThumbsLog) { + return super.exportXls(request, atThumbsLog, AtThumbsLog.class, "点赞记录"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AtThumbsLog.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/entity/AtThumbsLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/entity/AtThumbsLog.java new file mode 100644 index 0000000..71d8a4c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/entity/AtThumbsLog.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.atThumbsLog.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 点赞记录 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Data +@TableName("at_thumbs_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="at_thumbs_log对象", description="点赞记录") +public class AtThumbsLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**类型*/ + @Excel(name = "类型", width = 15) + @ApiModelProperty(value = "类型") + private java.lang.Integer type; + /**溯源标识*/ + @Excel(name = "溯源标识", width = 15) + @ApiModelProperty(value = "溯源标识") + private java.lang.String orderId; + /**点赞名称*/ + @Excel(name = "点赞名称", width = 15) + @ApiModelProperty(value = "点赞名称") + private java.lang.String orderName; + /**点赞/踩*/ + @Excel(name = "点赞/踩", width = 15) + @ApiModelProperty(value = "点赞/踩") + private java.lang.String isState; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/AtThumbsLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/AtThumbsLogMapper.java new file mode 100644 index 0000000..cf049a9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/AtThumbsLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.atThumbsLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 点赞记录 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface AtThumbsLogMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/xml/AtThumbsLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/xml/AtThumbsLogMapper.xml new file mode 100644 index 0000000..feab24b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/mapper/xml/AtThumbsLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/IAtThumbsLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/IAtThumbsLogService.java new file mode 100644 index 0000000..222dfd7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/IAtThumbsLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.atThumbsLog.service; + +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 点赞记录 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +public interface IAtThumbsLogService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/impl/AtThumbsLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/impl/AtThumbsLogServiceImpl.java new file mode 100644 index 0000000..8769b55 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/service/impl/AtThumbsLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.atThumbsLog.service.impl; + +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import org.jeecg.modules.atThumbsLog.mapper.AtThumbsLogMapper; +import org.jeecg.modules.atThumbsLog.service.IAtThumbsLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 点赞记录 + * @Author: jeecg-boot + * @Date: 2024-09-12 + * @Version: V1.0 + */ +@Service +public class AtThumbsLogServiceImpl extends ServiceImpl implements IAtThumbsLogService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/AtThumbsLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/AtThumbsLogList.vue new file mode 100644 index 0000000..b276db3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/AtThumbsLogList.vue @@ -0,0 +1,196 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogForm.vue new file mode 100644 index 0000000..a374906 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.Style#Drawer.vue new file mode 100644 index 0000000..da60b38 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.vue new file mode 100644 index 0000000..faa98bd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue/modules/AtThumbsLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.api.ts new file mode 100644 index 0000000..74a1baf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/atThumbsLog/atThumbsLog/list', + save='/atThumbsLog/atThumbsLog/add', + edit='/atThumbsLog/atThumbsLog/edit', + deleteOne = '/atThumbsLog/atThumbsLog/delete', + deleteBatch = '/atThumbsLog/atThumbsLog/deleteBatch', + importExcel = '/atThumbsLog/atThumbsLog/importExcel', + exportXls = '/atThumbsLog/atThumbsLog/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.data.ts new file mode 100644 index 0000000..7606c08 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLog.data.ts @@ -0,0 +1,66 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '类型', + align:"center", + dataIndex: 'type' + }, + { + title: '溯源标识', + align:"center", + dataIndex: 'orderId' + }, + { + title: '点赞名称', + align:"center", + dataIndex: 'orderName' + }, + { + title: '点赞/踩', + align:"center", + dataIndex: 'isState' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '类型', + field: 'type', + component: 'InputNumber', + }, + { + label: '溯源标识', + field: 'orderId', + component: 'Input', + }, + { + label: '点赞名称', + field: 'orderName', + component: 'Input', + }, + { + label: '点赞/踩', + field: 'isState', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLogList.vue new file mode 100644 index 0000000..23b1213 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/AtThumbsLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/components/AtThumbsLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/components/AtThumbsLogModal.vue new file mode 100644 index 0000000..be5577c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atThumbsLog/vue3/components/AtThumbsLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java index 318867d..2b85647 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java @@ -52,26 +52,26 @@ public class IndexApiController { //获取动态详情 @ApiOperation(value="小程序-获取动态详情", notes="小程序-获取动态详情") @GetMapping("/getTrendsDetail") - public Result getTrendsDetail(String id) + public Result getTrendsDetail(String id,String token) { - return indexApiService.getTrendsDetail(id); + return indexApiService.getTrendsDetail(id,token); } //获取代表作品带分页 @ApiOperation(value="小程序-获取代表作品带分页", notes="小程序-获取代表作品带分页") @GetMapping("/getWorkPage") - public Result getWorkPage(String id,String token,WaterPageBean bean) + public Result getWorkPage(String id,WaterPageBean bean) { - return indexApiService.getWorkPage(token,bean); + return indexApiService.getWorkPage(bean); } //获取代表作品详情 @ApiOperation(value="小程序-获取代表作品详情", notes="小程序-获取代表作品详情") @GetMapping("/getWorkDetail") - public Result getWorkDetail(String id) + public Result getWorkDetail(String id,String token) { - return indexApiService.getWorkDetail(id); + return indexApiService.getWorkDetail(id,token); } //获取演员集带分页 @@ -87,9 +87,9 @@ public class IndexApiController { //获取演员集详情接口 @ApiOperation(value="小程序-获取演员集详情接口", notes="小程序-获取演员集详情接口") @GetMapping("/getActorDetail") - public Result getActorDetail(String id) + public Result getActorDetail(String id,String token) { - return indexApiService.getActorDetail(id); + return indexApiService.getActorDetail(id,token); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java index 7079d47..d0fa68f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java @@ -8,6 +8,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.*; import org.jeecg.modules.apiservice.InfoApiService; import org.jeecg.modules.atActorCollection.entity.AtActorCollection; +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.hanHaiBank.entity.HanHaiBank; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -190,11 +191,42 @@ public class InfoApiController { } - //举报 - //点赞 + //发布作品 + @ApiOperation(value="小程序-发布作品", notes="小程序-发布作品") + @PostMapping("/releaseWorks") + public Result releaseWorks(@RequestHeader("X-Access-Token") String token, AtMasterPiece atWorks) + { + return infoApiService.releaseWorks(token,atWorks); + } + + + + //点赞 - 作品0/演员1/动态2 + @ApiOperation(value="小程序-点赞type-作品0/演员1/动态2", notes="小程序-点赞-作品0/演员1/动态2") + @GetMapping("/like") + public Result like(@RequestHeader("X-Access-Token") String token, String id, Integer type) + { + return infoApiService.like(token,id,type); + } - //踩 + //踩 - 作品0/演员1/动态2 + @ApiOperation(value="小程序-踩type-作品0/演员1/动态2", notes="小程序-踩-作品0/演员1/动态2") + @GetMapping("/dislike") + public Result dislike(@RequestHeader("X-Access-Token") String token, String id, Integer type) + { + return infoApiService.dislike(token,id,type); + } + + + + //举报 - 作品0/演员1/动态2 + @ApiOperation(value="小程序-举报type-作品0/演员1/动态2", notes="小程序-举报-作品0/演员1/动态2") + @GetMapping("/report") + public Result report(@RequestHeader("X-Access-Token") String token, String id, Integer type) + { + return infoApiService.report(token,id,type); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java index 440b614..d6bb600 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java @@ -18,19 +18,19 @@ public interface IndexApiService { Result getTrendsPage(TrendsBean bean); //获取动态详情 - Result getTrendsDetail(String id); + Result getTrendsDetail(String id,String token); //获取代表作品带分页 - Result getWorkPage(String token, WaterPageBean bean); + Result getWorkPage( WaterPageBean bean); //获取代表作品详情 - Result getWorkDetail(String id); + Result getWorkDetail(String id,String token); //获取演员集带分页 Result getActorSetPage(ActorSetPageBean bean); //获取演员集详情接口 - Result getActorDetail(String id); + Result getActorDetail(String id,String token); //获取投诉原因 Result getComplaintReason(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java index a31ffc2..b14cd9b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java @@ -3,6 +3,7 @@ package org.jeecg.modules.apiservice; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.*; import org.jeecg.modules.atActorCollection.entity.AtActorCollection; +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.hanHaiBank.entity.HanHaiBank; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -67,4 +68,18 @@ public interface InfoApiService { //发布演员集 Result releaseActorSet(String token, AtActorCollection atActorCollection); + //发布作品 + Result releaseWorks(String token, AtMasterPiece atWorks); + + //点赞 + Result like(String token, String id, Integer type); + + + //踩 + Result dislike(String token, String id, Integer type); + + + //举报 + Result report( String token, String id, Integer type); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index 5b68474..9acac0e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -19,6 +19,8 @@ import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; import org.jeecg.modules.atPerformer.entity.AtPerformer; import org.jeecg.modules.atPerformer.service.IAtPerformerService; import org.jeecg.modules.atPromotion.service.IAtPromotionService; +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import org.jeecg.modules.atThumbsLog.service.IAtThumbsLogService; import org.jeecg.modules.atTopPrice.service.IAtTopPriceService; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; @@ -75,6 +77,9 @@ public class IndexApiServiceImpl implements IndexApiService { //获取置顶 @Resource private IAtTopPriceService atTopPriceService; + //点赞 + @Resource + private IAtThumbsLogService atThumbsLogService; @@ -97,36 +102,84 @@ public class IndexApiServiceImpl implements IndexApiService { public Result getTrendsPage(TrendsBean bean){ Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atTrendsService.page(page); + List records = pageList.getRecords(); +// for (AtTrends atTrends:records) { +// atTrends.setUserId(hanHaiMemberService +// .lambdaQuery() +// .eq(HanHaiMember::getId,atTrends.getUserId()).one().getNickName()); +// } + pageList.setRecords(records); return Result.OK("动态列表", pageList); } //获取动态详情 @Override - public Result getTrendsDetail(String id){ + public Result getTrendsDetail(String id,String token){ AtTrends byId = atTrendsService.getById(id); //根据用户标识查询发布人信息 HanHaiMember byId1 = hanHaiMemberService.getById(byId.getUserId()); byId.setUserId(byId1.getNickName()); - return Result.OK("动态详情", byId); + + + + Map map = new HashMap<>(); + //作品0/演员1/动态2 + if (StringUtils.isNotBlank(token)){ + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + AtThumbsLog one = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "2") + .eq(AtThumbsLog::getIsState, "0") + .one(); + map.put("isThumbs_up", one); + AtThumbsLog one2 = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "2") + .eq(AtThumbsLog::getIsState, "1") + .one(); + map.put("isThumbs_down", one2); + + } + + map.put("details", byId); + return Result.OK("动态详情", map); } //获取代表作品带分页 @Override - public Result getWorkPage(String token, WaterPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getWorkPage(WaterPageBean bean){ Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atMasterPieceService .lambdaQuery() - .orderByDesc(AtMasterPiece::getCreateTime) + .orderByDesc(AtMasterPiece::getNum) .page(page); return Result.OK("作品列表", pageList); } //获取代表作品详情 @Override - public Result getWorkDetail(String id){ + public Result getWorkDetail(String id,String token){ AtMasterPiece byId = atMasterPieceService.getById(id); - return Result.OK("作品详情", byId); + Map map = new HashMap<>(); + //作品0/演员1/动态2 + if (StringUtils.isNotBlank(token)){ + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + AtThumbsLog one = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "0") + .eq(AtThumbsLog::getIsState, "0") + .one(); + map.put("isThumbs_up", one); + AtThumbsLog one2 = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "0") + .eq(AtThumbsLog::getIsState, "1") + .one(); + map.put("isThumbs_down", one2); + + } + map.put("details", byId); + return Result.OK("作品详情", map); } //获取投诉原因 @@ -148,9 +201,32 @@ public class IndexApiServiceImpl implements IndexApiService { //获取演员集详情接口 @Override - public Result getActorDetail(String id){ + public Result getActorDetail(String id,String token){ AtActorCollection byId = atActorCollectionService.getById(id); - return Result.OK("演员集详情", byId); + //根据用户标识查询发布人信息 + HanHaiMember byId1 = hanHaiMemberService.getById(byId.getUserId()); + byId.setUserId(byId1.getNickName()); + + Map map = new HashMap<>(); + //作品0/演员1/动态2 + if (StringUtils.isNotBlank(token)){ + HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + AtThumbsLog one = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "0") + .eq(AtThumbsLog::getIsState, "0") + .one(); + map.put("isThumbs_up", one); + AtThumbsLog one2 = atThumbsLogService.lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, "0") + .eq(AtThumbsLog::getIsState, "1") + .one(); + map.put("isThumbs_down", one2); + + } + map.put("details", byId); + return Result.OK("演员集详情", map); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 0af7a96..54bd457 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -9,8 +9,14 @@ import org.jeecg.modules.apiBean.*; import org.jeecg.modules.apiservice.InfoApiService; import org.jeecg.modules.atActorCollection.entity.AtActorCollection; import org.jeecg.modules.atActorCollection.service.IAtActorCollectionService; +import org.jeecg.modules.atComplaintLog.entity.AtComplaintLog; +import org.jeecg.modules.atComplaintLog.service.IAtComplaintLogService; +import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; +import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; import org.jeecg.modules.atPromotion.entity.AtPromotion; import org.jeecg.modules.atPromotion.service.IAtPromotionService; +import org.jeecg.modules.atThumbsLog.entity.AtThumbsLog; +import org.jeecg.modules.atThumbsLog.service.IAtThumbsLogService; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.hanHaiBank.entity.HanHaiBank; @@ -72,6 +78,16 @@ public class InfoApiServiceImpl implements InfoApiService { @Autowired private MpWxPayService mpWxPayService; + //发布作品 + @Autowired + private IAtMasterPieceService iAtMasterpieceService; + //点赞 + @Resource + private IAtThumbsLogService atThumbsLogService; + //举报 + @Resource + private IAtComplaintLogService atComplaintLogService; + @@ -385,4 +401,76 @@ public class InfoApiServiceImpl implements InfoApiService { atActorCollectionService.save(atActorCollection); return Result.OK("动态发布成功"); } + + + //发布作品 + @Override + public Result releaseWorks(String token, AtMasterPiece atWorks){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + atWorks.setUserId(hanHaiMember.getId()); + iAtMasterpieceService.save(atWorks); + return Result.OK("作品发布成功"); + } + + + //点赞 + @Override + public Result like(String token, String id, Integer type){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + AtThumbsLog one = atThumbsLogService + .lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, type) + .eq(AtThumbsLog::getIsState, "0") + .one(); + if (one != null){ + return Result.error("您已经点过赞了"); + } + AtThumbsLog newOne = new AtThumbsLog(); + newOne.setUserId(hanHaiMember.getId()); + newOne.setType(type); + newOne.setOrderId(id); + newOne.setIsState("0"); + newOne.setCreateTime(new Date()); + atThumbsLogService.save(newOne); + return Result.OK("点赞成功"); + } + + + //踩 + @Override + public Result dislike(String token, String id, Integer type){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + AtThumbsLog one = atThumbsLogService + .lambdaQuery() + .eq(AtThumbsLog::getUserId, hanHaiMember.getId()) + .eq(AtThumbsLog::getType, type) + .eq(AtThumbsLog::getIsState, "1") + .one(); + if (one != null){ + return Result.error("您已经踩过了"); + } + AtThumbsLog newOne = new AtThumbsLog(); + newOne.setUserId(hanHaiMember.getId()); + newOne.setType(type); + newOne.setOrderId(id); + newOne.setIsState("1"); + newOne.setCreateTime(new Date()); + atThumbsLogService.save(newOne); + return Result.OK("踩成功"); + } + + + //举报 + @Override + public Result report( String token, String id, Integer type){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + AtComplaintLog newOne = new AtComplaintLog(); + newOne.setUserId(hanHaiMember.getId()); + newOne.setType(type); + newOne.setOrderId(id); + newOne.setCreateTime(new Date()); + atComplaintLogService.save(newOne); + return Result.OK("踩成功"); + } }