Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
8ef02b92
提交
8ef02b92
authored
10月 16, 2019
作者:
张光耀
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更加更多商品进行查询
上级
0e7c4be4
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
27 行增加
和
9 行删除
+27
-9
TokenVerification.java
...com/diaoyun/zion/chinafrica/client/TokenVerification.java
+1
-1
GoodsTypeController.java
...aoyun/zion/chinafrica/controller/GoodsTypeController.java
+15
-0
TbCfStationItemController.java
...zion/chinafrica/controller/TbCfStationItemController.java
+3
-3
TbCfStationItemDao.java
...a/com/diaoyun/zion/chinafrica/dao/TbCfStationItemDao.java
+1
-1
TbCfStationItemService.java
...aoyun/zion/chinafrica/service/TbCfStationItemService.java
+1
-1
TbCfStationItemServiceImpl.java
...n/chinafrica/service/impl/TbCfStationItemServiceImpl.java
+2
-2
TbCfStationItemDao.xml
src/main/resources/mapper/TbCfStationItemDao.xml
+4
-1
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/client/TokenVerification.java
浏览文件 @
8ef02b92
...
@@ -43,7 +43,7 @@ public class TokenVerification {
...
@@ -43,7 +43,7 @@ public class TokenVerification {
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.resetPassWord(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.resetPassWord(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeedbackController.getFeedbackList(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeedbackController.getFeedbackList(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.getUserIdentifyCode(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.getUserIdentifyCode(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.GoodsTypeController.
getGoodsTypeList
(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.GoodsTypeController.
*
(..))"
+
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeeController.*(..))"
)
"&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeeController.*(..))"
)
public
void
controllerAspect
()
{
public
void
controllerAspect
()
{
...
...
src/main/java/com/diaoyun/zion/chinafrica/controller/GoodsTypeController.java
浏览文件 @
8ef02b92
...
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
...
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
...
@@ -52,4 +53,18 @@ public class GoodsTypeController {
...
@@ -52,4 +53,18 @@ public class GoodsTypeController {
map
.
put
(
"data"
,
listStation
);
map
.
put
(
"data"
,
listStation
);
return
map
;
return
map
;
}
}
@RequestMapping
(
"/getItemStationList"
)
@GetMapping
public
Result
getItemStationList
(
@RequestParam
(
required
=
false
)
Integer
pageNum
,
@RequestParam
(
required
=
false
)
Integer
pageSize
,
@RequestParam
(
required
=
false
)
String
categoryId
)
{
if
(
pageNum
==
null
)
{
pageNum
=
1
;
}
if
(
pageSize
==
null
)
{
pageSize
=
6
;
}
return
tbCfStationItemService
.
getItemStationList
(
pageNum
,
pageSize
,
categoryId
);
}
}
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfStationItemController.java
浏览文件 @
8ef02b92
...
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
...
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
public
class
TbCfStationItemController
{
public
class
TbCfStationItemController
{
@Autowired
@Autowired
private
TbCfStationItemService
tbCfStationItemService
;
private
TbCfStationItemService
tbCfStationItemService
;
/*
@ApiOperation("获取商品独立站")
@ApiOperation("获取商品独立站")
@GetMapping
@GetMapping
public Result getItemStationList(@ApiParam(value = "页数 默认1") @RequestParam(required = false) Integer pageNum,
public Result getItemStationList(@ApiParam(value = "页数 默认1") @RequestParam(required = false) Integer pageNum,
...
@@ -33,9 +33,9 @@ public class TbCfStationItemController {
...
@@ -33,9 +33,9 @@ public class TbCfStationItemController {
pageNum = 1;
pageNum = 1;
}
}
if (pageSize == null) {
if (pageSize == null) {
pageSize
=
10
;
pageSize =
2
;
}
}
return tbCfStationItemService.getItemStationList(pageNum,pageSize);
return tbCfStationItemService.getItemStationList(pageNum,pageSize);
}
}
*/
}
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfStationItemDao.java
浏览文件 @
8ef02b92
...
@@ -18,7 +18,7 @@ public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
...
@@ -18,7 +18,7 @@ public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
* 获取商品独立站
* 获取商品独立站
* @return
* @return
*/
*/
List
<
TbCfStationItemEntity
>
getItemStationList
();
List
<
TbCfStationItemEntity
>
getItemStationList
(
String
categoryId
);
/**
/**
* 根据主键一级分类实体集合
* 根据主键一级分类实体集合
...
...
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfStationItemService.java
浏览文件 @
8ef02b92
...
@@ -83,5 +83,5 @@ public interface TbCfStationItemService {
...
@@ -83,5 +83,5 @@ public interface TbCfStationItemService {
* @param pageSize
* @param pageSize
* @return
* @return
*/
*/
Result
getItemStationList
(
Integer
pageNum
,
Integer
pageSize
);
Result
getItemStationList
(
Integer
pageNum
,
Integer
pageSize
,
String
categoryId
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfStationItemServiceImpl.java
浏览文件 @
8ef02b92
...
@@ -68,10 +68,10 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
...
@@ -68,10 +68,10 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
}
}
@Override
@Override
public
Result
getItemStationList
(
Integer
pageNum
,
Integer
pageSize
)
{
public
Result
getItemStationList
(
Integer
pageNum
,
Integer
pageSize
,
String
categoryId
)
{
Result
<
PageInfo
>
result
=
new
Result
<>();
Result
<
PageInfo
>
result
=
new
Result
<>();
startPage
(
pageNum
,
pageSize
);
startPage
(
pageNum
,
pageSize
);
List
<
TbCfStationItemEntity
>
tbCfStationItemList
=
tbCfStationItemDao
.
getItemStationList
();
List
<
TbCfStationItemEntity
>
tbCfStationItemList
=
tbCfStationItemDao
.
getItemStationList
(
categoryId
);
PageInfo
<
TbCfStationItemEntity
>
pageInfo
=
new
PageInfo
<>(
tbCfStationItemList
);
PageInfo
<
TbCfStationItemEntity
>
pageInfo
=
new
PageInfo
<>(
tbCfStationItemList
);
result
.
setData
(
pageInfo
);
result
.
setData
(
pageInfo
);
return
result
;
return
result
;
...
...
src/main/resources/mapper/TbCfStationItemDao.xml
浏览文件 @
8ef02b92
...
@@ -147,7 +147,10 @@
...
@@ -147,7 +147,10 @@
<!--获取商品独立站-->
<!--获取商品独立站-->
<select
id=
"getItemStationList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity"
>
<select
id=
"getItemStationList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity"
>
select * from tb_cf_station_item where enable_flag=1 order by create_time desc
select * from tb_cf_station_item
where enable_flag=1 and item_category = #{categoryId}
order by create_time desc
</select>
</select>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论