Skip to content

C
chinafrica
提交 0cbebe1a authored 作者: zgy's avatar zgy
浏览文件
操作

修改一个bug

上级 fbe7430c
隐藏空白字符变更
内嵌 并排
正在显示 包含 307 行增加 和 93 行删除
platform-admin/src/main/java/com/platform/entity/TbCfClassificationEntity.java
浏览文件 @ 0cbebe1a
......@@ -8,7 +8,7 @@ import java.util.Date;
* 表名 tb_cf_classification
*
* @author lipengjun
* @date 2020-03-01 14:05:19
* @date 2020-03-03 13:12:53
*/
public class TbCfClassificationEntity implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -37,6 +37,14 @@ public class TbCfClassificationEntity implements Serializable {
* 是否展示
*/
private String isShow;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 设置：首页分类导航ID
......@@ -116,4 +124,30 @@ public class TbCfClassificationEntity implements Serializable {
public String getIsShow() {
return isShow;
}
/**
* 设置：创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取：创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 设置：更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 获取：更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
}
platform-admin/src/main/java/com/platform/entity/TbCfPostersEntity.java
浏览文件 @ 0cbebe1a
......@@ -8,7 +8,7 @@ import java.util.Date;
* 表名 tb_cf_posters
*
* @author lipengjun
* @date 2020-03-01 16:59:28
* @date 2020-03-03 13:49:47
*/
public class TbCfPostersEntity implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -29,6 +29,10 @@ public class TbCfPostersEntity implements Serializable {
* 图片
*/
private String postersPicture;
/**
* 排序
*/
private Integer sort;
/**
* 是否展示
*/
......@@ -41,6 +45,14 @@ public class TbCfPostersEntity implements Serializable {
* 备注
*/
private String remark;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 设置：海报ID
......@@ -94,6 +106,19 @@ public class TbCfPostersEntity implements Serializable {
public String getPostersPicture() {
return postersPicture;
}
/**
* 设置：排序
*/
public void setSort(Integer sort) {
this.sort = sort;
}
/**
* 获取：排序
*/
public Integer getSort() {
return sort;
}
/**
* 设置：是否展示
*/
......@@ -133,4 +158,30 @@ public class TbCfPostersEntity implements Serializable {
public String getRemark() {
return remark;
}
/**
* 设置：创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取：创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 设置：更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 获取：更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
}
platform-admin/src/main/java/com/platform/entity/TbCfSortEntity.java
浏览文件 @ 0cbebe1a
......@@ -49,10 +49,7 @@ public class TbCfSortEntity implements Serializable {
* 更新时间
*/
private Date updateTime;
/**
* 是否展示
*/
private Integer isShow;
/**
* 设置：首页排序ID
......@@ -171,17 +168,5 @@ public class TbCfSortEntity implements Serializable {
public Date getUpdateTime() {
return updateTime;
}
/**
* 设置：是否展示
*/
public void setIsShow(Integer isShow) {
this.isShow = isShow;
}
/**
* 获取：是否展示
*/
public Integer getIsShow() {
return isShow;
}
}
platform-admin/src/main/java/com/platform/service/impl/TbCfClassificationServiceImpl.java
浏览文件 @ 0cbebe1a
......@@ -7,6 +7,7 @@ import com.platform.utils.IdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -39,11 +40,14 @@ public class TbCfClassificationServiceImpl implements TbCfClassificationService
@Override
public int save(TbCfClassificationEntity tbCfClassification) {
tbCfClassification.setId(IdUtil.createIdbyUUID());
tbCfClassification.setCreateTime(new Date());
tbCfClassification.setUpdateTime(new Date());
return tbCfClassificationDao.save(tbCfClassification);
}
@Override
public int update(TbCfClassificationEntity tbCfClassification) {
tbCfClassification.setUpdateTime(new Date());
return tbCfClassificationDao.update(tbCfClassification);
}
......
platform-admin/src/main/java/com/platform/service/impl/TbCfPostersServiceImpl.java
浏览文件 @ 0cbebe1a
......@@ -7,6 +7,7 @@ import com.platform.utils.IdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -39,11 +40,14 @@ public class TbCfPostersServiceImpl implements TbCfPostersService {
@Override
public int save(TbCfPostersEntity tbCfPosters) {
tbCfPosters.setId(IdUtil.createIdbyUUID());
tbCfPosters.setCreateTime(new Date());
return tbCfPostersDao.save(tbCfPosters);
}
@Override
public int update(TbCfPostersEntity tbCfPosters) {
tbCfPosters.setCreateTime(new Date());
tbCfPosters.setUpdateTime(new Date());
return tbCfPostersDao.update(tbCfPosters);
}
......
platform-admin/src/main/resources/com/platform/dao/TbCfClassificationDao.xml
浏览文件 @ 0cbebe1a
......@@ -10,6 +10,8 @@
<result property="picture" column="picture"/>
<result property="sort" column="sort"/>
<result property="isShow" column="is_show"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfClassificationEntity">
......@@ -19,7 +21,9 @@
`class_title`,
`picture`,
`sort`,
`is_show`
`is_show`,
`create_time`,
`update_time`
from tb_cf_classification
where id = #{id}
</select>
......@@ -31,7 +35,9 @@
`class_title`,
`picture`,
`sort`,
`is_show`
`is_show`,
`create_time`,
`update_time`
from tb_cf_classification
WHERE 1=1
<if test="name != null and name.trim() != ''">
......@@ -65,14 +71,18 @@
`class_title`,
`picture`,
`sort`,
`is_show`)
`is_show`,
`create_time`,
`update_time`)
values(
#{id},
#{goodtypeId},
#{classTitle},
#{picture},
#{sort},
#{isShow})
#{isShow},
#{createTime},
#{updateTime})
</insert>
<update id="update" parameterType="com.platform.entity.TbCfClassificationEntity">
......@@ -82,7 +92,9 @@
<if test="classTitle != null">`class_title` = #{classTitle}, </if>
<if test="picture != null">`picture` = #{picture}, </if>
<if test="sort != null">`sort` = #{sort}, </if>
<if test="isShow != null">`is_show` = #{isShow}</if>
<if test="isShow != null">`is_show` = #{isShow}, </if>
<if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
</update>
......
platform-admin/src/main/resources/com/platform/dao/TbCfPostersDao.xml
浏览文件 @ 0cbebe1a
......@@ -8,9 +8,12 @@
<result property="postersTitle" column="posters_title"/>
<result property="postersType" column="posters_type"/>
<result property="postersPicture" column="posters_picture"/>
<result property="sort" column="sort"/>
<result property="isShow" column="is_show"/>
<result property="redirectUrl" column="redirect_url"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfPostersEntity">
......@@ -19,9 +22,12 @@
`posters_title`,
`posters_type`,
`posters_picture`,
`sort`,
`is_show`,
`redirect_url`,
`remark`
`remark`,
`create_time`,
`update_time`
from tb_cf_posters
where id = #{id}
</select>
......@@ -32,9 +38,12 @@
`posters_title`,
`posters_type`,
`posters_picture`,
`sort`,
`is_show`,
`redirect_url`,
`remark`
`remark`,
`create_time`,
`update_time`
from tb_cf_posters
WHERE 1=1
<if test="name != null and name.trim() != ''">
......@@ -67,17 +76,23 @@
`posters_title`,
`posters_type`,
`posters_picture`,
`sort`,
`is_show`,
`redirect_url`,
`remark`)
`remark`,
`create_time`,
`update_time`)
values(
#{id},
#{postersTitle},
#{postersType},
#{postersPicture},
#{sort},
#{isShow},
#{redirectUrl},
#{remark})
#{remark},
#{createTime},
#{updateTime})
</insert>
<update id="update" parameterType="com.platform.entity.TbCfPostersEntity">
......@@ -86,9 +101,12 @@
<if test="postersTitle != null">`posters_title` = #{postersTitle}, </if>
<if test="postersType != null">`posters_type` = #{postersType}, </if>
<if test="postersPicture != null">`posters_picture` = #{postersPicture}, </if>
<if test="sort != null">`sort` = #{sort}, </if>
<if test="isShow != null">`is_show` = #{isShow}, </if>
<if test="redirectUrl != null">`redirect_url` = #{redirectUrl}, </if>
<if test="remark != null">`remark` = #{remark}</if>
<if test="remark != null">`remark` = #{remark}, </if>
<if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
</update>
......
platform-admin/src/main/resources/com/platform/dao/TbCfSortDao.xml
浏览文件 @ 0cbebe1a
......@@ -3,18 +3,17 @@
<mapper namespace="com.platform.dao.TbCfSortDao">
<resultMap type="com.platform.entity.TbCfSortEntity" id="tbCfSortMap">
<result property="id" column="id"/>
<result property="moduleId" column="module_id"/>
<result property="sort" column="sort"/>
<result property="module" column="module"/>
<result property="name" column="name"/>
<result property="type" column="type"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="isShow" column="is_show"/>
</resultMap>
<resultMap type="com.platform.entity.TbCfSortEntity" id="tbCfSortMap">
<result property="id" column="id"/>
<result property="moduleId" column="module_id"/>
<result property="sort" column="sort"/>
<result property="module" column="module"/>
<result property="name" column="name"/>
<result property="type" column="type"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfSortEntity">
select
......@@ -26,50 +25,48 @@
`type`,
`remark`,
`create_time`,
`update_time`,
`is_show`
`update_time`
from tb_cf_sort
where id = #{id}
</select>
<select id="queryList" resultType="com.platform.entity.TbCfSortEntity">
select
`id`,
`module_id`,
`sort`,
`module`,
`name`,
`type`,
`remark`,
`create_time`,
`update_time`,
`is_show`
`id`,
`module_id`,
`sort`,
`module`,
`name`,
`type`,
`remark`,
`create_time`,
`update_time`
from tb_cf_sort
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by id desc
order by id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_sort
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.platform.entity.TbCfSortEntity">
insert into tb_cf_sort(
`id`,
......@@ -80,8 +77,7 @@
`type`,
`remark`,
`create_time`,
`update_time`,
`is_show`)
`update_time`)
values(
#{id},
#{moduleId},
......@@ -91,12 +87,11 @@
#{type},
#{remark},
#{createTime},
#{updateTime},
#{isShow})
#{updateTime})
</insert>
<update id="update" parameterType="com.platform.entity.TbCfSortEntity">
update tb_cf_sort
update tb_cf_sort
<set>
<if test="moduleId != null">`module_id` = #{moduleId}, </if>
<if test="sort != null">`sort` = #{sort}, </if>
......@@ -105,18 +100,17 @@
<if test="type != null">`type` = #{type}, </if>
<if test="remark != null">`remark` = #{remark}, </if>
<if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="updateTime != null">`update_time` = #{updateTime}, </if>
<if test="isShow != null">`is_show` = #{isShow}</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
</update>
<delete id="delete">
delete from tb_cf_sort where id = #{value}
</delete>
<delete id="deleteBatch">
delete from tb_cf_sort where id in
delete from tb_cf_sort where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/TbCfSortDao.xml 0 → 100644
浏览文件 @ 0cbebe1a
<?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.platform.dao.TbCfSortDao">
<resultMap type="com.platform.entity.TbCfSortEntity" id="tbCfSortMap">
<result property="id" column="id"/>
<result property="moduleId" column="module_id"/>
<result property="sort" column="sort"/>
<result property="module" column="module"/>
<result property="name" column="name"/>
<result property="type" column="type"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfSortEntity">
select
`id`,
`module_id`,
`sort`,
`module`,
`name`,
`type`,
`remark`,
`create_time`,
`update_time`
from tb_cf_sort
where id = #{id}
</select>
<select id="queryList" resultType="com.platform.entity.TbCfSortEntity">
select
`id`,
`module_id`,
`sort`,
`module`,
`name`,
`type`,
`remark`,
`create_time`,
`update_time`
from tb_cf_sort
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by id desc
</otherwise>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_sort
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.platform.entity.TbCfSortEntity">
insert into tb_cf_sort(
`id`,
`module_id`,
`sort`,
`module`,
`name`,
`type`,
`remark`,
`create_time`,
`update_time`)
values(
#{id},
#{moduleId},
#{sort},
#{module},
#{name},
#{type},
#{remark},
#{createTime},
#{updateTime})
</insert>
<update id="update" parameterType="com.platform.entity.TbCfSortEntity">
update tb_cf_sort
<set>
<if test="moduleId != null">`module_id` = #{moduleId}, </if>
<if test="sort != null">`sort` = #{sort}, </if>
<if test="module != null">`module` = #{module}, </if>
<if test="name != null">`name` = #{name}, </if>
<if test="type != null">`type` = #{type}, </if>
<if test="remark != null">`remark` = #{remark}, </if>
<if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
</update>
<delete id="delete">
delete from tb_cf_sort where id = #{value}
</delete>
<delete id="deleteBatch">
delete from tb_cf_sort where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfsort.html
浏览文件 @ 0cbebe1a
......@@ -45,21 +45,12 @@
<Form-item label="名称" prop="name">
<i-input v-model="tbCfSort.name" placeholder="名称"/>
</Form-item>
<Form-item label="1:分类导航栏 2.海报图 3.爬虫品牌" prop="type">
<i-input v-model="tbCfSort.type" placeholder="1:分类导航栏 2.海报图 3.爬虫品牌"/>
<Form-item label="分类" prop="type">
<i-input v-model="tbCfSort.type" placeholder="1:分类导航栏 2.爬虫品牌 3.海报图"/>
</Form-item>
<Form-item label="备注" prop="remark">
<i-input v-model="tbCfSort.remark" placeholder="备注"/>
</Form-item>
<Form-item label="创建时间" prop="createTime">
<i-input v-model="tbCfSort.createTime" placeholder="创建时间"/>
</Form-item>
<Form-item label="更新时间" prop="updateTime">
<i-input v-model="tbCfSort.updateTime" placeholder="更新时间"/>
</Form-item>
<Form-item label="是否展示" prop="isShow">
<i-input v-model="tbCfSort.isShow" placeholder="是否展示"/>
</Form-item>
<Form-item>
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
<i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
......
platform-admin/src/main/webapp/js/sys/tbcfclassification.js
浏览文件 @ 0cbebe1a
......@@ -7,7 +7,8 @@ $(function () {
{label: '标题', name: 'classTitle', index: 'class_title', width: 80},
{label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
{label: '排序', name: 'sort', index: 'sort', width: 80},
{label: '是否展示', name: 'isShow', index: 'is_show', width: 80}]
{label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}]
});
});
......
platform-admin/src/main/webapp/js/sys/tbcfposters.js
浏览文件 @ 0cbebe1a
......@@ -6,9 +6,11 @@ $(function () {
{label: '标题', name: 'postersTitle', index: 'posters_title', width: 80},
{label: '类型', name: 'postersType', index: 'posters_type', width: 80},
{label: '图片', name: 'postersPicture', index: 'posters_picture', width: 80, formatter: imageFormat},
{label: '是否展示', name: 'isShow', index: 'is_show', width: 80},
{label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},
{label: '跳转链接', name: 'redirectUrl', index: 'redirect_url', width: 80},
{label: '备注', name: 'remark', index: 'remark', width: 80}]
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
{label: '备注', name: 'remark', index: 'remark', width: 80}
]
});
});
......
platform-admin/src/main/webapp/js/sys/tbcfsort.js
浏览文件 @ 0cbebe1a
......@@ -7,11 +7,10 @@ $(function () {
{label: '序号', name: 'sort', index: 'sort', width: 80},
{label: '模块', name: 'module', index: 'module', width: 80},
{label: '名称', name: 'name', index: 'name', width: 80},
{label: '/*1:分类导航栏 2.海报图 3.爬虫品牌*/ 类型', name: 'type', index: 'type', width: 80},
{label: '分类', name: 'type', index: 'type', width: 80},
{label: '备注', name: 'remark', index: 'remark', width: 80},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
{label: '更新时间', name: 'updateTime', index: 'update_time', width: 80},
{label: '是否展示', name: 'isShow', index: 'is_show', width: 80}]
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}
]
});
});
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论