Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
poc-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poc
poc-api
Commits
904f9cea
Commit
904f9cea
authored
Dec 12, 2024
by
alex yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 应用使用数据上报
parent
0fc51827
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
18 deletions
+20
-18
pom.xml
pom.xml
+15
-15
AgentApplicationInfoRestImpl.java
...t_application/rest/impl/AgentApplicationInfoRestImpl.java
+2
-1
DataAnalyzeReportServiceImpl.java
..._analyze/aggregate/impl/DataAnalyzeReportServiceImpl.java
+1
-1
AgentApplicationServiceImpl.java
...oc/expose/aggregate/impl/AgentApplicationServiceImpl.java
+2
-1
No files found.
pom.xml
View file @
904f9cea
...
...
@@ -58,21 +58,21 @@
<artifactId>
framemax-codetool
</artifactId>
<version>
4.0.3
</version>
</dependency>
<dependency
>
<groupId>
cn.com.yict.framemax
</groupId
>
<artifactId>
framemax-easyui
</artifactId
>
<version>
4.0.2
</version
>
</dependency
>
<dependency
>
<groupId>
cn.com.yict.framemax
</groupId
>
<artifactId>
framemax-ldap
</artifactId
>
<version>
4.0.1
</version
>
</dependency
>
<dependency
>
<groupId>
cn.com.yict.framemax
</groupId
>
<artifactId>
framemax-organization
</artifactId
>
<version>
4.0.2
</version
>
</dependency
>
<!-- <dependency>--
>
<!-- <groupId>cn.com.yict.framemax</groupId>--
>
<!-- <artifactId>framemax-easyui</artifactId>--
>
<!-- <version>4.0.2</version>--
>
<!-- </dependency>--
>
<!-- <dependency>--
>
<!-- <groupId>cn.com.yict.framemax</groupId>--
>
<!-- <artifactId>framemax-ldap</artifactId>--
>
<!-- <version>4.0.1</version>--
>
<!-- </dependency>--
>
<!-- <dependency>--
>
<!-- <groupId>cn.com.yict.framemax</groupId>--
>
<!-- <artifactId>framemax-organization</artifactId>--
>
<!-- <version>4.0.2</version>--
>
<!-- </dependency>--
>
<dependency>
<groupId>
cn.com.yict.framemax
</groupId>
<artifactId>
framemax-webservice
</artifactId>
...
...
src/main/java/cn/com/poc/agent_application/rest/impl/AgentApplicationInfoRestImpl.java
View file @
904f9cea
...
...
@@ -477,7 +477,8 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
if
(
StringUtils
.
isBlank
(
dto
.
getChannel
()))
{
dto
.
setChannel
(
DataAnalyzeChannelEnum
.
preview
.
getChannel
());
}
BigDecimal
points
=
new
BigDecimal
(
pointDeductionNum
).
divide
(
new
BigDecimal
(
100
),
2
,
BigDecimal
.
ROUND_HALF_UP
);
dataAnalyzeReportService
.
dataReportByDialogue
(
userBaseEntity
.
getUserId
(),
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
dto
.
getChannel
()));
dataAnalyzeReportService
.
dataReportByPoint
(
userBaseEntity
.
getUserId
(),
new
BigDecimal
(
pointDeductionNum
)
,
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
dto
.
getChannel
()));
dataAnalyzeReportService
.
dataReportByPoint
(
userBaseEntity
.
getUserId
(),
points
,
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
dto
.
getChannel
()));
}
}
\ No newline at end of file
src/main/java/cn/com/poc/data_analyze/aggregate/impl/DataAnalyzeReportServiceImpl.java
View file @
904f9cea
...
...
@@ -36,7 +36,7 @@ public class DataAnalyzeReportServiceImpl implements DataAnalyzeReportService {
entity
.
setRelationId
(
relationId
);
entity
.
setType
(
type
.
getType
());
entity
.
setMemberId
(
memberId
);
entity
.
setPointNum
(
point
.
setScale
(
2
).
doubleValue
());
entity
.
setPointNum
(
point
.
doubleValue
());
entity
.
setChannel
(
channel
.
getChannel
());
entity
.
setDatetime
(
DateUtils
.
getCurrDateTime
());
bizDataAnalyzePointRecordService
.
save
(
entity
);
...
...
src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java
View file @
904f9cea
...
...
@@ -429,8 +429,9 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
if
(
StringUtils
.
isBlank
(
channel
))
{
channel
=
DataAnalyzeChannelEnum
.
link_share
.
getChannel
();
}
BigDecimal
points
=
new
BigDecimal
(
pointDeductionNum
).
divide
(
new
BigDecimal
(
100
),
2
,
BigDecimal
.
ROUND_HALF_UP
);
dataAnalyzeReportService
.
dataReportByDialogue
(
userBaseEntity
.
getUserId
(),
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
channel
));
dataAnalyzeReportService
.
dataReportByPoint
(
userBaseEntity
.
getUserId
(),
new
BigDecimal
(
pointDeductionNum
)
,
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
channel
));
dataAnalyzeReportService
.
dataReportByPoint
(
userBaseEntity
.
getUserId
(),
points
,
DataAnalyzeTypeEnum
.
AGENT
,
agentId
,
DataAnalyzeChannelEnum
.
valueOf
(
channel
));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment