update

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -66,6 +66,15 @@ public class SysMenu {
 	private String delFlag;
 
 	private Integer hid;
+	
+	@ApiModelProperty(value = "是否固定在 tagsView 栏上",required = false)
+	private Boolean isAffix;
+	
+	@ApiModelProperty(value = "是否内嵌窗口",required = false)
+	private Boolean isIframe;
+	
+	@ApiModelProperty(value = "外链地址",required = false)
+	private String linkPath;
 
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<SysMenu> sysMenus;
@@ -208,6 +217,30 @@ public class SysMenu {
 		return this.delFlag;
 	}
 
+	public Boolean getIsAffix() {
+		return isAffix;
+	}
+
+	public void setIsAffix(Boolean isAffix) {
+		this.isAffix = isAffix;
+	}
+
+	public Boolean getIsIframe() {
+		return isIframe;
+	}
+
+	public void setIsIframe(Boolean isIframe) {
+		this.isIframe = isIframe;
+	}
+
+	public String getLinkPath() {
+		return linkPath;
+	}
+
+	public void setLinkPath(String linkPath) {
+		this.linkPath = linkPath;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -24,6 +24,9 @@
         <result column="del_flag_" property="delFlag"/>
         <result column="hidden_" property="hid"/>
         <result column="memo_" property="memo"/>
+        <result column="is_affix_" property="isAffix"/>
+        <result column="is_iframe_" property="isIframe"/>
+        <result column="link_path_" property="linkPath"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HolidaysFestivalsController.java

@@ -0,0 +1,95 @@
+package com.yonge.cooleshow.admin.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.toolset.log.model.AuditLogAnnotation;
+
+@RequestMapping("holidaysFestivals")
+@Api(tags = "节假日")
+@RestController
+public class HolidaysFestivalsController extends BaseController {
+
+	@Autowired
+	private HolidaysFestivalsService holidaysFestivalsService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("按年查询节假日")
+	@ApiImplicitParam(name = "year", value = "年份", required = false, dataType = "Integer", paramType = "path")
+	@GetMapping(value = "/query/{year}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object query(@PathVariable("year") Integer year) {
+		
+		HolidaysFestivals originHolidaysFestivals = holidaysFestivalsService.queryByYear(year);
+
+		return succeed(originHolidaysFestivals);
+	}
+
+	@ApiOperation("新增节假日")
+	@ApiImplicitParam(name = "HolidaysFestivals", value = "节假日对象", required = false, dataType = "HolidaysFestivals", paramType = "body")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "新增节假日", interfaceURL = "holidaysFestivals/add")
+	@PreAuthorize("@pcs.hasPermissions('holidaysFestivals/add')")
+	public Object add(@RequestBody HolidaysFestivals holidaysFestivals) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+
+		if (holidaysFestivals.getYear() == null || holidaysFestivals.getYear() <= 2020) {
+			return failed("参数错误");
+		}
+
+		// 检查是否已经新增
+		HolidaysFestivals originHolidaysFestivals = holidaysFestivalsService.queryByYear(holidaysFestivals.getYear());
+
+		if (originHolidaysFestivals != null) {
+			return failed("该年份已提交，请勿重复提交");
+		}
+
+		Date date = new Date();
+		holidaysFestivals.setCreateTime(date).setCreateBy(user.getId()).setUpdateTime(date).setUpdateBy(user.getId());
+		holidaysFestivalsService.insert(holidaysFestivals);
+		return succeed();
+	}
+
+	@ApiOperation("更新节假日")
+	@ApiImplicitParam(name = "HolidaysFestivals", value = "节假日对象", required = false, dataType = "HolidaysFestivals", paramType = "body")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "更新节假日", interfaceURL = "holidaysFestivals/update")
+	@PreAuthorize("@pcs.hasPermissions('holidaysFestivals/update')")
+	public Object update(HolidaysFestivals holidaysFestivals) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+
+		Date date = new Date();
+		holidaysFestivals.setUpdateTime(date).setUpdateBy(user.getId());
+
+		holidaysFestivalsService.update(holidaysFestivals);
+		return succeed();
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/HolidaysFestivalsDao.java

@@ -0,0 +1,10 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+
+public interface HolidaysFestivalsDao extends BaseDAO<Integer, HolidaysFestivals> {
+
+	HolidaysFestivals queryByYear(int year);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/HolidaysFestivals.java

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(holidays_festivals):
+ */
+public class HolidaysFestivals {
+
+	@ApiModelProperty(value = "编号",required = false)
+	private Integer id;
+	
+	@ApiModelProperty(value = "年份",required = false)
+	private Integer year;
+	
+	@ApiModelProperty(value = "节假日json",required = false)
+	private String holidaysFestivalsJson;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "修改时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "创建人",required = false)
+	private Long createBy;
+	
+	@ApiModelProperty(value = "修改人",required = false)
+	private Long updateBy;
+	
+	public HolidaysFestivals setId(Integer id){
+		this.id = id;
+		return this;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public HolidaysFestivals setYear(Integer year){
+		this.year = year;
+		return this;
+	}
+	
+	public Integer getYear(){
+		return this.year;
+	}
+			
+	public HolidaysFestivals setHolidaysFestivalsJson(String holidaysFestivalsJson){
+		this.holidaysFestivalsJson = holidaysFestivalsJson;
+		return this;
+	}
+	
+	public String getHolidaysFestivalsJson(){
+		return this.holidaysFestivalsJson;
+	}
+			
+	public HolidaysFestivals setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+		return this;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public HolidaysFestivals setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+		return this;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public HolidaysFestivals setCreateBy(Long createBy){
+		this.createBy = createBy;
+		return this;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	public HolidaysFestivals setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+		return this;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/HolidaysFestivalsService.java

@@ -0,0 +1,10 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface HolidaysFestivalsService extends BaseService<Integer, HolidaysFestivals> {
+
+	HolidaysFestivals queryByYear(int year);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HolidaysFestivalsServiceImpl.java

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
+import com.yonge.cooleshow.biz.dal.dao.HolidaysFestivalsDao;
+
+@Service
+public class HolidaysFestivalsServiceImpl extends BaseServiceImpl<Integer, HolidaysFestivals>  implements HolidaysFestivalsService {
+	
+	@Autowired
+	private HolidaysFestivalsDao holidaysFestivalsDao;
+
+	@Override
+	public BaseDAO<Integer, HolidaysFestivals> getDAO() {
+		return holidaysFestivalsDao;
+	}
+
+	@Override
+	public HolidaysFestivals queryByYear(int year) {
+		return holidaysFestivalsDao.queryByYear(year);
+	}
+	
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/HolidaysFestivalsMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.HolidaysFestivalsDao">
+
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals"
+		id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="year_" property="year" />
+		<result column="holidays_festivals_json_" property="holidaysFestivalsJson" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_by_" property="updateBy" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap">
+		SELECT * FROM
+		holidays_festivals WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM holidays_festivals
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO
+		holidays_festivals
+		(id_,year_,holidays_festivals_json_,create_time_,update_time_,create_by_,update_by_)
+		VALUES(#{id},#{year},#{holidaysFestivalsJson},#{createTime},#{updateTime},#{createBy},#{updateBy})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals">
+		UPDATE holidays_festivals
+		<set>
+			<if test="updateBy != null">
+				update_by_ = #{updateBy},
+			</if>
+			<if test="createBy != null">
+				create_by_ = #{createBy},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="holidaysFestivalsJson != null">
+				holidays_festivals_json_ = #{holidaysFestivalsJson},
+			</if>
+			<if test="year != null">
+				year_ = #{year},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM holidays_festivals WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM holidays_festivals ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM holidays_festivals
+	</select>
+	
+	<select id="queryByYear" resultMap="BaseResultMap">
+		SELECT * FROM holidays_festivals where year_ = #{year}
+	</select>
+</mapper>

toolset/codegen/src/main/resources/template/pojo.ftl

@@ -18,8 +18,9 @@ public class ${table.className} {
 	[/#list]
 	[#list props as prop]
 		[#if prop.javaTypeName == 'boolean']
-	public void set${prop.propertyName?cap_first}(${prop.javaTypeName} ${prop.propertyName}){
+	public ${table.className} set${prop.propertyName?cap_first}(${prop.javaTypeName} ${prop.propertyName}){
 		this.${prop.propertyName} = ${prop.propertyName};
+		return this;
 	}
 	
 	public boolean is${prop.propertyName?cap_first}(){
@@ -27,8 +28,9 @@ public class ${table.className} {
 	}
 			
 		[#else]
-	public void set${prop.propertyName?cap_first}(${prop.javaTypeName} ${prop.propertyName}){
+	public ${table.className} set${prop.propertyName?cap_first}(${prop.javaTypeName} ${prop.propertyName}){
 		this.${prop.propertyName} = ${prop.propertyName};
+		return this;
 	}
 	
 	public ${prop.javaTypeName} get${prop.propertyName?cap_first}(){