diff --git a/bweb/src/main/java/com/bweb/controller/CmsController.java b/bweb/src/main/java/com/bweb/controller/CmsController.java new file mode 100644 index 0000000..7e0f20e --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/CmsController.java @@ -0,0 +1,173 @@ +package com.bweb.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +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.sysenum.cms.CmsStatusEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @className: CmsController + * @author: HuRui + * @date: 2024/9/24 + **/ +@Controller +@RequestMapping(value = "/cms") +@Api(value = "CMS") +public class CmsController { + private static Logger log = LoggerFactory.getLogger(CmsController.class); + @Resource + private CmsContentService cmsContentService; + @Resource + private RedisUtil redisUtil; + + @RequestMapping(value="/edit",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "编辑") + public ResponseData edit(@RequestBody CmsContent body) { + try { + if (body == null + || body.getType() == null + || StringUtils.isBlank(body.getImgUrl()) + || body.getJumpType() == null + || StringUtils.isBlank(body.getJumpUrl()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR); + } + CmsContent cmsContent = null; + if (body.getId() == null) { + // 查询内容 + cmsContent = cmsContentService.getDetail(body.getId()); + if (cmsContent == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据"); + } + if (!CmsStatusEnum.status1.getStatus().equals(cmsContent.getStatus())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法编辑，状态错误"); + } + } else { + cmsContent = new CmsContent(); + cmsContent.setStatus(CmsStatusEnum.status1.getStatus()); + } + cmsContent.setType(body.getType()); + cmsContent.setImgUrl(body.getImgUrl()); + cmsContent.setJumpType(body.getJumpType()); + cmsContent.setJumpUrl(body.getJumpUrl()); + cmsContentService.editData(cmsContent); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/online",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "上线") + public ResponseData online(@RequestBody CmsContent body) { + try { + if (body == null || body.getId() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR); + } + // 查询内容 + CmsContent cmsContent = cmsContentService.getDetail(body.getId()); + if (cmsContent == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据"); + } + if (!CmsStatusEnum.status1.getStatus().equals(cmsContent.getStatus())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法上线，状态错误"); + } + cmsContent.setStatus(CmsStatusEnum.status2.getStatus()); + cmsContentService.editData(cmsContent); + + // 加入缓存 + redisUtil.hset(CmsContentServiceImpl.CACHE_CMS_ONLINE, ""+body.getType(), cmsContent); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/offline",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "下线") + public ResponseData offline(@RequestBody CmsContent body) { + try { + if (body == null || body.getId() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR); + } + // 查询内容 + CmsContent cmsContent = cmsContentService.getDetail(body.getId()); + if (cmsContent == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据"); + } + if (!CmsStatusEnum.status2.getStatus().equals(cmsContent.getStatus())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法下线，状态错误"); + } + cmsContent.setStatus(CmsStatusEnum.status3.getStatus()); + cmsContentService.editData(cmsContent); + + // 删除缓存 + redisUtil.hdel(CmsContentServiceImpl.CACHE_CMS_ONLINE, ""+body.getType()); + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/getDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询详情") + public ResponseData getDetail(@RequestParam(name = "id", required = true) Long id) { + try { + + return ResponseMsgUtil.success(cmsContentService.getDetail(id)); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询列表") + public ResponseData queryList(@RequestParam(name = "name", required = false) String name, + @RequestParam(name = "type", required = false) Integer type, + @RequestParam(name = "status", required = false) Integer status, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + Map param = new HashMap<>(); + param.put("name", name); + param.put("type", type); + param.put("status", status); + + PageHelper.startPage(pageNum, pageSize); + return ResponseMsgUtil.success(new PageInfo<>(cmsContentService.getList(param))); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + +} diff --git a/cweb/src/main/java/com/cweb/config/AuthConfig.java b/cweb/src/main/java/com/cweb/config/AuthConfig.java index fcd1aa2..bccf4db 100644 --- a/cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/cweb/src/main/java/com/cweb/config/AuthConfig.java @@ -97,6 +97,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/pay/*") .excludePathPatterns("/user/*") .excludePathPatterns("/notify/*") + .excludePathPatterns("/cms/*") ; } diff --git a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java index 25cbf73..aeda96b 100644 --- a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java +++ b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java @@ -10,10 +10,7 @@ import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsAgentPrice; import com.hfkj.entity.BsDiscountUser; -import com.hfkj.model.DiscountUserModel; -import com.hfkj.model.GasListModel; -import com.hfkj.model.ResponseData; -import com.hfkj.model.UserSessionObject; +import com.hfkj.model.*; import com.hfkj.service.agent.BsAgentPriceService; import com.hfkj.service.discount.BsDiscountService; import com.hfkj.service.discount.BsDiscountUserService; @@ -70,21 +67,10 @@ public class BsDiscountUserController { PageHelper.startPage(pageNum,pageSize); PageInfo pageInfo = new PageInfo<>(gasService.getGasListByDiscount(discountNo,longitude, latitude, oilNo, gasName, distanceLimit, true)); for (GasListModel gas : pageInfo.getList()) { - BigDecimal discount = new BigDecimal("100"); - if (agentMerId != null) { - // 查询代理价格 - BsAgentPrice agentPrice = agentPriceService.getDetail(agentMerId, gas.getOilNo()); - if (agentPrice != null) { - discount = agentPrice.getPriceRate(); - } - } else { - // 查询平台价格 - BsAgentPrice agentPrice = agentPriceService.getDetail(AgentPriceTypeEnum.type1, gas.getMerNo(), gas.getOilNo()); - if (agentPrice != null) { - discount = agentPrice.getPriceRate(); - } - } - gas.setPriceVip(gas.getPriceVip().multiply(discount.divide(new BigDecimal("100"))).setScale(2, BigDecimal.ROUND_HALF_UP)); + // 计算优惠 + GasPayPriceModel compute = gasService.refuelPriceCompute(new BigDecimal("100"), gas.getMerNo(), oilNo, agentMerId, null); + gas.setPriceVip(compute.getPricePlatform()); + gas.setOilDiscount(compute.getTotalPreferences().compareTo(new BigDecimal("0")) > 0 ? Arrays.asList("加100省"+ compute.getTotalPreferences()) : new ArrayList<>()); } return ResponseMsgUtil.success(pageInfo); diff --git a/cweb/src/main/java/com/cweb/controller/BsGasController.java b/cweb/src/main/java/com/cweb/controller/BsGasController.java index ad2b203..a5487d1 100644 --- a/cweb/src/main/java/com/cweb/controller/BsGasController.java +++ b/cweb/src/main/java/com/cweb/controller/BsGasController.java @@ -3,6 +3,7 @@ package com.cweb.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.collect.Maps; import com.hfkj.channel.gas.newlink.NewLinkGasService; import com.hfkj.channel.gas.newlink.NewLinkRequestService; import com.hfkj.channel.gas.shell.CqShellPetroleumGasService; @@ -127,21 +128,10 @@ public class BsGasController { PageInfo pageInfo = new PageInfo<>(gasService.getGasList(longitude, latitude, oilNo, gasName, distanceLimit, true)); for (GasListModel gas : pageInfo.getList()) { - BigDecimal discount = new BigDecimal("100"); - if (agentMerId != null) { - // 查询代理价格 - BsAgentPrice agentPrice = agentPriceService.getDetail(agentMerId, gas.getOilNo()); - if (agentPrice != null) { - discount = agentPrice.getPriceRate(); - } - } else { - // 查询平台价格 - BsAgentPrice agentPrice = agentPriceService.getDetail(AgentPriceTypeEnum.type1, gas.getMerNo(), gas.getOilNo()); - if (agentPrice != null) { - discount = agentPrice.getPriceRate(); - } - } - gas.setPriceVip(gas.getPriceVip().multiply(discount.divide(new BigDecimal("100"))).setScale(2, BigDecimal.ROUND_HALF_UP)); + // 计算优惠 + GasPayPriceModel compute = gasService.refuelPriceCompute(new BigDecimal("100"), gas.getMerNo(), oilNo, agentMerId, null); + gas.setPriceVip(compute.getPricePlatform()); + gas.setOilDiscount(compute.getTotalPreferences().compareTo(new BigDecimal("0")) > 0 ? Arrays.asList("加100省"+ compute.getTotalPreferences()) : new ArrayList<>()); } return ResponseMsgUtil.success(pageInfo); diff --git a/cweb/src/main/java/com/cweb/controller/CmsController.java b/cweb/src/main/java/com/cweb/controller/CmsController.java new file mode 100644 index 0000000..43c642b --- /dev/null +++ b/cweb/src/main/java/com/cweb/controller/CmsController.java @@ -0,0 +1,61 @@ +package com.cweb.controller; + +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.sysenum.cms.CmsStatusEnum; +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 javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @className: CmsController + * @author: HuRui + * @date: 2024/9/24 + **/ +@Controller +@RequestMapping(value = "/cms") +@Api(value = "CMS") +public class CmsController { + private static Logger log = LoggerFactory.getLogger(CmsController.class); + @Resource + private CmsContentService cmsContentService; + @Resource + private RedisUtil redisUtil; + + @RequestMapping(value="/query",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询列表") + public ResponseData query(@RequestParam(name = "type", required = true) Integer type) { + try { + // 读取缓存 + Object cacheObj = redisUtil.hget(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type); + if (cacheObj != null) { + return ResponseMsgUtil.success(cacheObj); + } + 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); + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } +} diff --git a/service/src/main/java/com/hfkj/dao/CmsContentMapper.java b/service/src/main/java/com/hfkj/dao/CmsContentMapper.java new file mode 100644 index 0000000..734f063 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentMapper.java @@ -0,0 +1,125 @@ +package com.hfkj.dao; + +import com.hfkj.entity.CmsContent; +import com.hfkj.entity.CmsContentExample; +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 CmsContentMapper extends CmsContentMapperExt { + @SelectProvider(type=CmsContentSqlProvider.class, method="countByExample") + long countByExample(CmsContentExample example); + + @DeleteProvider(type=CmsContentSqlProvider.class, method="deleteByExample") + int deleteByExample(CmsContentExample example); + + @Delete({ + "delete from cms_content", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into cms_content (`type`, `name`, ", + "img_url, jump_type, ", + "jump_url, `status`, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", + "values (#{type,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, ", + "#{imgUrl,jdbcType=VARCHAR}, #{jumpType,jdbcType=INTEGER}, ", + "#{jumpUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(CmsContent record); + + @InsertProvider(type=CmsContentSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(CmsContent record); + + @SelectProvider(type=CmsContentSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), + @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER), + @Result(column="jump_url", property="jumpUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", 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(CmsContentExample example); + + @Select({ + "select", + "id, `type`, `name`, img_url, jump_type, jump_url, `status`, create_time, update_time, ", + "ext_1, ext_2, ext_3", + "from cms_content", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), + @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER), + @Result(column="jump_url", property="jumpUrl", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", 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) + }) + CmsContent selectByPrimaryKey(Long id); + + @UpdateProvider(type=CmsContentSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") CmsContent record, @Param("example") CmsContentExample example); + + @UpdateProvider(type=CmsContentSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") CmsContent record, @Param("example") CmsContentExample example); + + @UpdateProvider(type=CmsContentSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(CmsContent record); + + @Update({ + "update cms_content", + "set `type` = #{type,jdbcType=INTEGER},", + "`name` = #{name,jdbcType=VARCHAR},", + "img_url = #{imgUrl,jdbcType=VARCHAR},", + "jump_type = #{jumpType,jdbcType=INTEGER},", + "jump_url = #{jumpUrl,jdbcType=VARCHAR},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(CmsContent record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/CmsContentMapperExt.java b/service/src/main/java/com/hfkj/dao/CmsContentMapperExt.java new file mode 100644 index 0000000..ca0dea5 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface CmsContentMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/CmsContentSqlProvider.java b/service/src/main/java/com/hfkj/dao/CmsContentSqlProvider.java new file mode 100644 index 0000000..fdc0d5b --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/CmsContentSqlProvider.java @@ -0,0 +1,332 @@ +package com.hfkj.dao; + +import com.hfkj.entity.CmsContent; +import com.hfkj.entity.CmsContentExample.Criteria; +import com.hfkj.entity.CmsContentExample.Criterion; +import com.hfkj.entity.CmsContentExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class CmsContentSqlProvider { + + public String countByExample(CmsContentExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("cms_content"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(CmsContentExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("cms_content"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(CmsContent record) { + SQL sql = new SQL(); + sql.INSERT_INTO("cms_content"); + + if (record.getType() != null) { + sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); + } + + if (record.getName() != null) { + sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}"); + } + + if (record.getImgUrl() != null) { + sql.VALUES("img_url", "#{imgUrl,jdbcType=VARCHAR}"); + } + + if (record.getJumpType() != null) { + sql.VALUES("jump_type", "#{jumpType,jdbcType=INTEGER}"); + } + + if (record.getJumpUrl() != null) { + sql.VALUES("jump_url", "#{jumpUrl,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,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(CmsContentExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("`type`"); + sql.SELECT("`name`"); + sql.SELECT("img_url"); + sql.SELECT("jump_type"); + sql.SELECT("jump_url"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("cms_content"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + CmsContent record = (CmsContent) parameter.get("record"); + CmsContentExample example = (CmsContentExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("cms_content"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getType() != null) { + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + } + + if (record.getName() != null) { + sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); + } + + if (record.getImgUrl() != null) { + sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}"); + } + + if (record.getJumpType() != null) { + sql.SET("jump_type = #{record.jumpType,jdbcType=INTEGER}"); + } + + if (record.getJumpUrl() != null) { + sql.SET("jump_url = #{record.jumpUrl,jdbcType=VARCHAR}"); + } + + 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.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,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"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); + sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}"); + sql.SET("jump_type = #{record.jumpType,jdbcType=INTEGER}"); + sql.SET("jump_url = #{record.jumpUrl,jdbcType=VARCHAR}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,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}"); + + CmsContentExample example = (CmsContentExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(CmsContent record) { + SQL sql = new SQL(); + sql.UPDATE("cms_content"); + + if (record.getType() != null) { + sql.SET("`type` = #{type,jdbcType=INTEGER}"); + } + + if (record.getName() != null) { + sql.SET("`name` = #{name,jdbcType=VARCHAR}"); + } + + if (record.getImgUrl() != null) { + sql.SET("img_url = #{imgUrl,jdbcType=VARCHAR}"); + } + + if (record.getJumpType() != null) { + sql.SET("jump_type = #{jumpType,jdbcType=INTEGER}"); + } + + if (record.getJumpUrl() != null) { + sql.SET("jump_url = #{jumpUrl,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,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, CmsContentExample 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/CmsContent.java b/service/src/main/java/com/hfkj/entity/CmsContent.java new file mode 100644 index 0000000..a16e000 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/CmsContent.java @@ -0,0 +1,232 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * cms_content + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class CmsContent implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 类型 + */ + private Integer type; + + /** + * 轮播图名称 + */ + private String name; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 跳转类型 + */ + private Integer jumpType; + + /** + * 跳转地址 + */ + private String jumpUrl; + + /** + * 状态 0：删除 1：编辑中 2：已上线 3：已下线 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + 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 Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } + + public Integer getJumpType() { + return jumpType; + } + + public void setJumpType(Integer jumpType) { + this.jumpType = jumpType; + } + + public String getJumpUrl() { + return jumpUrl; + } + + public void setJumpUrl(String jumpUrl) { + this.jumpUrl = jumpUrl; + } + + 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 Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + 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; + } + CmsContent other = (CmsContent) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl())) + && (this.getJumpType() == null ? other.getJumpType() == null : this.getJumpType().equals(other.getJumpType())) + && (this.getJumpUrl() == null ? other.getJumpUrl() == null : this.getJumpUrl().equals(other.getJumpUrl())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (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 + ((getType() == null) ? 0 : getType().hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode()); + result = prime * result + ((getJumpType() == null) ? 0 : getJumpType().hashCode()); + result = prime * result + ((getJumpUrl() == null) ? 0 : getJumpUrl().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().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(", type=").append(type); + sb.append(", name=").append(name); + sb.append(", imgUrl=").append(imgUrl); + sb.append(", jumpType=").append(jumpType); + sb.append(", jumpUrl=").append(jumpUrl); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + 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/CmsContentExample.java b/service/src/main/java/com/hfkj/entity/CmsContentExample.java new file mode 100644 index 0000000..49055a8 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/CmsContentExample.java @@ -0,0 +1,1003 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CmsContentExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public CmsContentExample() { + 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 andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("`name` is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("`name` is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("`name` =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("`name` <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("`name` >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("`name` >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("`name` <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("`name` <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("`name` like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("`name` not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("`name` in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("`name` not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("`name` between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("`name` not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andImgUrlIsNull() { + addCriterion("img_url is null"); + return (Criteria) this; + } + + public Criteria andImgUrlIsNotNull() { + addCriterion("img_url is not null"); + return (Criteria) this; + } + + public Criteria andImgUrlEqualTo(String value) { + addCriterion("img_url =", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlNotEqualTo(String value) { + addCriterion("img_url <>", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlGreaterThan(String value) { + addCriterion("img_url >", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlGreaterThanOrEqualTo(String value) { + addCriterion("img_url >=", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlLessThan(String value) { + addCriterion("img_url <", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlLessThanOrEqualTo(String value) { + addCriterion("img_url <=", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlLike(String value) { + addCriterion("img_url like", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlNotLike(String value) { + addCriterion("img_url not like", value, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlIn(List values) { + addCriterion("img_url in", values, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlNotIn(List values) { + addCriterion("img_url not in", values, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlBetween(String value1, String value2) { + addCriterion("img_url between", value1, value2, "imgUrl"); + return (Criteria) this; + } + + public Criteria andImgUrlNotBetween(String value1, String value2) { + addCriterion("img_url not between", value1, value2, "imgUrl"); + return (Criteria) this; + } + + public Criteria andJumpTypeIsNull() { + addCriterion("jump_type is null"); + return (Criteria) this; + } + + public Criteria andJumpTypeIsNotNull() { + addCriterion("jump_type is not null"); + return (Criteria) this; + } + + public Criteria andJumpTypeEqualTo(Integer value) { + addCriterion("jump_type =", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeNotEqualTo(Integer value) { + addCriterion("jump_type <>", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeGreaterThan(Integer value) { + addCriterion("jump_type >", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("jump_type >=", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeLessThan(Integer value) { + addCriterion("jump_type <", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeLessThanOrEqualTo(Integer value) { + addCriterion("jump_type <=", value, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeIn(List values) { + addCriterion("jump_type in", values, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeNotIn(List values) { + addCriterion("jump_type not in", values, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeBetween(Integer value1, Integer value2) { + addCriterion("jump_type between", value1, value2, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeNotBetween(Integer value1, Integer value2) { + addCriterion("jump_type not between", value1, value2, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpUrlIsNull() { + addCriterion("jump_url is null"); + return (Criteria) this; + } + + public Criteria andJumpUrlIsNotNull() { + addCriterion("jump_url is not null"); + return (Criteria) this; + } + + public Criteria andJumpUrlEqualTo(String value) { + addCriterion("jump_url =", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlNotEqualTo(String value) { + addCriterion("jump_url <>", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlGreaterThan(String value) { + addCriterion("jump_url >", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlGreaterThanOrEqualTo(String value) { + addCriterion("jump_url >=", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlLessThan(String value) { + addCriterion("jump_url <", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlLessThanOrEqualTo(String value) { + addCriterion("jump_url <=", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlLike(String value) { + addCriterion("jump_url like", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlNotLike(String value) { + addCriterion("jump_url not like", value, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlIn(List values) { + addCriterion("jump_url in", values, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlNotIn(List values) { + addCriterion("jump_url not in", values, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlBetween(String value1, String value2) { + addCriterion("jump_url between", value1, value2, "jumpUrl"); + return (Criteria) this; + } + + public Criteria andJumpUrlNotBetween(String value1, String value2) { + addCriterion("jump_url not between", value1, value2, "jumpUrl"); + 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 andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/model/GasListModel.java b/service/src/main/java/com/hfkj/model/GasListModel.java index 19e237b..a51b56b 100644 --- a/service/src/main/java/com/hfkj/model/GasListModel.java +++ b/service/src/main/java/com/hfkj/model/GasListModel.java @@ -3,6 +3,8 @@ package com.hfkj.model; import lombok.Data; import java.math.BigDecimal; +import java.util.List; +import java.util.Map; /** * 油站列表模型 @@ -56,4 +58,9 @@ public class GasListModel { * 油站直降 */ private BigDecimal gasStationDrop; + + /** + * 列表的加油优惠金额【200优惠xx元】 + */ + private List oilDiscount; } diff --git a/service/src/main/java/com/hfkj/service/CmsContentService.java b/service/src/main/java/com/hfkj/service/CmsContentService.java new file mode 100644 index 0000000..40b93da --- /dev/null +++ b/service/src/main/java/com/hfkj/service/CmsContentService.java @@ -0,0 +1,35 @@ +package com.hfkj.service; + +import com.hfkj.entity.CmsContent; + +import java.util.List; +import java.util.Map; + +/** + * @className: CmsContentService + * @author: HuRui + * @date: 2024/9/24 + **/ +public interface CmsContentService { + + /** + * 编辑数据 + * @param data + */ + void editData(CmsContent data); + + /** + * 详情 + * @param id + * @return + */ + CmsContent getDetail(Long id); + + /** + * 查询列表 + * @param param + * @return + */ + List getList(Map param); + +} diff --git a/service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java new file mode 100644 index 0000000..eee562f --- /dev/null +++ b/service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java @@ -0,0 +1,64 @@ +package com.hfkj.service.impl; + +import com.hfkj.dao.CmsContentMapper; +import com.hfkj.entity.CmsContent; +import com.hfkj.entity.CmsContentExample; +import com.hfkj.service.CmsContentService; +import com.hfkj.sysenum.cms.CmsStatusEnum; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @className: CmsContentServiceImpl + * @author: HuRui + * @date: 2024/9/24 + **/ +@Service("cmsContentService") +public class CmsContentServiceImpl implements CmsContentService { + @Resource + private CmsContentMapper cmsContentMapper; + public final static String CACHE_CMS_ONLINE = "CACHE_CMS_ONLINE"; + @Override + public void editData(CmsContent data) { + data.setUpdateTime(new Date()); + if (data.getId() == null) { + data.setCreateTime(new Date()); + cmsContentMapper.insert(data); + } else { + cmsContentMapper.updateByPrimaryKey(data); + } + } + + @Override + public CmsContent getDetail(Long id) { + return cmsContentMapper.selectByPrimaryKey(id); + } + + @Override + public List getList(Map param) { + CmsContentExample example = new CmsContentExample(); + CmsContentExample.Criteria criteria = example.createCriteria() .andStatusNotEqualTo(CmsStatusEnum.status0.getStatus()); + + if (MapUtils.getInteger(param, "type") != null) { + criteria.andTypeEqualTo(MapUtils.getInteger(param, "type")); + } + + if (MapUtils.getInteger(param, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(param, "status")); + } + + if (StringUtils.isNotBlank(MapUtils.getString(param, "name"))) { + criteria.andNameLike("%"+MapUtils.getString(param, "name")+"%"); + } + + example.setOrderByClause("update_time desc"); + return cmsContentMapper.selectByExample(example); + } + +} diff --git a/service/src/main/java/com/hfkj/sysenum/cms/CmsStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/cms/CmsStatusEnum.java new file mode 100644 index 0000000..9d11b3b --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/cms/CmsStatusEnum.java @@ -0,0 +1,48 @@ +package com.hfkj.sysenum.cms; + +import lombok.Getter; + +import java.util.Objects; + +/** + * @className: CmsTypeEnum + * @author: HuRui + * @date: 2024/9/24 + **/ +@Getter +public enum CmsStatusEnum { + /** + * 删除 + */ + status0(0 , "删除"), + /** + * 编辑中 + */ + status1(1 , "编辑中"), + /** + * 已上线 + */ + status2(2 , "已上线"), + /** + * 已下线 + */ + status3(3 , "已下线"), + ; + + private Integer status; + + private String name; + + CmsStatusEnum(int status , String name) { + this.status = status; + this.name = name; + } + + public static CmsStatusEnum getDataByType(Integer status) { + for (CmsStatusEnum ele : values()) { + if(Objects.equals(status,ele.getStatus())) return ele; + } + return null; + } + +} diff --git a/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java new file mode 100644 index 0000000..8d82f3d --- /dev/null +++ b/service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java @@ -0,0 +1,36 @@ +package com.hfkj.sysenum.cms; + +import lombok.Getter; + +import java.util.Objects; + +/** + * @className: CmsTypeEnum + * @author: HuRui + * @date: 2024/9/24 + **/ +@Getter +public enum CmsTypeEnum { + /** + * 首页轮播图 + */ + type1(1 , "首页轮播图"), + ; + + private Integer type; + + private String name; + + CmsTypeEnum(int type , String name) { + this.type = type; + this.name = name; + } + + public static CmsTypeEnum getDataByType(Integer type) { + for (CmsTypeEnum ele : values()) { + if(Objects.equals(type,ele.getType())) return ele; + } + return null; + } + +}