diff --git a/bweb/src/main/java/com/bweb/controller/CmsController.java b/bweb/src/main/java/com/bweb/controller/CmsController.java index 30e1311..fae860d 100644 --- a/bweb/src/main/java/com/bweb/controller/CmsController.java +++ b/bweb/src/main/java/com/bweb/controller/CmsController.java @@ -9,8 +9,8 @@ import com.hfkj.common.utils.RedisUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.CmsContent; import com.hfkj.model.ResponseData; -import com.hfkj.service.CmsContentService; -import com.hfkj.service.impl.CmsContentServiceImpl; +import com.hfkj.service.cms.CmsContentService; +import com.hfkj.service.cms.impl.CmsContentServiceImpl; import com.hfkj.sysenum.cms.CmsStatusEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/cweb/src/main/java/com/cweb/controller/CmsController.java b/cweb/src/main/java/com/cweb/controller/CmsController.java index 43c642b..8a29974 100644 --- a/cweb/src/main/java/com/cweb/controller/CmsController.java +++ b/cweb/src/main/java/com/cweb/controller/CmsController.java @@ -1,23 +1,29 @@ package com.cweb.controller; +import com.alibaba.fastjson.JSONObject; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.RedisUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.CmsContent; import com.hfkj.model.ResponseData; -import com.hfkj.service.CmsContentService; -import com.hfkj.service.impl.CmsContentServiceImpl; +import com.hfkj.model.UserSessionObject; +import com.hfkj.service.cms.CmsContentReadService; +import com.hfkj.service.cms.CmsContentService; +import com.hfkj.service.cms.impl.CmsContentServiceImpl; import com.hfkj.sysenum.cms.CmsStatusEnum; +import com.hfkj.sysenum.cms.CmsTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -35,27 +41,69 @@ public class CmsController { @Resource private CmsContentService cmsContentService; @Resource + private CmsContentReadService cmsContentReadService; + @Resource private RedisUtil redisUtil; + @Resource + private UserCenter userCenter; + + @RequestMapping(value="/readAlready",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "已阅读") + public ResponseData readAlready(@RequestBody JSONObject body) { + try { + // 用户信息 + UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); + if (body == null || body.getLong("contentId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + // 创建阅读记录 + cmsContentReadService.create(body.getLong("contentId"), userSession.getUser().getId()); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } @RequestMapping(value="/query",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询列表") public ResponseData query(@RequestParam(name = "type", required = true) Integer type) { try { + // 用户信息 + UserSessionObject userSession = null; + try { + userSession = userCenter.getSessionModel(UserSessionObject.class); + } catch (Exception e) { + // 不做任何处理 + } + List dataList; + // 读取缓存 Object cacheObj = redisUtil.hget(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type); if (cacheObj != null) { - return ResponseMsgUtil.success(cacheObj); + dataList = (List) cacheObj; + } else { + Map param = new HashMap<>(); + param.put("type", type); + param.put("status", CmsStatusEnum.status2.getStatus()); + dataList = cmsContentService.getList(param); + // 缓存 + redisUtil.hset(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type, dataList); + } + for (CmsContent data : dataList) { + if (CmsTypeEnum.type1.getType().equals(data.getType()) && userSession != null) { + // 用户是否阅读 + data.setExt1(""+cmsContentReadService.isRead(data.getId(), userSession.getUser().getId())); + } else { + data.setExt1("false"); + } } - Map param = new HashMap<>(); - param.put("type", type); - param.put("status", CmsStatusEnum.status2.getStatus()); - List list = cmsContentService.getList(param); - // 缓存 - redisUtil.hset(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type, list); - return ResponseMsgUtil.success(list); + return ResponseMsgUtil.success(dataList); } catch (Exception e) { return ResponseMsgUtil.exception(e); } } + } diff --git a/service/src/main/java/com/hfkj/dao/CmsContentReadMapper.java b/service/src/main/java/com/hfkj/dao/CmsContentReadMapper.java new file mode 100644 index 0000000..9bed204 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentReadMapper.java @@ -0,0 +1,108 @@ +package com.hfkj.dao; + +import com.hfkj.entity.CmsContentRead; +import com.hfkj.entity.CmsContentReadExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface CmsContentReadMapper extends CmsContentReadMapperExt { + @SelectProvider(type=CmsContentReadSqlProvider.class, method="countByExample") + long countByExample(CmsContentReadExample example); + + @DeleteProvider(type=CmsContentReadSqlProvider.class, method="deleteByExample") + int deleteByExample(CmsContentReadExample example); + + @Delete({ + "delete from cms_content_read", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into cms_content_read (content_id, user_id, ", + "`status`, create_time, ", + "ext_1, ext_2, ext_3)", + "values (#{contentId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, ", + "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(CmsContentRead record); + + @InsertProvider(type=CmsContentReadSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(CmsContentRead record); + + @SelectProvider(type=CmsContentReadSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="content_id", property="contentId", jdbcType=JdbcType.BIGINT), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(CmsContentReadExample example); + + @Select({ + "select", + "id, content_id, user_id, `status`, create_time, ext_1, ext_2, ext_3", + "from cms_content_read", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="content_id", property="contentId", jdbcType=JdbcType.BIGINT), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + CmsContentRead selectByPrimaryKey(Long id); + + @UpdateProvider(type=CmsContentReadSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") CmsContentRead record, @Param("example") CmsContentReadExample example); + + @UpdateProvider(type=CmsContentReadSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") CmsContentRead record, @Param("example") CmsContentReadExample example); + + @UpdateProvider(type=CmsContentReadSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(CmsContentRead record); + + @Update({ + "update cms_content_read", + "set content_id = #{contentId,jdbcType=BIGINT},", + "user_id = #{userId,jdbcType=BIGINT},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(CmsContentRead record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/CmsContentReadMapperExt.java b/service/src/main/java/com/hfkj/dao/CmsContentReadMapperExt.java new file mode 100644 index 0000000..6467a9e --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentReadMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface CmsContentReadMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/CmsContentReadSqlProvider.java b/service/src/main/java/com/hfkj/dao/CmsContentReadSqlProvider.java new file mode 100644 index 0000000..9580fa1 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentReadSqlProvider.java @@ -0,0 +1,276 @@ +package com.hfkj.dao; + +import com.hfkj.entity.CmsContentRead; +import com.hfkj.entity.CmsContentReadExample.Criteria; +import com.hfkj.entity.CmsContentReadExample.Criterion; +import com.hfkj.entity.CmsContentReadExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class CmsContentReadSqlProvider { + + public String countByExample(CmsContentReadExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("cms_content_read"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(CmsContentReadExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("cms_content_read"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(CmsContentRead record) { + SQL sql = new SQL(); + sql.INSERT_INTO("cms_content_read"); + + if (record.getContentId() != null) { + sql.VALUES("content_id", "#{contentId,jdbcType=BIGINT}"); + } + + if (record.getUserId() != null) { + sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(CmsContentReadExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("content_id"); + sql.SELECT("user_id"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("cms_content_read"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + CmsContentRead record = (CmsContentRead) parameter.get("record"); + CmsContentReadExample example = (CmsContentReadExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("cms_content_read"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getContentId() != null) { + sql.SET("content_id = #{record.contentId,jdbcType=BIGINT}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("cms_content_read"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("content_id = #{record.contentId,jdbcType=BIGINT}"); + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + CmsContentReadExample example = (CmsContentReadExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(CmsContentRead record) { + SQL sql = new SQL(); + sql.UPDATE("cms_content_read"); + + if (record.getContentId() != null) { + sql.SET("content_id = #{contentId,jdbcType=BIGINT}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{userId,jdbcType=BIGINT}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, CmsContentReadExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/CmsContentRead.java b/service/src/main/java/com/hfkj/entity/CmsContentRead.java new file mode 100644 index 0000000..b45b02c --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/CmsContentRead.java @@ -0,0 +1,168 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * cms_content_read + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class CmsContentRead implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 内容id + */ + private Long contentId; + + /** + * 用户id + */ + private Long userId; + + /** + * 状态 0：删除 1：正常 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getContentId() { + return contentId; + } + + public void setContentId(Long contentId) { + this.contentId = contentId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + CmsContentRead other = (CmsContentRead) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getContentId() == null ? other.getContentId() == null : this.getContentId().equals(other.getContentId())) + && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getContentId() == null) ? 0 : getContentId().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", contentId=").append(contentId); + sb.append(", userId=").append(userId); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/CmsContentReadExample.java b/service/src/main/java/com/hfkj/entity/CmsContentReadExample.java new file mode 100644 index 0000000..45fbd24 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/CmsContentReadExample.java @@ -0,0 +1,733 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CmsContentReadExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public CmsContentReadExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andContentIdIsNull() { + addCriterion("content_id is null"); + return (Criteria) this; + } + + public Criteria andContentIdIsNotNull() { + addCriterion("content_id is not null"); + return (Criteria) this; + } + + public Criteria andContentIdEqualTo(Long value) { + addCriterion("content_id =", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdNotEqualTo(Long value) { + addCriterion("content_id <>", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdGreaterThan(Long value) { + addCriterion("content_id >", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdGreaterThanOrEqualTo(Long value) { + addCriterion("content_id >=", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdLessThan(Long value) { + addCriterion("content_id <", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdLessThanOrEqualTo(Long value) { + addCriterion("content_id <=", value, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdIn(List values) { + addCriterion("content_id in", values, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdNotIn(List values) { + addCriterion("content_id not in", values, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdBetween(Long value1, Long value2) { + addCriterion("content_id between", value1, value2, "contentId"); + return (Criteria) this; + } + + public Criteria andContentIdNotBetween(Long value1, Long value2) { + addCriterion("content_id not between", value1, value2, "contentId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/service/cms/CmsContentReadService.java b/service/src/main/java/com/hfkj/service/cms/CmsContentReadService.java new file mode 100644 index 0000000..2d3b2f3 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/cms/CmsContentReadService.java @@ -0,0 +1,25 @@ +package com.hfkj.service.cms; + +/** + * @className: CmsContentService + * @author: HuRui + * @date: 2024/9/24 + **/ +public interface CmsContentReadService { + + /** + * 创建时间 + * @param contentId + * @param userId + */ + void create(Long contentId,Long userId); + + /** + * 实付阅读过 + * @param contentId + * @param userId + * @return + */ + boolean isRead(Long contentId,Long userId); + +} diff --git a/service/src/main/java/com/hfkj/service/CmsContentService.java b/service/src/main/java/com/hfkj/service/cms/CmsContentService.java similarity index 94% rename from service/src/main/java/com/hfkj/service/CmsContentService.java rename to service/src/main/java/com/hfkj/service/cms/CmsContentService.java index 40b93da..6f330f4 100644 --- a/service/src/main/java/com/hfkj/service/CmsContentService.java +++ b/service/src/main/java/com/hfkj/service/cms/CmsContentService.java @@ -1,4 +1,4 @@ -package com.hfkj.service; +package com.hfkj.service.cms; import com.hfkj.entity.CmsContent; diff --git a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentReadServiceImpl.java b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentReadServiceImpl.java new file mode 100644 index 0000000..d5247ed --- /dev/null +++ b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentReadServiceImpl.java @@ -0,0 +1,45 @@ +package com.hfkj.service.cms.impl; + +import com.hfkj.common.utils.RedisUtil; +import com.hfkj.dao.CmsContentReadMapper; +import com.hfkj.entity.CmsContentRead; +import com.hfkj.service.cms.CmsContentReadService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; + +/** + * @className: CmsContentReadServiceImpl + * @author: HuRui + * @date: 2024/9/26 + **/ +@Service("cmsContentReadService") +public class CmsContentReadServiceImpl implements CmsContentReadService { + + @Resource + private CmsContentReadMapper cmsContentReadMapper; + @Resource + private RedisUtil redisUtil; + + private final static String CACHE_KEY = "CMS_CONTENT_READ:"; + + @Override + public void create(Long contentId, Long userId) { + CmsContentRead contentRead = new CmsContentRead(); + contentRead.setContentId(contentId); + contentRead.setUserId(userId); + contentRead.setStatus(1); + contentRead.setCreateTime(new Date()); + cmsContentReadMapper.insert(contentRead); + + redisUtil.hset(CACHE_KEY+contentId, ""+userId, contentRead); + } + + @Override + public boolean isRead(Long contentId, Long userId) { + return redisUtil.hHasKey(CACHE_KEY + contentId, "" + userId); + } + + +} diff --git a/service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java similarity index 96% rename from service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java rename to service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java index eee562f..8cd7399 100644 --- a/service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java @@ -1,9 +1,9 @@ -package com.hfkj.service.impl; +package com.hfkj.service.cms.impl; import com.hfkj.dao.CmsContentMapper; import com.hfkj.entity.CmsContent; import com.hfkj.entity.CmsContentExample; -import com.hfkj.service.CmsContentService; +import com.hfkj.service.cms.CmsContentService; import com.hfkj.sysenum.cms.CmsStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java index 8d82f3d..993156d 100644 --- a/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java @@ -15,6 +15,11 @@ public enum CmsTypeEnum { * 首页轮播图 */ type1(1 , "首页轮播图"), + + /** + * 首页弹出框 + */ + type2(1 , "首页弹出框"), ; private Integer type;