Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
R
renwei
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
renwei
Commits
c083c6ba
提交
c083c6ba
authored
5月 13, 2020
作者:
chaoyanjun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
3e6aa9a4
隐藏空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
326 行增加
和
13 行删除
+326
-13
FgAboutusContentForm.java
...sysuser/commons/form/fg/aboutus/FgAboutusContentForm.java
+13
-0
FgAboutusForm.java
...m/zrqx/sysuser/commons/form/fg/aboutus/FgAboutusForm.java
+13
-0
FgQueryAboutusColumnForm.java
...ser/commons/form/fg/aboutus/FgQueryAboutusColumnForm.java
+13
-0
FgAboutusVo.java
...a/com/zrqx/sysuser/commons/vo/fg/aboutus/FgAboutusVo.java
+16
-0
FgAboutUsColumnController.java
...user/fg/controller/aboutus/FgAboutUsColumnController.java
+51
-0
FgAboutUsContentController.java
...ser/fg/controller/aboutus/FgAboutUsContentController.java
+40
-0
FgPropagandaContentController.java
.../controller/propaganda/FgPropagandaContentController.java
+0
-1
FgAboutUsColumnMapper.java
...zrqx/sysuser/fg/mapper/aboutus/FgAboutUsColumnMapper.java
+31
-0
FgAboutUsContentMapper.java
...rqx/sysuser/fg/mapper/aboutus/FgAboutUsContentMapper.java
+24
-0
FgPropagandaColumnMapper.java
...ysuser/fg/mapper/propaganda/FgPropagandaColumnMapper.java
+0
-9
FgAboutUsColumnService.java
...qx/sysuser/fg/service/aboutus/FgAboutUsColumnService.java
+19
-0
FgAboutUsColumnServiceImpl.java
...ysuser/fg/service/aboutus/FgAboutUsColumnServiceImpl.java
+50
-0
FgAboutUsContentService.java
...x/sysuser/fg/service/aboutus/FgAboutUsContentService.java
+15
-0
FgAboutUsContentServiceImpl.java
...suser/fg/service/aboutus/FgAboutUsContentServiceImpl.java
+41
-0
FgPropagandaColumnServiceImpl.java
.../fg/service/propaganda/FgPropagandaColumnServiceImpl.java
+0
-2
FgPropagandaContentServiceImpl.java
...fg/service/propaganda/FgPropagandaContentServiceImpl.java
+0
-1
没有找到文件。
app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgAboutusContentForm.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
commons
.
form
.
fg
.
aboutus
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
FgAboutusContentForm
{
@ApiModelProperty
(
"推荐状态:0未推荐,1推荐"
)
private
Integer
recommended
;
@ApiModelProperty
(
"数量"
)
private
Integer
num
;
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgAboutusForm.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
commons
.
form
.
fg
.
aboutus
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
FgAboutusForm
{
@ApiModelProperty
(
"栏目名称"
)
private
String
columnName
;
@ApiModelProperty
(
"栏目id"
)
private
Integer
id
;
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgQueryAboutusColumnForm.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
commons
.
form
.
fg
.
aboutus
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
FgQueryAboutusColumnForm
{
@ApiModelProperty
(
value
=
"宣传栏目名称"
)
private
String
name
;
@ApiModelProperty
(
value
=
"数量"
,
required
=
true
)
private
Integer
num
;
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/fg/aboutus/FgAboutusVo.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
commons
.
vo
.
fg
.
aboutus
;
import
java.util.List
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
FgAboutusVo
extends
AboutUsColumn
{
@ApiModelProperty
(
"内容"
)
private
List
<
AboutUsContent
>
list
;
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/aboutus/FgAboutUsColumnController.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
controller
.
aboutus
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn
;
import
com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo
;
import
com.zrqx.sysuser.fg.service.aboutus.FgAboutUsColumnService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
@Controller
@RestController
@RequestMapping
(
"/fg/aboutus-column"
)
@Api
(
description
=
"前台-关于我们平台-栏目"
)
public
class
FgAboutUsColumnController
{
@Autowired
private
FgAboutUsColumnService
service
;
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据栏目名称,数量获取一组内容"
)
@GetMapping
(
value
=
"/num"
)
public
CallBack
<
List
<
AboutUsColumn
>>
getByColumn
(
FgQueryAboutusColumnForm
query
)
{
return
CallBack
.
success
(
service
.
getByColumn
(
query
));
}
@ApiOperation
(
value
=
"查询所有栏目"
,
notes
=
"查询所有栏目"
)
@GetMapping
(
value
=
"/list"
)
public
CallBack
<
List
<
AboutUsColumn
>>
getList
()
{
return
CallBack
.
success
(
service
.
selectAll
());
}
@ApiOperation
(
value
=
"分页查询"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
"/page"
)
public
CallBack
<
PageInfo
<
FgAboutusVo
>>
page
(
PageParam
pageParam
,
FgAboutusForm
form
)
{
pageParam
.
setOrderBy
(
"sort desc"
);
return
CallBack
.
success
(
service
.
page
(
pageParam
,
form
));
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/aboutus/FgAboutUsContentController.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
controller
.
aboutus
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
import
com.zrqx.sysuser.fg.service.aboutus.FgAboutUsContentService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
@Controller
@RestController
@RequestMapping
(
"/fg/aboutus-content"
)
@Api
(
description
=
"前台-关于我们平台-内容"
)
public
class
FgAboutUsContentController
{
@Autowired
private
FgAboutUsContentService
service
;
@ApiOperation
(
value
=
"根据id查询"
,
notes
=
"根据id查询内容"
)
@GetMapping
(
value
=
"/get/{oid}"
)
public
CallBack
<
AboutUsContent
>
getById
(
@PathVariable
Integer
oid
)
{
return
CallBack
.
success
(
service
.
searchById
(
oid
));
}
@ApiOperation
(
value
=
"根据属性为推荐,数量获取一组内容"
,
notes
=
"根据属性为推荐,数量获取一组内容"
)
@GetMapping
(
value
=
"/list"
)
public
CallBack
<
List
<
AboutUsContent
>>
getList
(
FgAboutusContentForm
form
)
{
return
CallBack
.
success
(
service
.
getList
(
form
));
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/propaganda/FgPropagandaContentController.java
浏览文件 @
c083c6ba
...
...
@@ -5,7 +5,6 @@ import java.util.List;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/aboutus/FgAboutUsColumnMapper.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
mapper
.
aboutus
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
@Mapper
public
interface
FgAboutUsColumnMapper
extends
BaseMapper
<
AboutUsColumn
>{
@Select
(
"<script>"
+
" select id,name,sort,createTime,updateTime from sys_aboutus_column "
+
" where 1=1 "
+
" eq(name,form.name) order by sort desc "
+
" limit #{form.num} "
+
"</script>"
)
List
<
AboutUsColumn
>
getByColumn
(
FgQueryAboutusColumnForm
form
);
@Select
(
"<script>"
+
" select b.* from sys_aboutus_content b where 1=1 and status =1 "
+
" eq(b.columnId,form.id) "
+
"</script>"
)
List
<
AboutUsContent
>
page
(
FgAboutusForm
form
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/aboutus/FgAboutUsContentMapper.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
mapper
.
aboutus
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
@Mapper
public
interface
FgAboutUsContentMapper
extends
BaseMapper
<
AboutUsContent
>{
@Select
(
"<script>"
+
" select id,title,columnId,source,keywords,author,diyType,cover,abstract1, "
+
" content,count,topStatus,recommended,status,createTime "
+
" from sys_aboutus_content where 1=1 and status = 1 "
+
" eq(recommended,form.recommended) "
+
" order by createTime desc limit #{form.num} "
+
"</script>"
)
List
<
AboutUsContent
>
getList
(
FgAboutusContentForm
form
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/propaganda/FgPropagandaColumnMapper.java
浏览文件 @
c083c6ba
...
...
@@ -11,7 +11,6 @@ import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
import
com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm
;
import
com.zrqx.sysuser.commons.model.propaganda.PropagandaColumn
;
import
com.zrqx.sysuser.commons.model.propaganda.PropagandaContent
;
import
com.zrqx.sysuser.commons.vo.fg.propaganda.FgPropagandaVo
;
@Mapper
public
interface
FgPropagandaColumnMapper
extends
BaseMapper
<
PropagandaColumn
>
{
...
...
@@ -24,14 +23,6 @@ public interface FgPropagandaColumnMapper extends BaseMapper<PropagandaColumn> {
+
"</script>"
)
List
<
PropagandaColumn
>
getByColumn
(
@Param
(
"form"
)
FgQueryPropaganColumnForm
form
);
// @Select("<script>"
// + " select a.*,b.* from sys_propaganda_column a, sys_propaganda_content b where a.id = b.columnId "
// + "<if test = '" + NOTBLANK + "(form.id)'>"
// + " and a.id = #{form.id} "
// + "</if>"
// + " eq(b.columnId,form.id) "
// + " eq(a.name,form.columnName) "
// + "</script>")
@Select
(
"<script>"
+
" select b.* from sys_propaganda_content b where 1=1 and status =1 "
+
" eq(b.columnId,form.id) "
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnService.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
aboutus
;
import
java.util.List
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn
;
import
com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo
;
public
interface
FgAboutUsColumnService
extends
BaseService
<
AboutUsColumn
,
Integer
>{
List
<
AboutUsColumn
>
getByColumn
(
FgQueryAboutusColumnForm
query
);
PageInfo
<
FgAboutusVo
>
page
(
PageParam
pageParam
,
FgAboutusForm
form
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnServiceImpl.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
aboutus
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
import
com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo
;
import
com.zrqx.sysuser.fg.mapper.aboutus.FgAboutUsColumnMapper
;
@Service
public
class
FgAboutUsColumnServiceImpl
extends
BaseServiceImpl
<
AboutUsColumn
,
Integer
>
implements
FgAboutUsColumnService
{
@Autowired
private
FgAboutUsColumnMapper
mapper
;
@Override
public
BaseMapper
<
AboutUsColumn
>
getMapper
()
{
return
mapper
;
}
@Override
public
List
<
AboutUsColumn
>
getByColumn
(
FgQueryAboutusColumnForm
form
)
{
return
mapper
.
getByColumn
(
form
);
}
@Override
public
PageInfo
<
FgAboutusVo
>
page
(
PageParam
pageParam
,
FgAboutusForm
form
)
{
startPage
(
pageParam
);
List
<
FgAboutusVo
>
list1
=
new
ArrayList
<
FgAboutusVo
>();
FgAboutusVo
vo
=
new
FgAboutusVo
();
AboutUsColumn
column
=
mapper
.
selectByPrimaryKey
(
form
.
getId
());
BeanUtils
.
copyProperties
(
column
,
vo
);
List
<
AboutUsContent
>
list
=
mapper
.
page
(
form
);
vo
.
setList
(
list
);
list1
.
add
(
vo
);
return
new
PageInfo
<
FgAboutusVo
>(
list1
);
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsContentService.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
aboutus
;
import
java.util.List
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
public
interface
FgAboutUsContentService
extends
BaseService
<
AboutUsContent
,
Integer
>
{
AboutUsContent
searchById
(
Integer
oid
);
List
<
AboutUsContent
>
getList
(
FgAboutusContentForm
form
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsContentServiceImpl.java
0 → 100644
浏览文件 @
c083c6ba
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
aboutus
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm
;
import
com.zrqx.sysuser.commons.model.aboutus.AboutUsContent
;
import
com.zrqx.sysuser.fg.mapper.aboutus.FgAboutUsContentMapper
;
@Service
public
class
FgAboutUsContentServiceImpl
extends
BaseServiceImpl
<
AboutUsContent
,
Integer
>
implements
FgAboutUsContentService
{
@Autowired
private
FgAboutUsContentMapper
mapper
;
@Override
public
BaseMapper
<
AboutUsContent
>
getMapper
()
{
return
mapper
;
}
@Override
public
AboutUsContent
searchById
(
Integer
oid
)
{
AboutUsContent
content
=
this
.
notNull
(
oid
);
// 增加浏览量
int
traffic
=
content
.
getCount
()
==
null
?
0
:
content
.
getCount
()
+
1
;
content
.
setCount
(
traffic
);
mapper
.
updateByPrimaryKeySelective
(
content
);
return
content
;
}
@Override
public
List
<
AboutUsContent
>
getList
(
FgAboutusContentForm
form
)
{
List
<
AboutUsContent
>
list
=
mapper
.
getList
(
form
);
return
list
;
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaColumnServiceImpl.java
浏览文件 @
c083c6ba
...
...
@@ -18,8 +18,6 @@ import com.zrqx.sysuser.commons.model.propaganda.PropagandaContent;
import
com.zrqx.sysuser.commons.vo.fg.propaganda.FgPropagandaVo
;
import
com.zrqx.sysuser.fg.mapper.propaganda.FgPropagandaColumnMapper
;
import
scala.Array
;
@Service
public
class
FgPropagandaColumnServiceImpl
extends
BaseServiceImpl
<
PropagandaColumn
,
Integer
>
implements
FgPropagandaColumnService
{
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaContentServiceImpl.java
浏览文件 @
c083c6ba
...
...
@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.sysuser.commons.form.fg.propaganda.FgPropagandaContentForm
;
import
com.zrqx.sysuser.commons.model.culture.Article
;
import
com.zrqx.sysuser.commons.model.propaganda.PropagandaContent
;
import
com.zrqx.sysuser.fg.mapper.propaganda.FgPropagandaContentMapper
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论