From f8bf76728a239a38cfda18e4033c2494477ef275 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Tue, 26 Nov 2024 15:48:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=89=B9=E8=89=B2=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B5=8F=E8=A7=88=E7=BB=9F=E8=AE=A1):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E5=8C=BA=E7=94=A8=E6=88=B7=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: OTTO <731554297@qq.com> --- .../common/controller/OpenController.java | 14 +++ .../controller/ZoneVisitsController.java | 91 ------------------- .../zone/common/domain/ZoneVisits.java | 67 +++----------- .../common/domain/vo/ZoneVisitsInputVo.java | 52 +++++++++++ .../common/service/IZoneVisitsService.java | 41 --------- .../service/impl/ZoneVisitsServiceImpl.java | 57 ------------ 6 files changed, 81 insertions(+), 241 deletions(-) delete mode 100644 microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/ZoneVisitsController.java create mode 100644 microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/vo/ZoneVisitsInputVo.java diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/OpenController.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/OpenController.java index bdde7276f..dfac84dab 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/OpenController.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/OpenController.java @@ -9,6 +9,8 @@ import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.log.annotation.Log; import com.microservices.common.log.enums.BusinessType; import com.microservices.system.api.domain.SysUser; +import com.microservices.zone.common.domain.vo.ZoneVisitsInputVo; +import com.microservices.zone.common.service.IZoneVisitsService; import com.microservices.zone.dataset.domain.vo.ZoneDataSetProjectVo; import com.microservices.zone.dataset.service.IZoneDataSetService; import com.microservices.zone.detail.domain.vo.ZoneBaseDataVo; @@ -90,6 +92,18 @@ public class OpenController extends BaseController { private IZoneSpecialProjectRelevancyService zoneSpecialProjectRelevancyService; @Autowired private IZoneSpecialProjectReportService zoneSpecialProjectReportService; + @Autowired + private IZoneVisitsService zoneVisitsService; + + /** + * 新增特色专区用户浏览 + */ + @Log(title = "特色专区用户浏览", businessType = BusinessType.INSERT) + @PostMapping("/zoneVisits") + @ApiOperation(value = "新增特色专区用户浏览") + public AjaxResult add(@RequestBody @Validated ZoneVisitsInputVo zoneVisitsInputVo) { + return toAjax(zoneVisitsService.insertZoneVisits(zoneVisitsInputVo.toZoneVisits())); + } /** diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/ZoneVisitsController.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/ZoneVisitsController.java deleted file mode 100644 index 7ee42f88c..000000000 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/controller/ZoneVisitsController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.microservices.zone.common.controller; - -import com.microservices.common.core.utils.poi.ExcelUtil; -import com.microservices.common.core.web.controller.BaseController; -import com.microservices.common.core.web.domain.AjaxResult; -import com.microservices.common.core.web.page.TableDataInfo; -import com.microservices.common.log.annotation.Log; -import com.microservices.common.log.enums.BusinessType; -import com.microservices.common.security.annotation.RequiresPermissions; -import com.microservices.zone.common.domain.ZoneVisits; -import com.microservices.zone.common.service.IZoneVisitsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 特色专区用户浏览Controller - * - * @author otto - * @date 2024-11-26 - */ -@RestController -@RequestMapping("/zoneVisits") -public class ZoneVisitsController extends BaseController { - @Autowired - private IZoneVisitsService zoneVisitsService; - - /** - * 查询特色专区用户浏览列表 - */ - @RequiresPermissions("zone:zoneVisits:list") - @GetMapping("/list") - public TableDataInfo list(ZoneVisits zoneVisits) { - startPage(); - List list = zoneVisitsService.selectZoneVisitsList(zoneVisits); - return getDataTable(list); - } - - /** - * 导出特色专区用户浏览列表 - */ - @RequiresPermissions("zone:zoneVisits:export") - @Log(title = "特色专区用户浏览", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ZoneVisits zoneVisits) { - List list = zoneVisitsService.selectZoneVisitsList(zoneVisits); - ExcelUtil util = new ExcelUtil(ZoneVisits.class); - util.exportExcel(response, list, "特色专区用户浏览数据"); - } - - /** - * 获取特色专区用户浏览详细信息 - */ - @RequiresPermissions("zone:zoneVisits:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(zoneVisitsService.selectZoneVisitsById(id)); - } - - /** - * 新增特色专区用户浏览 - */ - @RequiresPermissions("zone:zoneVisits:add") - @Log(title = "特色专区用户浏览", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ZoneVisits zoneVisits) { - return toAjax(zoneVisitsService.insertZoneVisits(zoneVisits)); - } - - /** - * 修改特色专区用户浏览 - */ - @RequiresPermissions("zone:zoneVisits:edit") - @Log(title = "特色专区用户浏览", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ZoneVisits zoneVisits) { - return toAjax(zoneVisitsService.updateZoneVisits(zoneVisits)); - } - - /** - * 删除特色专区用户浏览 - */ - @RequiresPermissions("zone:zoneVisits:remove") - @Log(title = "特色专区用户浏览", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(zoneVisitsService.deleteZoneVisitsByIds(ids)); - } -} diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/ZoneVisits.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/ZoneVisits.java index 13b6faecc..b768517f1 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/ZoneVisits.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/ZoneVisits.java @@ -1,9 +1,10 @@ package com.microservices.zone.common.domain; -import com.microservices.common.core.annotation.Excel; import com.microservices.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; /** * 特色专区用户浏览对象 zone_visits @@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author otto * @date 2024-11-26 */ +@Data public class ZoneVisits extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,65 +24,26 @@ public class ZoneVisits extends BaseEntity { /** * 用户名 */ - @Excel(name = "用户名") + @ApiModelProperty(value = "用户名") private String username; /** * 浏览用户UUID */ - @Excel(name = "浏览用户UUID") + @ApiModelProperty(value = "浏览用户UUID") + @NotNull(message = "浏览用户UUID不能为空") private String uuid; /** * 浏览地址 */ - @Excel(name = "浏览地址") + @ApiModelProperty(value = "浏览地址") + @NotNull(message = "浏览地址不能为空") private String url; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("username", getUsername()) - .append("uuid", getUuid()) - .append("url", getUrl()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + /** + * 备注 + */ + @ApiModelProperty(value = "备注(JSON字符串，可传用户ip、用户浏览器、用户系统类型等)") + private String remark; } diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/vo/ZoneVisitsInputVo.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/vo/ZoneVisitsInputVo.java new file mode 100644 index 000000000..17c1ca976 --- /dev/null +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/domain/vo/ZoneVisitsInputVo.java @@ -0,0 +1,52 @@ +package com.microservices.zone.common.domain.vo; + +import com.microservices.common.core.utils.bean.BeanUtils; +import com.microservices.zone.common.domain.ZoneVisits; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * 特色专区用户浏览对象 zone_visits + * + * @author otto + * @date 2024-11-26 + */ +@Data +@ApiModel("用户浏览输入对象") +public class ZoneVisitsInputVo { + + /** + * 用户名 + */ + @ApiModelProperty(value = "用户名") + private String username; + + /** + * 浏览用户UUID + */ + @ApiModelProperty(value = "浏览用户UUID") + @NotNull(message = "浏览用户UUID不能为空") + private String uuid; + + /** + * 浏览地址 + */ + @ApiModelProperty(value = "浏览地址") + @NotNull(message = "浏览地址不能为空") + private String url; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注(JSON字符串，可传用户ip、用户浏览器、用户系统类型等)") + private String remark; + + public ZoneVisits toZoneVisits() { + ZoneVisits target = new ZoneVisits(); + BeanUtils.copyProperties(this, target); + return target; + } +} diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/IZoneVisitsService.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/IZoneVisitsService.java index a27733505..fb0bdf100 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/IZoneVisitsService.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/IZoneVisitsService.java @@ -2,8 +2,6 @@ package com.microservices.zone.common.service; import com.microservices.zone.common.domain.ZoneVisits; -import java.util.List; - /** * 特色专区用户浏览Service接口 * @@ -11,21 +9,6 @@ import java.util.List; * @date 2024-11-26 */ public interface IZoneVisitsService { - /** - * 查询特色专区用户浏览 - * - * @param id 特色专区用户浏览主键 - * @return 特色专区用户浏览 - */ - public ZoneVisits selectZoneVisitsById(Long id); - - /** - * 查询特色专区用户浏览列表 - * - * @param zoneVisits 特色专区用户浏览 - * @return 特色专区用户浏览集合 - */ - public List selectZoneVisitsList(ZoneVisits zoneVisits); /** * 新增特色专区用户浏览 @@ -34,28 +17,4 @@ public interface IZoneVisitsService { * @return 结果 */ public int insertZoneVisits(ZoneVisits zoneVisits); - - /** - * 修改特色专区用户浏览 - * - * @param zoneVisits 特色专区用户浏览 - * @return 结果 - */ - public int updateZoneVisits(ZoneVisits zoneVisits); - - /** - * 批量删除特色专区用户浏览 - * - * @param ids 需要删除的特色专区用户浏览主键集合 - * @return 结果 - */ - public int deleteZoneVisitsByIds(Long[] ids); - - /** - * 删除特色专区用户浏览信息 - * - * @param id 特色专区用户浏览主键 - * @return 结果 - */ - public int deleteZoneVisitsById(Long id); } diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/impl/ZoneVisitsServiceImpl.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/impl/ZoneVisitsServiceImpl.java index 5a1facef9..e9a6e062f 100644 --- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/impl/ZoneVisitsServiceImpl.java +++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/common/service/impl/ZoneVisitsServiceImpl.java @@ -7,8 +7,6 @@ import com.microservices.zone.common.service.IZoneVisitsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * 特色专区用户浏览Service业务层处理 * @@ -20,28 +18,6 @@ public class ZoneVisitsServiceImpl implements IZoneVisitsService { @Autowired private ZoneVisitsMapper zoneVisitsMapper; - /** - * 查询特色专区用户浏览 - * - * @param id 特色专区用户浏览主键 - * @return 特色专区用户浏览 - */ - @Override - public ZoneVisits selectZoneVisitsById(Long id) { - return zoneVisitsMapper.selectZoneVisitsById(id); - } - - /** - * 查询特色专区用户浏览列表 - * - * @param zoneVisits 特色专区用户浏览 - * @return 特色专区用户浏览 - */ - @Override - public List selectZoneVisitsList(ZoneVisits zoneVisits) { - return zoneVisitsMapper.selectZoneVisitsList(zoneVisits); - } - /** * 新增特色专区用户浏览 * @@ -54,37 +30,4 @@ public class ZoneVisitsServiceImpl implements IZoneVisitsService { return zoneVisitsMapper.insertZoneVisits(zoneVisits); } - /** - * 修改特色专区用户浏览 - * - * @param zoneVisits 特色专区用户浏览 - * @return 结果 - */ - @Override - public int updateZoneVisits(ZoneVisits zoneVisits) { - zoneVisits.setUpdateTime(DateUtils.getNowDate()); - return zoneVisitsMapper.updateZoneVisits(zoneVisits); - } - - /** - * 批量删除特色专区用户浏览 - * - * @param ids 需要删除的特色专区用户浏览主键 - * @return 结果 - */ - @Override - public int deleteZoneVisitsByIds(Long[] ids) { - return zoneVisitsMapper.deleteZoneVisitsByIds(ids); - } - - /** - * 删除特色专区用户浏览信息 - * - * @param id 特色专区用户浏览主键 - * @return 结果 - */ - @Override - public int deleteZoneVisitsById(Long id) { - return zoneVisitsMapper.deleteZoneVisitsById(id); - } }