From 11155201067184c8f335537642e726963ca5c2de Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 30 Jun 2025 08:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E9=80=9A=E7=9F=A5=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EventGateController.java | 4 +- .../controller/MsgEventConfigController.java | 60 +++++++++++++++++++ .../mapper/MsgEventConfigMapper.java | 12 ++++ .../transientes/pojo/po/MsgEventConfig.java | 57 ++++++++++++++++++ .../service/MsgEventConfigService.java | 7 +++ .../impl/LargeScreenCountServiceImpl.java | 6 +- .../impl/MsgEventConfigServiceImpl.java | 17 ++++++ 7 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java index fbd70186..735ab97d 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java @@ -42,9 +42,6 @@ public class EventGateController extends BaseController { @ApiImplicitParam(name = "eventMsg", value = "暂态事件json字符", required = true) public HttpResult eventMsg(@RequestParam("msg") String msg) { String methodDescribe = getMethodDescribe("eventMsg"); - log.info("接收到暂降事件:{}",msg); - - //JSONObject jsonObject = new JSONObject(msg); webSocketServer.sendMessageToAll(msg); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -55,6 +52,7 @@ public class EventGateController extends BaseController { private void sendMessage(JSONObject jsonObject){ Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString()); + pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex,lineId).eq(PqsDeptsline::getSystype,sysTypeZt); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java new file mode 100644 index 00000000..c02fe1bf --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/MsgEventConfigController.java @@ -0,0 +1,60 @@ +package com.njcn.gather.event.transientes.controller; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; +import com.njcn.gather.event.transientes.service.MsgEventConfigService; +import com.njcn.web.controller.BaseController; +import com.njcn.web.utils.HttpResultUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author: cdf + * @CreateTime: 2025-06-27 + * @Description: + */ +@Api(tags = "暂降平台配置") +@RequestMapping("config") +@RestController +@RequiredArgsConstructor +@Slf4j +public class MsgEventConfigController extends BaseController { + + private final MsgEventConfigService msgEventConfigService; + + @OperateInfo(operateType = OperateType.ADD) + @PostMapping("/eventConfig") + @ApiOperation("暂降平台配置") + @ApiImplicitParam(name = "msgEventConfig", value = "实体", required = true) + @Transactional(rollbackFor = Exception.class) + public HttpResult eventConfig(@RequestBody @Validated MsgEventConfig msgEventConfig) { + String methodDescribe = getMethodDescribe("eventConfig"); + msgEventConfigService.remove(new LambdaQueryWrapper<>()); + msgEventConfig.setId(IdUtil.simpleUUID()); + msgEventConfigService.save(msgEventConfig); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } + + @OperateInfo + @GetMapping("/queryConfig") + @ApiOperation("接收远程推送的暂态事件") + public HttpResult queryConfig() { + String methodDescribe = getMethodDescribe("queryConfig"); + MsgEventConfig msgEventConfig = msgEventConfigService.getOne(new LambdaQueryWrapper<>()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, msgEventConfig, methodDescribe); + } +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java new file mode 100644 index 00000000..4635dae7 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventConfigMapper.java @@ -0,0 +1,12 @@ +package com.njcn.gather.event.transientes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; +import org.apache.ibatis.annotations.Mapper; + +/** + * MSG_EVENT_CONFIG表Mapper接口 + */ +@Mapper +public interface MsgEventConfigMapper extends BaseMapper { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java new file mode 100644 index 00000000..faf4fc8a --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventConfig.java @@ -0,0 +1,57 @@ +package com.njcn.gather.event.transientes.pojo.po; + +/** + * @Author: cdf + * @CreateTime: 2025-06-27 + * @Description: + */ +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * MSG_EVENT_CONFIG表实体类 + */ +@Data +@TableName("MSG_EVENT_CONFIG") +public class MsgEventConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId("ID") + private String id; + + /** + * 严重通知标识 + */ + @TableField("SERIOUS_NOTICE") + @NotNull(message = "严重通知标识不可为空") + private Integer seriousNotice; + + /** + * 普通通知标识 + */ + @TableField("NORMAL_NOTIC") + @NotNull(message = "普通通知标识不可为空") + private Integer normalNotic; + + /** + * 语音类型 + */ + @TableField("VOICE_TYPE") + @NotNull(message = "语音类型不可为空") + private Integer voiceType; + + /** + * 屏幕通知标识 + */ + @TableField("SCREEN_NOTIC") + @NotNull(message = "屏幕通知标识不可为空") + private Integer screenNotic; +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java new file mode 100644 index 00000000..9b5ef04c --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventConfigService.java @@ -0,0 +1,7 @@ +package com.njcn.gather.event.transientes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; + +public interface MsgEventConfigService extends IService { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 2a7e58ff..e887530b 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -615,8 +615,11 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { @Override public Page hasSendMsgPage(LargeScreenCountParam largeScreenCountParam) { + DateTime start = DateUtil.beginOfDay(DateUtil.parse(largeScreenCountParam.getSearchBeginTime())); + DateTime end = DateUtil.endOfDay(DateUtil.parse(largeScreenCountParam.getSearchEndTime())); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.orderByDesc(MsgEventInfo::getSendTime); + lambdaQueryWrapper.orderByDesc(MsgEventInfo::getSendTime).between(MsgEventInfo::getSendTime,start,end); return msgEventInfoService.page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)),lambdaQueryWrapper); } @@ -632,6 +635,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { po.setId(IdUtil.simpleUUID()); messageEventFeedbackService.save(po); pqsEventdetailService.lambdaUpdate().set(PqsEventdetail::getNoticeFlag,DataStateEnum.ENABLE.getCode()).eq(PqsEventdetail::getEventdetailIndex,messageEventFeedbackParam.getEventIndex()).update(); + msgEventInfoService.lambdaUpdate().set(MsgEventInfo::getIsHandle,DataStateEnum.ENABLE.getCode()).eq(MsgEventInfo::getEventIndex,messageEventFeedbackParam.getEventIndex()); return true; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java new file mode 100644 index 00000000..363bd4db --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventConfigServiceImpl.java @@ -0,0 +1,17 @@ +package com.njcn.gather.event.transientes.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.gather.event.transientes.mapper.MsgEventConfigMapper; +import com.njcn.gather.event.transientes.pojo.po.MsgEventConfig; +import com.njcn.gather.event.transientes.service.MsgEventConfigService; +import org.springframework.stereotype.Service; + +/** + * @Author: cdf + * @CreateTime: 2025-06-27 + * @Description: + */ +@Service +public class MsgEventConfigServiceImpl extends ServiceImpl implements MsgEventConfigService { + +}