wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev

pull/4/head
WenShiJun 2024-01-11 18:04:11 +08:00
parent 152a6da70d 0b01e507c9
commit 0473aab406
10 changed files with 53 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/eightWork/AppConfinedSpaceController.java
View File

@ -171,7 +171,7 @@ public class AppConfinedSpaceController extends BaseController {
sendMessageUtil.sendMessages(mes1, paramsList1);
}
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID"));
tenCorpDto.setMessage(TenCorpConst.confinedSpace);
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
@ -254,7 +254,7 @@ public class AppConfinedSpaceController extends BaseController {
sendMessageUtil.sendMessages(mes, paramsList);
}
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID"));
tenCorpDto.setMessage(TenCorpConst.confinedSpace);
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
@ -710,7 +710,7 @@ public class AppConfinedSpaceController extends BaseController {
paramsList.add(params4);
sendMessageUtil.sendMessages(mes, paramsList);
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID"));
tenCorpDto.setMessage(TenCorpConst.confinedSpace);
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");

6
src/main/java/com/zcloud/controller/eightWork/AppElectricityController.java
View File

@ -153,7 +153,7 @@ public class AppElectricityController extends BaseController {
tenCorpDto.setMark(pd.getString("ELECTRICITY_ID"));
tenCorpDto.setMark_name("ELECTRICITY_ID");
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setData(pd);
tenCorpDto.setMessage(TenCorpConst.electricity);
@ -258,7 +258,7 @@ public class AppElectricityController extends BaseController {
tenCorpDto.setMark(pd.getString("ELECTRICITY_ID"));
tenCorpDto.setMark_name("ELECTRICITY_ID");
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setData(pd);
tenCorpDto.setMessage(TenCorpConst.electricity);
@ -635,7 +635,7 @@ public class AppElectricityController extends BaseController {
tenCorpDto.setMark(pd.getString("ELECTRICITY_ID"));
tenCorpDto.setMark_name("ELECTRICITY_ID");
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setData(pd);
tenCorpDto.setMessage(TenCorpConst.electricity);

4
src/main/java/com/zcloud/controller/eightWork/AppHotworkController.java
View File

@ -176,7 +176,7 @@ public class AppHotworkController extends BaseController {
tenCorpDto.setMark(pd.getString("HOTWORK_ID"));
tenCorpDto.setMark_name("HOTWORK_ID");
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setData(pd);
tenCorpDto.setMessage(TenCorpConst.hotWork);
@ -264,7 +264,7 @@ public class AppHotworkController extends BaseController {
tenCorpDto.setMark(pd.getString("HOTWORK_ID"));
tenCorpDto.setMark_name("HOTWORK_ID");
tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000");
tenCorpDto.setTopic("eightWork");
tenCorpDto.setTopic(Const.TOPIC_EIGHTWORK);
tenCorpDto.setData(pd);
tenCorpDto.setMessage(TenCorpConst.hotWork);

3
src/main/java/com/zcloud/service/mq/SendMessageService.java
View File

@ -4,8 +4,5 @@ import com.zcloud.dto.TenCorpDto;
public interface SendMessageService {
void sendMessage(TenCorpDto tenCorpDto) throws Exception;
void sendDelayQueue(TenCorpDto tenCorpDto);
void sendDelayQueue(String message);
}

54
src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java
View File

@ -22,9 +22,6 @@ import javax.annotation.Resource;
@Service
public class SendMessageServiceImpl implements SendMessageService {
@Value("${mq.topic.info}")
private String info;
@Resource
private RocketMQTemplate rocketMQTemplate;
@ -37,28 +34,6 @@ public class SendMessageServiceImpl implements SendMessageService {
@Resource
private MqMessageLogMapper mqMessageLogMapper;
public void sendMessage(TenCorpDto tenCorpDto) throws Exception {
try {
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
log.put("CREATE_TIME", DateUtil.getTime());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
SendResult sendResult = rocketMQTemplate.syncSend(this.info, tenCorpDto.toString());
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
e.printStackTrace();
PageData log = tenCorpDto.getPd();
log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
log.put("ERROR_MESSAGE", e.getMessage());
log.put("TYPE", "0");
log.put("TIME", DateUtil.getTime());
mqErrorMessageLogMapper.save(log);
}
}
@Override
public void sendDelayQueue(TenCorpDto tenCorpDto) {
PageData log = tenCorpDto.getPd();
@ -72,7 +47,7 @@ public class SendMessageServiceImpl implements SendMessageService {
System.out.println("生产者:" + tenCorpDto.toString());
// 推送消息
SendResult sendResult = rocketMQTemplate.syncSend(
MqUtil.analysistopic(tenCorpDto.getTopic()),
tenCorpDto.getTopic(),
new GenericMessage<>(tenCorpDto.toString()),
3000,
MqUtil.analysisTime(tenCorpDto.getTime_stamp()));
@ -90,33 +65,6 @@ public class SendMessageServiceImpl implements SendMessageService {
}
}
@Override
public void sendDelayQueue(String message) {
TenCorpDto tenCorpDto = JSONObject.parseObject(message,TenCorpDto.class);
try {
PageData log = tenCorpDto.getPd();
log.put("CREATE_TIME", DateUtil.getTime());
log.put("PRODUCER_NAME",tenCorpDto.getProducer_name());
log.put("MESSAGE_LOG_ID", Warden.get32UUID());
mqMessageLogMapper.save(log);
System.out.println("生产者:" + tenCorpDto.toString());
// 推送消息
SendResult sendResult = rocketMQTemplate.syncSend(
MqUtil.analysistopic(tenCorpDto.getTopic()),
new GenericMessage<>(message),
3000,
MqUtil.analysisTime(tenCorpDto.getTime_stamp()));
if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
throw new RuntimeException("产品入栈失败");
}
} catch (Exception e) {
PageData log = tenCorpDto.getPd();
logService.saveErrorMessage(log,e.getMessage());
e.printStackTrace();
}
}
public static void main(String[] args) {
try {
System.out.println(MqUtil.analysisTime("2023-06-30 14:30:00:000"));

3
src/main/java/com/zcloud/util/Const.java
View File

@ -67,6 +67,5 @@ public class Const {
public static final String ALIYUN_REGIONID = "cn-beijing"; // 点播服务接入地域
public static final String ENDPOINT = "vod.cn-beijing.aliyuncs.com";// 访问的域名
public static final String topic_eightWork="eightWork";
public static final String topic_info="info";
public static final String TOPIC_EIGHTWORK="eightWork_whb";
}

8
src/main/java/com/zcloud/util/MqUtil.java
View File

@ -71,14 +71,6 @@ public class MqUtil {
return 0;
}
public static String analysistopic(String producerName) {
switch (producerName){
case "eightWork" : return Const.topic_eightWork;
case "info" : return Const.topic_info;
default: return "";
}
}
public static Date dateFormat(String date) throws Exception{
return timeFormat.parse(date);
}

8
src/main/resources/application.properties
View File

@ -62,14 +62,14 @@ rocketmq.producer.retry-times-when-send-async-failed=3
## topic 前缀
mq.topic.info=info
mq.topic.eightWork=eightWork
mq.topic.eightWork=eightWork_whb
mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
#字符
spring.http.encoding.charset=UTF-8
spring.http.encoding.force=true
spring.http.encoding.enabled=true
spring.servlet.encoding.charset=UTF-8
spring.servlet.encoding.force=true
spring.servlet.encoding.enabled=true
# 关闭springboot启动时的banner
spring.main.banner-mode=off
#jar包部署时去掉注释

2
src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
View File

@ -232,6 +232,7 @@
p.NAME PERIODNAME,
t.NAME TYPENAME,
d.NAME as DEPARTMENT_NAME,
tt.NAME as TASK_TYPE_NAME,
sp.NAME
AS POST_NAME,
s.NAME AS SCREENTYPENAME,
@ -244,6 +245,7 @@
left join sys_dictionaries p on f.PERIOD = p.BIANMA
left join sys_dictionaries t on f.TYPE = t.BIANMA
left join sys_dictionaries s on f.SCREENTYPE = s.BIANMA
left join sys_dictionaries tt on f.TASK_TYPE = tt.DICTIONARIES_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID
left join SYS_POST sp on sp.POST_ID = f.POST_ID
LEFT JOIN SYS_USER u on u.USER_ID = f.USER_ID

62
src/main/resources/mybatis/dsno2/mq/MqMessageLogMapper.xml
View File

@ -20,7 +20,10 @@
f.MARK_NAME,
f.MESSAGE,
f.CREATE_TIME,
f.MESSAGE_LOG_ID
f.MESSAGE_LOG_ID,
f.TYPE,
f.DIGESTION_FLAG,
f.PLAN_TIME
</sql>
<!-- 字段用于新增 -->
@ -31,7 +34,10 @@
MARK_NAME,
MESSAGE,
CREATE_TIME,
MESSAGE_LOG_ID
MESSAGE_LOG_ID,
TYPE,
DIGESTION_FLAG,
PLAN_TIME
</sql>
<!-- 字段值 -->
@ -42,17 +48,20 @@
#{MARK_NAME},
#{MESSAGE},
#{CREATE_TIME},
#{MESSAGE_LOG_ID}
#{MESSAGE_LOG_ID},
#{TYPE},
#{DIGESTION_FLAG},
#{PLAN_TIME}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
<include refid="tableName"></include>
(
<include refid="Field2"></include>
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
<include refid="FieldValue"></include>
)
</insert>
@ -61,7 +70,7 @@
delete from
<include refid="tableName"></include>
where
MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
</delete>
<!-- 修改 -->
@ -69,15 +78,18 @@
update
<include refid="tableName"></include>
set
ID = #{ID},
PRODUCER_NAME = #{PRODUCER_NAME},
MARK = #{MARK},
MARK_NAME = #{MARK_NAME},
MESSAGE = #{MESSAGE},
CREATE_TIME = #{CREATE_TIME},
MESSAGE_LOG_ID = MESSAGE_LOG_ID
ID = #{ID},
PRODUCER_NAME = #{PRODUCER_NAME},
MARK = #{MARK},
MARK_NAME = #{MARK_NAME},
MESSAGE = #{MESSAGE},
CREATE_TIME = #{CREATE_TIME},
TYPE = #{TYPE},
DIGESTION_FLAG = #{DIGESTION_FLAG},
PLAN_TIME = #{PLAN_TIME},
MESSAGE_LOG_ID = MESSAGE_LOG_ID
where
MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
</update>
<!-- 通过ID获取数据 -->
@ -87,7 +99,7 @@
from
<include refid="tableName"></include> f
where
f.MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
f.MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
</select>
<!-- 列表 -->
@ -99,13 +111,13 @@
where 1=1
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件
字段1 LIKE '%'+ #{pd.KEYWORDS}+'%'
or
字段2 LIKE '%'+ #{pd.KEYWORDS}+'%'
-->
)
(
<!-- 根据需求自己加检索条件
字段1 LIKE '%'+ #{pd.KEYWORDS}+'%'
or
字段2 LIKE '%'+ #{pd.KEYWORDS}+'%'
-->
)
</if>
</select>
@ -122,9 +134,9 @@
delete from
<include refid="tableName"></include>
where
MESSAGE_LOG_ID in
MESSAGE_LOG_ID in
<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
#{item}
#{item}
</foreach>
</delete>