Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
1b3cb29a
Commit
1b3cb29a
authored
Nov 01, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.5.9' into develop
parents
48e27ef2
2d57bd9e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
0 deletions
+72
-0
EkpInsertMsgVo.java
...in/java/com/yifu/cloud/plus/v1/msg/vo/EkpInsertMsgVo.java
+35
-0
MsgInfoController.java
.../yifu/cloud/plus/v1/msg/controller/MsgInfoController.java
+14
-0
MsgInfoMapper.java
...java/com/yifu/cloud/plus/v1/msg/mapper/MsgInfoMapper.java
+3
-0
MsgInfoService.java
...va/com/yifu/cloud/plus/v1/msg/service/MsgInfoService.java
+3
-0
MsgInfoServiceImpl.java
...fu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java
+12
-0
MsgInfoMapper.xml
.../yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml
+5
-0
No files found.
yifu-msg/yifu-msg-api/src/main/java/com/yifu/cloud/plus/v1/msg/vo/EkpInsertMsgVo.java
0 → 100644
View file @
1b3cb29a
package
com
.
yifu
.
cloud
.
plus
.
v1
.
msg
.
vo
;
import
lombok.Data
;
/**
* @Author huyc
* @Date 2023/11/1
* @Description
* @Version 1.0
*/
@Data
public
class
EkpInsertMsgVo
{
/**
* 订单url
**/
private
String
urlInfo
;
/**
* 订单id
**/
private
String
orderId
;
/**
* 项目名称
**/
private
String
domainName
;
/**
* 订单号
**/
private
String
dingdanNo
;
/**
* 登录人
**/
private
String
userName
;
}
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/controller/MsgInfoController.java
View file @
1b3cb29a
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.msg.entity.MsgInfo
;
import
com.yifu.cloud.plus.v1.msg.service.MsgInfoService
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpAlertVo
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpInsertMsgVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
...
...
@@ -118,4 +119,17 @@ public class MsgInfoController {
public
void
cancelHandledMsg
()
{
msgInfoService
.
cancelHandledMsg
();
}
/**
* @Author huyc
* @Description 转办人发消息
* @Date 10:58 2023/11/1
* @Param
* @return
**/
@Operation
(
summary
=
"转办人发消息"
,
description
=
"转办人发消息"
)
@PostMapping
(
"/sendZbMessage"
)
public
R
sendZbMessage
(
EkpInsertMsgVo
vo
)
{
return
msgInfoService
.
sendZbMessage
(
vo
);
}
}
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/mapper/MsgInfoMapper.java
View file @
1b3cb29a
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.msg.entity.MsgInfo
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpInsertMsgVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -51,4 +52,6 @@ public interface MsgInfoMapper extends BaseMapper<MsgInfo> {
List
<
MsgInfo
>
getMsgInfo
(
@Param
(
"msgInfo"
)
MsgInfo
msgInfo
);
int
deleteHandledMsg
();
int
insertMsg
(
@Param
(
"vo"
)
EkpInsertMsgVo
vo
);
}
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/MsgInfoService.java
View file @
1b3cb29a
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.msg.entity.MsgInfo
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpAlertVo
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpInsertMsgVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
java.util.List
;
...
...
@@ -49,4 +50,6 @@ public interface MsgInfoService extends IService<MsgInfo> {
void
cancelHandledMsg
();
R
sendZbMessage
(
EkpInsertMsgVo
vo
);
}
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java
View file @
1b3cb29a
...
...
@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.msg.entity.MsgInfo;
import
com.yifu.cloud.plus.v1.msg.mapper.MsgInfoMapper
;
import
com.yifu.cloud.plus.v1.msg.service.MsgInfoService
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpAlertVo
;
import
com.yifu.cloud.plus.v1.msg.vo.EkpInsertMsgVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -212,4 +213,15 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
baseMapper
.
deleteHandledMsg
();
}
@Override
public
R
sendZbMessage
(
EkpInsertMsgVo
vo
)
{
int
a
=
baseMapper
.
insertMsg
(
vo
);
if
(
a
!=
-
1
)
{
return
R
.
ok
();
}
else
{
return
R
.
failed
(
"插入失败"
);
}
}
}
yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml
View file @
1b3cb29a
...
...
@@ -166,4 +166,9 @@
AND b1.fd_id IS NOT NULL
)
</delete>
<insert
id=
"insertMsg"
>
insert into msg_info (ID,URL,ORDER_ID,ALERT_USER,DOMAIN_NAME,CREATE_TIME,ALERT_TYPE,ORDER_NO)
value (REPLACE(UUID(),"-",""),#{vo.urlInfo},#{vo.orderId},#{vo.userName},#{vo.domainName},now(),'0',#{vo.dingdanNo})
</insert>
</mapper>
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