diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java new file mode 100644 index 00000000..a80bed07 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java @@ -0,0 +1,94 @@ +package com.jero.modules.personal.controller; + +import java.util.Arrays; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.personal.entity.LawsBrowsingHistory; +import com.jero.modules.personal.service.ILawsBrowsingHistoryService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; +import org.apache.poi.ss.formula.functions.T; + + + /** + * @Description: 浏览记录 + * @Author: jero-boot + * @Date: 2023-09-08 + * @Version: V1.0 + */ +@Api(tags="浏览记录") +@RestController +@RequestMapping("/personal/lawsBrowsingHistory") +@Slf4j +public class LawsBrowsingHistoryController extends JeroController { + @Autowired + private ILawsBrowsingHistoryService lawsBrowsingHistoryService; + + /** + * 分页列表查询 + */ + @AutoLog(value = "浏览记录-分页列表查询") + @ApiOperation(value="浏览记录-分页列表查询", notes="浏览记录-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsBrowsingHistory lawsBrowsingHistory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + lawsBrowsingHistory.setBrowsingUserId(sysUser.getId()); + IPage pageList = lawsBrowsingHistoryService.queryPage(lawsBrowsingHistory, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 添加 + */ + @AutoLog(value = "浏览记录-添加") + @ApiOperation(value="浏览记录-添加", notes="浏览记录-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsBrowsingHistory lawsBrowsingHistory) { + lawsBrowsingHistoryService.add(lawsBrowsingHistory); + return Result.OK("操作成功!"); + } + + /** + * 全部删除 + */ + @AutoLog(value = "浏览记录-全部删除") + @ApiOperation(value="浏览记录-全部删除", notes="浏览记录-全部删除") + @PostMapping(value = "/delete") + public Result delete() { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LawsBrowsingHistory::getBrowsingUserId, sysUser.getId()); + lawsBrowsingHistoryService.remove(wrapper); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ + @AutoLog(value = "浏览记录-批量删除") + @ApiOperation(value="浏览记录-批量删除", notes="浏览记录-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsBrowsingHistoryService.removeByIds(Arrays.asList(map.get("ids").split(","))); + return Result.OK("批量删除成功!"); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java new file mode 100644 index 00000000..1116651b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsBrowsingHistory.java @@ -0,0 +1,91 @@ +package com.jero.modules.personal.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 浏览记录 + * @Author: jero-boot + * @Date: 2023-09-08 + * @Version: V1.0 + */ +@Data +@TableName("laws_browsing_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_browsing_history对象", description="浏览记录") +public class LawsBrowsingHistory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**标准ID*/ + @ApiModelProperty(value = "标准ID") + @NotBlank(message = "standardId标准ID不能为空") + private String standardId; + + /**标准状态(1-国内、2-海外、3-企标)*/ + @ApiModelProperty(value = "标准状态(1-国内、2-海外、3-企标)") + @NotBlank(message = "standardType标准状态(1-国内、2-海外、3-企标)") + private String standardType; + + /**标准编号*/ + @ApiModelProperty(value = "标准编号") + @NotBlank(message = "standardNum标准编号") + private String standardNum; + + /**标准名称*/ + @ApiModelProperty(value = "标准名称") + @NotBlank(message = "standardName标准名称") + private String standardName; + + /**浏览人ID*/ + @ApiModelProperty(value = "浏览人ID") + private String browsingUserId; + + /**浏览日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "浏览日期") + private Date browsingTime; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String orgCode; +} diff --git a/laws-modules/src/main/java/com/jero/modules/personal/mapper/LawsBrowsingHistoryMapper.java b/laws-modules/src/main/java/com/jero/modules/personal/mapper/LawsBrowsingHistoryMapper.java new file mode 100644 index 00000000..7ee7c639 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/mapper/LawsBrowsingHistoryMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.personal.mapper; + +import com.jero.modules.personal.entity.LawsBrowsingHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 浏览记录 + * @Author: jero-boot + * @Date: 2023-09-08 + * @Version: V1.0 + */ +public interface LawsBrowsingHistoryMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/personal/mapper/xml/LawsBrowsingHistoryMapper.xml b/laws-modules/src/main/java/com/jero/modules/personal/mapper/xml/LawsBrowsingHistoryMapper.xml new file mode 100644 index 00000000..dba7311f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/mapper/xml/LawsBrowsingHistoryMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsBrowsingHistoryService.java b/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsBrowsingHistoryService.java new file mode 100644 index 00000000..6f38aa03 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsBrowsingHistoryService.java @@ -0,0 +1,26 @@ +package com.jero.modules.personal.service; + +import com.jero.modules.personal.entity.LawsBrowsingHistory; +import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * @Description: 浏览记录 + * @Author: jero-boot + * @Date: 2023-09-08 + * @Version: V1.0 + */ +public interface ILawsBrowsingHistoryService extends IService { + + /** + * 分页查询 + */ + IPage queryPage(LawsBrowsingHistory lawsBrowsingHistory, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 保存 + */ + void add(LawsBrowsingHistory lawsBrowsingHistory); + +} diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsBrowsingHistoryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsBrowsingHistoryServiceImpl.java new file mode 100644 index 00000000..e11244fe --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsBrowsingHistoryServiceImpl.java @@ -0,0 +1,54 @@ +package com.jero.modules.personal.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.personal.entity.LawsBrowsingHistory; +import com.jero.modules.personal.mapper.LawsBrowsingHistoryMapper; +import com.jero.modules.personal.service.ILawsBrowsingHistoryService; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jero.common.exception.JeroBootException; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.query.QueryGenerator; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + + +/** + * @Description: 浏览记录 + * @Author: jero-boot + * @Date: 2023-09-08 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsBrowsingHistoryServiceImpl extends ServiceImpl implements ILawsBrowsingHistoryService { + + /** + * 分页查询 + */ + @Override + public IPage queryPage(LawsBrowsingHistory lawsBrowsingHistory, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsBrowsingHistory, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 保存 + */ + @Override + public void add(LawsBrowsingHistory lawsBrowsingHistory) { + Date date = new Date(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + lawsBrowsingHistory.setBrowsingUserId(sysUser.getId()); + lawsBrowsingHistory.setBrowsingTime(date); + lawsBrowsingHistory.setCreateTime(date); + lawsBrowsingHistory.setUpdateTime(date); + save(lawsBrowsingHistory); + } +}