Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nyx
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
发现
nyx
Commits
a395b94a
Commit
a395b94a
authored
Oct 09, 2020
by
jscat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nyx javaapp: 数据更新
1. 完善stat_community和stat_fair
parent
a2bb45f6
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
139 行增加
和
27 行删除
+139
-27
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/query/Rockwell_keyT_activityQuery.java
+43
-1
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.java
+6
-3
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
+46
-8
增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml
+44
-15
没有找到文件。
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/query/Rockwell_keyT_activityQuery.java
查看文件 @
a395b94a
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
domain
.
query
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
domain
.
query
;
...
...
@@ -25,6 +25,9 @@ public class Rockwell_keyT_activityQuery {
private
String
city
;
// 城市名称
private
String
memberStatus
;
// 商家状态, 00: 未注册用户; 01: 已注册用户
private
String
fairName
;
//集市名称
private
String
communityName
;
//园区名称
private
String
orderType
;
// 排序类型; orderType='like 最热|nearest 最近(default) |latest 最新'
private
String
tag
;
// 发布的标签,比如: 酒单;;活动;;心情;;饮事;;最热Gluh Wein
...
...
@@ -186,6 +189,42 @@ public class Rockwell_keyT_activityQuery {
}
}
public
void
setEntityName
(
String
strEntityName
)
{
if
(
strEntityName
.
equals
(
"0"
))
{
this
.
entityName
=
null
;
}
else
{
this
.
entityName
=
strEntityName
;
}
}
public
void
setFairName
(
String
strFairName
)
{
if
(
strFairName
.
equals
(
"0"
))
{
this
.
fairName
=
null
;
}
else
{
this
.
fairName
=
strFairName
;
}
}
public
void
setCommunityName
(
String
strCommunityName
)
{
if
(
strCommunityName
.
equals
(
"0"
))
{
this
.
communityName
=
null
;
}
else
{
this
.
communityName
=
strCommunityName
;
}
}
@Override
public
String
toString
()
{
...
...
@@ -194,6 +233,9 @@ public class Rockwell_keyT_activityQuery {
"activityId='"
+
activityId
+
'\''
+
"memberId='"
+
memberId
+
'\''
+
"memberName='"
+
memberName
+
'\''
+
"entityName='"
+
entityName
+
'\''
+
"fairName='"
+
fairName
+
'\''
+
"communityName='"
+
communityName
+
'\''
+
"activityType='"
+
activityType
+
'\''
+
"city='"
+
city
+
'\''
+
"memberStatus='"
+
memberStatus
+
'\''
+
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.java
查看文件 @
a395b94a
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
repository
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
repository
;
...
...
@@ -42,8 +42,11 @@ public interface Rockwell_keyMapper {
void
addT_activity
(
Rockwell_keyT_activity
rockwell_keyT_activity
);
void
addT_product
(
Rockwell_keyT_productQuery
rockwell_keyT_productQuery
);
List
<
Rockwell_keyT_product
>
getT_product
(
Rockwell_keyT_productQuery
rockwell_keyT_productQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_stat
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_total
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_stat_community
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_stat_fair
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_total_community
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
List
<
Rockwell_keyV_activity_stat
>
getV_activity_total_fair
(
Rockwell_keyT_activityQuery
rockwell_keyT_activityQuery
);
/* post api */
List
<
Rockwell_keyV_post_info
>
getV_post_info
(
Rockwell_keyT_postQuery
rockwell_keyT_postQuery
);
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
查看文件 @
a395b94a
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
...
...
@@ -325,11 +325,22 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyT_activityQuery
.
setMemberId
(
memberId
);
rockwell_keyT_activityQuery
.
setMemberName
(
memberName
);
rockwell_keyT_activityQuery
.
setActivityType
(
activityType
);
rockwell_keyT_activityQuery
.
setEntityName
(
entityName
);
rockwell_keyT_activityQuery
.
setCity
(
city
);
rockwell_keyT_activityQuery
.
setOrderType
(
orderType
);
//设置查询的实体名称 fair_name or community_name update jscat 20201009
//同时不需要在mybatis *.xml里设置条件语句
if
(
activityType
.
contains
(
"01"
)
&&
!
entityName
.
equals
(
"所有"
))
{
rockwell_keyT_activityQuery
.
setFairName
(
entityName
);
rockwell_keyT_activityQuery
.
setTag
(
tag
);
rockwell_keyT_activityQuery
.
setTitle
(
title
);
}
else
if
(
activityType
.
contains
(
"02"
)
&&
!
entityName
.
equals
(
"所有"
))
{
rockwell_keyT_activityQuery
.
setCommunityName
(
entityName
);
rockwell_keyT_activityQuery
.
setTag
(
tag
);
rockwell_keyT_activityQuery
.
setTitle
(
title
);
}
rockwell_keyT_activityQuery
.
setCity
(
city
);
rockwell_keyT_activityQuery
.
setOrderType
(
orderType
);
rockwell_keyT_activityQuery
.
setCurDate
(
curDate
);
rockwell_keyT_activityQuery
.
setPagination
(
new
Pagination
(
pageNum
,
pageCount
));
...
...
@@ -360,10 +371,21 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyT_activityQuery
.
setMemberId
(
memberId
);
rockwell_keyT_activityQuery
.
setMemberName
(
memberName
);
rockwell_keyT_activityQuery
.
setActivityType
(
activityType
);
rockwell_keyT_activityQuery
.
setEntityName
(
entityName
);
rockwell_keyT_activityQuery
.
setCity
(
city
);
//设置查询的实体名称 fair_name or community_name update jscat 20201009
//同时不需要在mybatis *.xml里设置条件语句
if
(
activityType
.
contains
(
"01"
)
&&
!
entityName
.
equals
(
"所有"
))
{
rockwell_keyT_activityQuery
.
setFairName
(
entityName
);
rockwell_keyT_activityQuery
.
setTag
(
tag
);
rockwell_keyT_activityQuery
.
setTitle
(
title
);
}
else
if
(
activityType
.
contains
(
"02"
)
&&
!
entityName
.
equals
(
"所有"
))
{
rockwell_keyT_activityQuery
.
setCommunityName
(
entityName
);
rockwell_keyT_activityQuery
.
setTag
(
tag
);
rockwell_keyT_activityQuery
.
setTitle
(
title
);
}
rockwell_keyT_activityQuery
.
setCity
(
city
);
rockwell_keyT_activityQuery
.
setBeginDate
(
beginDate
);
rockwell_keyT_activityQuery
.
setEndDate
(
endDate
);
rockwell_keyT_activityQuery
.
setPagination
(
new
Pagination
(
pageNum
,
pageCount
));
...
...
@@ -584,7 +606,10 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyT_activityQuery
.
setActivityType
(
activityType
);
rockwell_keyT_activityQuery
.
setCity
(
cityName
);
listRockwell_keyV_activity_stat
=
rockwell_keyMapper
.
getV_activity_total
(
rockwell_keyT_activityQuery
);
//if 01-集市
if
(
activityType
.
contains
(
"01"
))
{
listRockwell_keyV_activity_stat
=
rockwell_keyMapper
.
getV_activity_total_fair
(
rockwell_keyT_activityQuery
);
if
(
listRockwell_keyV_activity_stat
.
size
()
>
0
)
{
listRockwell_keyV_activity_stat
.
get
(
0
).
setActivityType
(
activityType
);
...
...
@@ -593,8 +618,21 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
listRockwell_keyV_activity_stat
.
get
(
0
).
setCommunityName
(
"所有"
);
}
listRockwell_keyV_activity_stat
.
addAll
(
rockwell_keyMapper
.
getV_activity_stat_fair
(
rockwell_keyT_activityQuery
));
}
else
if
(
activityType
.
contains
(
"02"
))
{
listRockwell_keyV_activity_stat
=
rockwell_keyMapper
.
getV_activity_total_community
(
rockwell_keyT_activityQuery
);
if
(
listRockwell_keyV_activity_stat
.
size
()
>
0
)
{
listRockwell_keyV_activity_stat
.
get
(
0
).
setActivityType
(
activityType
);
listRockwell_keyV_activity_stat
.
get
(
0
).
setCityName
(
cityName
);
listRockwell_keyV_activity_stat
.
get
(
0
).
setFairName
(
"所有"
);
listRockwell_keyV_activity_stat
.
get
(
0
).
setCommunityName
(
"所有"
);
}
listRockwell_keyV_activity_stat
.
addAll
(
rockwell_keyMapper
.
getV_activity_stat
(
rockwell_keyT_activityQuery
));
listRockwell_keyV_activity_stat
.
addAll
(
rockwell_keyMapper
.
getV_activity_stat_community
(
rockwell_keyT_activityQuery
));
}
int
totalCount
=
listRockwell_keyV_activity_stat
.
size
();
JSONResult
jsonResult
=
new
JSONResult
(
totalCount
,
listRockwell_keyV_activity_stat
);
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml
查看文件 @
a395b94a
<?xml
version="1.0" encoding="UTF-8"?>
<?xml
version="1.0" encoding="UTF-8"?>
...
...
@@ -240,11 +240,11 @@ limitations under the License.
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
</if>
<if
test=
"
activityType != null and activityType != '' and activityType == '01-集市'.toString() and entityName != '所有'.toString()
"
>
AND fair_name LIKE CONCAT('%', #{
entity
Name} ,'%')
<if
test=
"
fairName != null and fairName != ''
"
>
AND fair_name LIKE CONCAT('%', #{
fair
Name} ,'%')
</if>
<if
test=
"
activityType != null and activityType != '' and activityType == '02-园区'.toString() and entityName != '所有'.toString()
"
>
AND community_name LIKE CONCAT('%', #{
ent
ityName} ,'%')
<if
test=
"
communityName != null and communityName != ''
"
>
AND community_name LIKE CONCAT('%', #{
commun
ityName} ,'%')
</if>
<if
test=
"city != null and city != '' "
>
AND address_name LIKE CONCAT('%', #{city} ,'%')
...
...
@@ -301,11 +301,11 @@ limitations under the License.
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
</if>
<if
test=
"
activityType != null and activityType != '' and activityType == '01-集市'.toString()
"
>
AND fair_name LIKE CONCAT('%', #{
entity
Name} ,'%')
<if
test=
"
fairName != null and fairName != ''
"
>
AND fair_name LIKE CONCAT('%', #{
fair
Name} ,'%')
</if>
<if
test=
"
activityType != null and activityType != '' and activityType == '02-园区'.toString()
"
>
AND community_name LIKE CONCAT('%', #{
ent
ityName} ,'%')
<if
test=
"
communityName != null and communityName != ''
"
>
AND community_name LIKE CONCAT('%', #{
commun
ityName} ,'%')
</if>
<if
test=
"city != null and city != '' "
>
AND address_name LIKE CONCAT('%', #{city} ,'%')
...
...
@@ -381,10 +381,10 @@ limitations under the License.
</if>
</select>
<!-- activity api 3-7 获取 v_activity_stat
的值 by limit update jscat 20201008
-->
<select
id=
"getV_activity_stat"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
<!-- activity api 3-7 获取 v_activity_stat
_community 的值 by limit update jscat 20201009
-->
<select
id=
"getV_activity_stat
_community
"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
resultType=
"cn.com.fun.nyxkey.api.domain.Rockwell_keyV_activity_stat"
>
select * from view_activity_stat
select * from view_activity_stat
_community
where 1=1
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
...
...
@@ -395,11 +395,40 @@ limitations under the License.
limit 10
</select>
<!-- activity api 3-8 获取 v_activity_stat 全量统计的值 update jscat 20201008 -->
<select
id=
"getV_activity_total"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
<!-- activity api 3-8 获取 v_activity_stat_fair 的值 by limit update jscat 20201009 -->
<select
id=
"getV_activity_stat_fair"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
resultType=
"cn.com.fun.nyxkey.api.domain.Rockwell_keyV_activity_stat"
>
select * from view_activity_stat_fair
where 1=1
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
</if>
<if
test=
"city != null and city != '' "
>
AND city_name LIKE CONCAT('%', #{city} ,'%')
</if>
limit 10
</select>
<!-- activity api 3-9 获取 v_activity_stat_community 全量统计的值 update jscat 20201009 -->
<select
id=
"getV_activity_total_community"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
resultType=
"cn.com.fun.nyxkey.api.domain.Rockwell_keyV_activity_stat"
>
SELECT COUNT(*) AS num_entity, IFNULL(SUM(num_activity),0) AS num_activity, IFNULL(SUM(num_like),0) AS num_like
FROM view_activity_stat_community
where 1=1
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
</if>
<if
test=
"city != null and city != '' "
>
AND city_name LIKE CONCAT('%', #{city} ,'%')
</if>
limit 10
</select>
<!-- activity api 3-10 获取 v_activity_stat_fair 全量统计的值 update jscat 20201009 -->
<select
id=
"getV_activity_total_fair"
parameterType=
"cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
resultType=
"cn.com.fun.nyxkey.api.domain.Rockwell_keyV_activity_stat"
>
SELECT COUNT(*) AS num_entity, IFNULL(SUM(num_activity),0) AS num_activity, IFNULL(SUM(num_like),0) AS num_like
FROM view_activity_stat
FROM view_activity_stat
_fair
where 1=1
<if
test=
"activityType != null and activityType != '' "
>
AND activity_type LIKE CONCAT('%', #{activityType} ,'%')
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论