Commit 1eb64760 authored by 廖旭伟's avatar 廖旭伟

素材字体增加原始文件名字段

parent fb0c095d
......@@ -76,6 +76,7 @@ data|object|数据对象
  lastLoginAddress|String|最后一次登录地址
  lastModPwdTime|Date|最后修改密码时间
  lastModPwdAddr|String|最后修改密码地址
  roleIds|arrays|用户拥有的角色
dict|object|字典对象
**响应消息样例:**
......@@ -205,6 +206,7 @@ lastLoginTime|Date|是|最后一次登录时间
lastLoginAddress|String|是|最后一次登录地址
lastModPwdTime|Date|是|最后修改密码时间
lastModPwdAddr|String|是|最后修改密码地址
roleIds|arrays|用户拥有的角色
**请求样例:**
```
......@@ -228,7 +230,8 @@ lastModPwdAddr|String|是|最后修改密码地址
"lastLoginTime":"2022-06-15",
"lastLoginAddress":"9g4af8",
"lastModPwdTime":"2022-06-15",
"lastModPwdAddr":"nuwdcz"
"lastModPwdAddr":"nuwdcz",
"roleIds":[1,2]
}
```
......@@ -2112,6 +2115,7 @@ data|object|数据对象
  createTime|Date|上传时间
  fontDesc|String|字体描述
  fontPath|String|字体下载地址(相对地址)
  fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2156,6 +2160,7 @@ data|object|数据对象
 createTime|Date|上传时间
 fontDesc|String|字体描述
 fontPath|String|字体下载地址(相对地址)
 fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2168,7 +2173,8 @@ dict|object|字典对象
"createUserId":9651,
"createTime":"2022-06-07",
"fontDesc":"tuhypa",
"fontPath":"dug8lu"
"fontPath":"dug8lu",
"fileName":"m8j6ap"
}
}
```
......@@ -2190,13 +2196,15 @@ dict|object|字典对象
fontName|String|是|字体名称
fontDesc|String|是|字体描述
fontPath|String|是|字体下载地址(相对地址)
fileName|String|是|文件原始名称
**请求样例:**
```
{
"fontName":"jl0ole",
"fontDesc":"t2crnw",
"fontPath":"c3rwk2"
"fontPath":"c3rwk2",
"fileName":"n16409"
}
```
......@@ -2215,6 +2223,7 @@ data|object|数据对象
  createTime|Date|上传时间
  fontDesc|String|字体描述
  fontPath|String|字体下载地址(相对地址)
  fileName|String|文件原始名称
**响应消息样例:**
```
......@@ -2311,6 +2320,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2358,6 +2368,7 @@ data|object|数据对象
 pictureDesc|String|图片描述
 picturePath|String|图片下载地址(相对地址)
 pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
 fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2373,7 +2384,8 @@ dict|object|字典对象
"createTime":"2022-06-07",
"pictureDesc":"yjnw7d",
"picturePath":"x9ujzr",
"pictureType":1898
"pictureType":3770,
"fileName":"m8j6ap"
}
}
```
......@@ -2398,6 +2410,7 @@ pictureClassifyId|Long|是|图片分类(系统参数中获取,字典数据
pictureDesc|String|是|图片描述
picturePath|String|是|图片下载地址(相对地址)
pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
fileName|String|是|文件原始名称
**请求样例:**
```
......@@ -2407,7 +2420,8 @@ pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图
"pictureClassifyId":4554,
"pictureDesc":"ludurj",
"picturePath":"vaj5fe",
"pictureType":9733
"pictureType":3770,
"fileName":"m8j6ap"
}
```
......@@ -2429,6 +2443,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
**响应消息样例:**
```
......@@ -2525,6 +2540,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2572,6 +2588,7 @@ data|object|数据对象
 pictureDesc|String|图片描述
 picturePath|String|图片下载地址(相对地址)
 pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
 fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2587,7 +2604,8 @@ dict|object|字典对象
"createTime":"2022-06-07",
"pictureDesc":"yjnw7d",
"picturePath":"x9ujzr",
"pictureType":1898
"pictureType":4758,
"fileName":"n16409"
}
}
```
......@@ -2612,6 +2630,7 @@ pictureClassifyId|Long|是|图片分类(系统参数中获取,字典数据
pictureDesc|String|是|图片描述
picturePath|String|是|图片下载地址(相对地址)
pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
fileName|String|是|文件原始名称
**请求样例:**
```
......@@ -2621,7 +2640,8 @@ pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图
"pictureClassifyId":4554,
"pictureDesc":"ludurj",
"picturePath":"vaj5fe",
"pictureType":9733
"pictureType":4758,
"fileName":"n16409"
}
```
......@@ -2643,6 +2663,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
**响应消息样例:**
```
......@@ -2739,6 +2760,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2786,6 +2808,7 @@ data|object|数据对象
 pictureDesc|String|图片描述
 picturePath|String|图片下载地址(相对地址)
 pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
 fileName|String|文件原始名称
dict|object|字典对象
**响应消息样例:**
......@@ -2801,7 +2824,8 @@ dict|object|字典对象
"createTime":"2022-06-07",
"pictureDesc":"yjnw7d",
"picturePath":"x9ujzr",
"pictureType":1898
"pictureType":4758,
"fileName":"n16409"
}
}
```
......@@ -2826,6 +2850,7 @@ pictureClassifyId|Long|是|图片分类(系统参数中获取,字典数据
pictureDesc|String|是|图片描述
picturePath|String|是|图片下载地址(相对地址)
pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
fileName|String|是|文件原始名称
**请求样例:**
```
......@@ -2835,7 +2860,8 @@ pictureType|Integer|是|图片类型,0:普通图片,1:素材,2:背景图
"pictureClassifyId":4554,
"pictureDesc":"ludurj",
"picturePath":"vaj5fe",
"pictureType":9733
"pictureType":4758,
"fileName":"n16409"
}
```
......@@ -2857,6 +2883,7 @@ data|object|数据对象
  pictureDesc|String|图片描述
  picturePath|String|图片下载地址(相对地址)
  pictureType|Integer|图片类型,0:普通图片,1:素材,2:背景图片。默认:0
  fileName|String|文件原始名称
**响应消息样例:**
```
......
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.font.model.vo.FontMaterialVo;
* 字体素材实体对象
*
* @author zxfei
* @date 2022-06-08
* @date 2022-06-15
*/
public class FontMaterialEntity extends FontMaterialVo {
......@@ -28,6 +28,10 @@ public class FontMaterialEntity extends FontMaterialVo {
* 字体下载地址(相对地址)
*/
private String fontPath;
/**
* 文件原始名称
*/
private String fileName;
......@@ -74,6 +78,20 @@ public class FontMaterialEntity extends FontMaterialVo {
public void setFontPath(String fontPath){
this.fontPath = fontPath;
}
/**
* 获取 文件原始名称
* @return String
*/
public String getFileName(){
return fileName;
}
/**
* 设置 文件原始名称
* @param fileName
*/
public void setFileName(String fileName){
this.fileName = fileName;
}
......@@ -99,15 +117,18 @@ public class FontMaterialEntity extends FontMaterialVo {
sb.append(",fontName:").append(getFontName());
sb.append(",fontDesc:").append(getFontDesc());
sb.append(",fontPath:").append(getFontPath());
sb.append(",fileName:").append(getFileName());
return sb.toString();
}
public void initAttrValue(){
this.fontName = "";
this.fontName = "id";
this.fontDesc = "";
this.fontPath = "";
this.fileName = "";
}
}
\ No newline at end of file
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.font.model.FontMaterialEntity;
* 字体素材查询对象
*
* @author zxfei
* @date 2022-06-08
* @date 2022-06-15
*/
public class FontMaterialQuery extends FontMaterialEntity {
/** 开始 主键ID,主键,自增长 */
......@@ -48,6 +48,9 @@ public class FontMaterialQuery extends FontMaterialEntity {
/** 字体下载地址(相对地址) */
private List<String> fontPathList;
/** 文件原始名称 */
private List<String> fileNameList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<FontMaterialQuery> orConditionList;
......@@ -262,6 +265,21 @@ public class FontMaterialQuery extends FontMaterialEntity {
this.fontPathList = fontPathList;
}
/**
* 获取 文件原始名称
* @return fileNameList
*/
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 文件原始名称
* @param fileNameList
*/
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/**
* 设置 主键ID,主键,自增长
* @param id
*/
......@@ -409,6 +427,25 @@ public class FontMaterialQuery extends FontMaterialEntity {
return this;
}
/**
* 设置 文件原始名称
* @param fileName
*/
public FontMaterialQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 文件原始名称
* @param fileNameList
*/
public FontMaterialQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.picture.model.vo.PictureMaterialVo;
* 图片素材实体对象
*
* @author zxfei
* @date 2022-06-08
* @date 2022-06-15
*/
public class PictureMaterialEntity extends PictureMaterialVo {
......@@ -40,6 +40,10 @@ public class PictureMaterialEntity extends PictureMaterialVo {
* 图片类型,0:普通图片,1:素材,2:背景图片。默认:0
*/
private Integer pictureType;
/**
* 文件原始名称
*/
private String fileName;
......@@ -128,6 +132,20 @@ public class PictureMaterialEntity extends PictureMaterialVo {
public void setPictureType(Integer pictureType){
this.pictureType = pictureType;
}
/**
* 获取 文件原始名称
* @return String
*/
public String getFileName(){
return fileName;
}
/**
* 设置 文件原始名称
* @param fileName
*/
public void setFileName(String fileName){
this.fileName = fileName;
}
......@@ -156,12 +174,13 @@ public class PictureMaterialEntity extends PictureMaterialVo {
sb.append(",pictureDesc:").append(getPictureDesc());
sb.append(",picturePath:").append(getPicturePath());
sb.append(",pictureType:").append(getPictureType());
sb.append(",fileName:").append(getFileName());
return sb.toString();
}
public void initAttrValue(){
this.pictureName = "";
this.pictureName = "id";
this.pictureGroupId = null;
......@@ -172,5 +191,7 @@ public class PictureMaterialEntity extends PictureMaterialVo {
this.picturePath = "";
this.pictureType = null;
this.fileName = "";
}
}
\ No newline at end of file
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.picture.model.PictureMaterialEntity;
* 图片素材查询对象
*
* @author zxfei
* @date 2022-06-08
* @date 2022-06-15
*/
public class PictureMaterialQuery extends PictureMaterialEntity {
/** 开始 主键ID,主键,自增长 */
......@@ -84,6 +84,9 @@ public class PictureMaterialQuery extends PictureMaterialEntity {
/** 图片类型,0:普通图片,1:素材,2:背景图片。默认:0列表 */
private List <Integer> pictureTypeList;
/** 文件原始名称 */
private List<String> fileNameList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PictureMaterialQuery> orConditionList;
......@@ -489,6 +492,21 @@ public class PictureMaterialQuery extends PictureMaterialEntity {
this.pictureTypeList = pictureTypeList;
}
/**
* 获取 文件原始名称
* @return fileNameList
*/
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 文件原始名称
* @param fileNameList
*/
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/**
* 设置 主键ID,主键,自增长
* @param id
......@@ -772,6 +790,25 @@ public class PictureMaterialQuery extends PictureMaterialEntity {
return this;
}
/**
* 设置 文件原始名称
* @param fileName
*/
public PictureMaterialQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 文件原始名称
* @param fileNameList
*/
public PictureMaterialQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -11,6 +11,7 @@
<result property="createTime" column="createTime" />
<result property="fontDesc" column="fontDesc" />
<result property="fontPath" column="fontPath" />
<result property="fileName" column="fileName" />
</resultMap>
......@@ -36,23 +37,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fontPath') or colPickMode == 1 and data.containsKey('fontPath')))">
a.fontPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.fileName,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="FontMaterialEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_font_material
(fontName,createUserId,createTime,fontDesc,fontPath)
(fontName,createUserId,createTime,fontDesc,fontPath,fileName)
VALUES
(#{fontName},#{createUserId},#{createTime},#{fontDesc},#{fontPath})
(#{fontName},#{createUserId},#{createTime},#{fontDesc},#{fontPath},#{fileName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_font_material
(fontName,createUserId,createTime,fontDesc,fontPath)
(fontName,createUserId,createTime,fontDesc,fontPath,fileName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.fontName},#{item.createUserId},#{item.createTime},#{item.fontDesc},#{item.fontPath})
(#{item.fontName},#{item.createUserId},#{item.createTime},#{item.fontDesc},#{item.fontPath},#{item.fileName})
</foreach>
</insert>
......@@ -80,6 +84,9 @@
<if test="(colPickMode==0 and data.containsKey('fontPath')) or (colPickMode==1 and !data.containsKey('fontPath'))">
a.fontPath=#{data.fontPath},
</if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -132,6 +139,13 @@
</if>
</foreach>
</trim>
<trim prefix="fileName=(case" suffix="ELSE fileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
when a.id=#{item.id} then #{item.fileName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -335,6 +349,21 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.fileName == null">
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -378,6 +407,11 @@
<if test='orderCol.fontPath != null and "DESC".equalsIgnoreCase(orderCol.fontPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fileName')">
a.fileName
<if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
......@@ -14,6 +14,7 @@
<result property="pictureDesc" column="pictureDesc" />
<result property="picturePath" column="picturePath" />
<result property="pictureType" column="pictureType" />
<result property="fileName" column="fileName" />
</resultMap>
......@@ -48,23 +49,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pictureType') or colPickMode == 1 and data.containsKey('pictureType')))">
a.pictureType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.fileName,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PictureMaterialEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_picture_material
(pictureName,pictureGroupId,pictureClassifyId,createUserId,createTime,pictureDesc,picturePath,pictureType)
(pictureName,pictureGroupId,pictureClassifyId,createUserId,createTime,pictureDesc,picturePath,pictureType,fileName)
VALUES
(#{pictureName},#{pictureGroupId},#{pictureClassifyId},#{createUserId},#{createTime},#{pictureDesc},#{picturePath},#{pictureType})
(#{pictureName},#{pictureGroupId},#{pictureClassifyId},#{createUserId},#{createTime},#{pictureDesc},#{picturePath},#{pictureType},#{fileName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_picture_material
(pictureName,pictureGroupId,pictureClassifyId,createUserId,createTime,pictureDesc,picturePath,pictureType)
(pictureName,pictureGroupId,pictureClassifyId,createUserId,createTime,pictureDesc,picturePath,pictureType,fileName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.pictureName},#{item.pictureGroupId},#{item.pictureClassifyId},#{item.createUserId},#{item.createTime},#{item.pictureDesc},#{item.picturePath},#{item.pictureType})
(#{item.pictureName},#{item.pictureGroupId},#{item.pictureClassifyId},#{item.createUserId},#{item.createTime},#{item.pictureDesc},#{item.picturePath},#{item.pictureType},#{item.fileName})
</foreach>
</insert>
......@@ -110,6 +114,9 @@
<if test="(colPickMode==0 and data.containsKey('pictureTypeIncrement')) or (colPickMode==1 and !data.containsKey('pictureTypeIncrement'))">
a.pictureType=ifnull(a.pictureType,0) + #{data.pictureTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -198,6 +205,13 @@
</choose>
</foreach>
</trim>
<trim prefix="fileName=(case" suffix="ELSE fileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
when a.id=#{item.id} then #{item.fileName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -464,6 +478,21 @@
${_conditionType_} a.pictureType <![CDATA[ <= ]]> #{${_conditionParam_}.pictureTypeEnd}
</if>
<if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.fileName == null">
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -522,6 +551,11 @@
<if test='orderCol.pictureType != null and "DESC".equalsIgnoreCase(orderCol.pictureType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fileName')">
a.fileName
<if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment