Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
C
chinafrica
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
chinafrica
Commits
c8afbd0f
提交
c8afbd0f
authored
9月 29, 2020
作者:
吴德鹏
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
广告投放页管理
上级
f35bb26a
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
677 行增加
和
95 行删除
+677
-95
AdvertisementController.java
...java/com/platform/controller/AdvertisementController.java
+7
-2
AdvertisementItemController.java
.../com/platform/controller/AdvertisementItemController.java
+17
-4
AdvertisementEntity.java
...rc/main/java/com/platform/entity/AdvertisementEntity.java
+31
-4
AdvertisementService.java
.../main/java/com/platform/service/AdvertisementService.java
+2
-2
AdvertisementServiceImpl.java
...a/com/platform/service/impl/AdvertisementServiceImpl.java
+27
-3
AdvertisementDao.xml
.../src/main/resources/com/platform/dao/AdvertisementDao.xml
+6
-0
advertisement.html
...admin/src/main/webapp/WEB-INF/page/sys/advertisement.html
+214
-19
advertisement.js
platform-admin/src/main/webapp/js/sys/advertisement.js
+373
-61
没有找到文件。
platform-admin/src/main/java/com/platform/controller/AdvertisementController.java
浏览文件 @
c8afbd0f
package
com
.
platform
.
controller
;
import
com.platform.entity.AdvertisementEntity
;
import
com.platform.service.AdvertisementItemService
;
import
com.platform.service.AdvertisementService
;
import
com.platform.utils.PageUtils
;
import
com.platform.utils.Query
;
...
...
@@ -67,7 +68,9 @@ public class AdvertisementController {
@RequiresPermissions
(
"advertisement:save"
)
@ResponseBody
public
R
save
(
@RequestBody
AdvertisementEntity
advertisement
)
{
advertisementService
.
save
(
advertisement
);
int
length
=
advertisement
.
getItemIds
().
length
();
String
itemIds
=
advertisement
.
getItemIds
().
substring
(
1
,
length
-
1
);
advertisementService
.
save
(
itemIds
,
advertisement
);
return
R
.
ok
();
}
...
...
@@ -79,7 +82,9 @@ public class AdvertisementController {
@RequiresPermissions
(
"advertisement:update"
)
@ResponseBody
public
R
update
(
@RequestBody
AdvertisementEntity
advertisement
)
{
advertisementService
.
update
(
advertisement
);
int
length
=
advertisement
.
getItemIds
().
length
();
String
itemIds
=
advertisement
.
getItemIds
().
substring
(
1
,
length
-
1
);
advertisementService
.
update
(
itemIds
,
advertisement
);
return
R
.
ok
();
}
...
...
platform-admin/src/main/java/com/platform/controller/AdvertisementItemController.java
浏览文件 @
c8afbd0f
...
...
@@ -63,14 +63,27 @@ public class AdvertisementItemController {
* 保存
*/
@RequestMapping
(
"/save"
)
@RequiresPermissions
(
"advertisementitem:save"
)
@ResponseBody
public
R
save
(
@RequestBody
AdvertisementItemEntity
advertisementItem
)
{
advertisementItemService
.
save
(
advertisementItem
);
return
R
.
ok
();
}
@RequestMapping
(
"/saveBatch"
)
@ResponseBody
public
R
saveBatch
(
@RequestParam
(
"aId"
)
String
aId
,
@RequestParam
(
"itemIds"
)
String
itemIds
)
{
String
itemIdArr
[]
=
itemIds
.
split
(
","
);
for
(
int
i
=
0
;
i
<
itemIdArr
.
length
;
i
++)
{
AdvertisementItemEntity
advertisementItem
=
new
AdvertisementItemEntity
();
advertisementItem
.
setAdId
(
aId
);
advertisementItem
.
setItemId
(
itemIdArr
[
i
]);
advertisementItemService
.
save
(
advertisementItem
);
}
return
R
.
ok
();
}
/**
* 修改
*/
...
...
@@ -102,8 +115,8 @@ public class AdvertisementItemController {
@ResponseBody
public
R
queryAll
(
@RequestParam
Map
<
String
,
Object
>
params
)
{
List
<
AdvertisementItemEntity
>
list
=
advertisementItemService
.
queryList
(
params
);
List
<
AdvertisementItemEntity
>
list
=
advertisementItemService
.
queryList
(
params
);
return
R
.
ok
().
put
(
"list"
,
list
);
return
R
.
ok
().
put
(
"list"
,
list
);
}
}
platform-admin/src/main/java/com/platform/entity/AdvertisementEntity.java
浏览文件 @
c8afbd0f
...
...
@@ -8,7 +8,7 @@ import java.util.Date;
* 表名 advertisement
*
* @author lipengjun
* @date 2020-09-2
5 16:34:49
* @date 2020-09-2
8 17:54:01
*/
public
class
AdvertisementEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -17,6 +17,8 @@ public class AdvertisementEntity implements Serializable {
* 广告投放ID
*/
private
String
id
;
private
String
itemIds
;
/**
* 广告名
*/
...
...
@@ -26,7 +28,11 @@ public class AdvertisementEntity implements Serializable {
*/
private
String
adLink
;
/**
* 状态
* banner图
*/
private
String
picture
;
/**
* 状态 0:已删除 1:活动进行中 2:活动已关闭 3:活动已结束
*/
private
Integer
status
;
/**
...
...
@@ -90,14 +96,27 @@ public class AdvertisementEntity implements Serializable {
return
adLink
;
}
/**
* 设置:状态
* 设置:banner图
*/
public
void
setPicture
(
String
picture
)
{
this
.
picture
=
picture
;
}
/**
* 获取:banner图
*/
public
String
getPicture
()
{
return
picture
;
}
/**
* 设置:状态 0:已删除 1:活动进行中 2:活动已关闭 3:活动已结束
*/
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
/**
* 获取:状态
* 获取:状态
0:已删除 1:活动进行中 2:活动已关闭 3:活动已结束
*/
public
Integer
getStatus
()
{
return
status
;
...
...
@@ -167,4 +186,12 @@ public class AdvertisementEntity implements Serializable {
public
String
getRemark
()
{
return
remark
;
}
public
String
getItemIds
()
{
return
itemIds
;
}
public
void
setItemIds
(
String
itemIds
)
{
this
.
itemIds
=
itemIds
;
}
}
platform-admin/src/main/java/com/platform/service/AdvertisementService.java
浏览文件 @
c8afbd0f
...
...
@@ -43,7 +43,7 @@ public interface AdvertisementService {
* @param advertisement 实体
* @return 保存条数
*/
int
save
(
AdvertisementEntity
advertisement
);
int
save
(
String
itemIds
,
AdvertisementEntity
advertisement
);
/**
* 根据主键更新实体
...
...
@@ -51,7 +51,7 @@ public interface AdvertisementService {
* @param advertisement 实体
* @return 更新条数
*/
int
update
(
AdvertisementEntity
advertisement
);
int
update
(
String
itemIds
,
AdvertisementEntity
advertisement
);
/**
* 根据主键删除
...
...
platform-admin/src/main/java/com/platform/service/impl/AdvertisementServiceImpl.java
浏览文件 @
c8afbd0f
package
com
.
platform
.
service
.
impl
;
import
com.platform.dao.AdvertisementDao
;
import
com.platform.dao.AdvertisementItemDao
;
import
com.platform.entity.AdvertisementEntity
;
import
com.platform.entity.AdvertisementItemEntity
;
import
com.platform.service.AdvertisementService
;
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
;
...
...
@@ -21,6 +24,9 @@ public class AdvertisementServiceImpl implements AdvertisementService {
@Autowired
private
AdvertisementDao
advertisementDao
;
@Autowired
private
AdvertisementItemDao
advertisementItemDao
;
@Override
public
AdvertisementEntity
queryObject
(
String
id
)
{
return
advertisementDao
.
queryObject
(
id
);
...
...
@@ -37,13 +43,31 @@ public class AdvertisementServiceImpl implements AdvertisementService {
}
@Override
public
int
save
(
AdvertisementEntity
advertisement
)
{
advertisement
.
setId
(
IdUtil
.
createIdbyUUID
());
public
int
save
(
String
itemIds
,
AdvertisementEntity
advertisement
)
{
String
aId
=
IdUtil
.
createIdbyUUID
();
advertisement
.
setId
(
aId
);
advertisement
.
setCreateTime
(
new
Date
());
advertisement
.
setUpdateTime
(
new
Date
());
saveAd
(
aId
,
itemIds
);
return
advertisementDao
.
save
(
advertisement
);
}
public
void
saveAd
(
String
aId
,
String
itemIds
)
{
String
[]
idArr
=
itemIds
.
split
(
","
);
for
(
int
i
=
0
;
i
<
idArr
.
length
;
i
++)
{
AdvertisementItemEntity
advertisementItem
=
new
AdvertisementItemEntity
();
advertisementItem
.
setAdId
(
aId
);
advertisementItem
.
setItemId
(
idArr
[
i
].
substring
(
1
,
idArr
[
i
].
length
()-
1
));
advertisementItemDao
.
save
(
advertisementItem
);
}
}
@Override
public
int
update
(
AdvertisementEntity
advertisement
)
{
public
int
update
(
String
itemIds
,
AdvertisementEntity
advertisement
)
{
String
aId
=
advertisement
.
getId
();
advertisement
.
setUpdateTime
(
new
Date
());
advertisementItemDao
.
delete
(
advertisement
.
getId
());
saveAd
(
aId
,
itemIds
);
return
advertisementDao
.
update
(
advertisement
);
}
...
...
platform-admin/src/main/resources/com/platform/dao/AdvertisementDao.xml
浏览文件 @
c8afbd0f
...
...
@@ -7,6 +7,7 @@
<result
property=
"id"
column=
"id"
/>
<result
property=
"adName"
column=
"ad_name"
/>
<result
property=
"adLink"
column=
"ad_link"
/>
<result
property=
"picture"
column=
"picture"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"startTime"
column=
"start_time"
/>
<result
property=
"endTime"
column=
"end_time"
/>
...
...
@@ -20,6 +21,7 @@
`id`,
`ad_name`,
`ad_link`,
`picture`,
`status`,
`start_time`,
`end_time`,
...
...
@@ -35,6 +37,7 @@
`id`,
`ad_name`,
`ad_link`,
`picture`,
`status`,
`start_time`,
`end_time`,
...
...
@@ -72,6 +75,7 @@
`id`,
`ad_name`,
`ad_link`,
`picture`,
`status`,
`start_time`,
`end_time`,
...
...
@@ -82,6 +86,7 @@
#{id},
#{adName},
#{adLink},
#{picture},
#{status},
#{startTime},
#{endTime},
...
...
@@ -95,6 +100,7 @@
<set>
<if
test=
"adName != null"
>
`ad_name` = #{adName},
</if>
<if
test=
"adLink != null"
>
`ad_link` = #{adLink},
</if>
<if
test=
"picture != null"
>
`picture` = #{picture},
</if>
<if
test=
"status != null"
>
`status` = #{status},
</if>
<if
test=
"startTime != null"
>
`start_time` = #{startTime},
</if>
<if
test=
"endTime != null"
>
`end_time` = #{endTime},
</if>
...
...
platform-admin/src/main/webapp/WEB-INF/page/sys/advertisement.html
浏览文件 @
c8afbd0f
差异被折叠。
点击展开。
platform-admin/src/main/webapp/js/sys/advertisement.js
浏览文件 @
c8afbd0f
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论