Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

异常消息发送

Browse Source
赵嘉伟 4 years ago
parent edef2e53be
commit 26ef51836f
9 changed files with 152 additions and 24 deletions
Show Stats Download Patch File Download Diff File

13
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalMessageController.java
Unescape Escape View File

@ -1,22 +1,20 @@
package com.foreverwin.mesnac.anomaly.controller;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import com.foreverwin.mesnac.anomaly.model.AbnormalMessage;
import com.foreverwin.mesnac.anomaly.service.AbnormalMessageService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.anomaly.service.AbnormalMessageService;
import com.foreverwin.mesnac.anomaly.model.AbnormalMessage;
import java.util.List;
/**
*
* @author Philip
* @since 2021-07-20
* @since 2021-07-21
*/
@RestController
@RequestMapping("/Z-ABNORMAL-MESSAGE")
@ -78,6 +76,7 @@ public class AbnormalMessageController {
.or().like(AbnormalMessage::getUpUserGroup, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getUpUser, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getUpMessageType, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getGrade, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getAbnormalNode, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getStatus, frontPage.getGlobalQuery())
.or().like(AbnormalMessage::getCreatedUser, frontPage.getGlobalQuery())

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalMessageMapper.java
Unescape Escape View File

@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
* </p>
*
* @author Philip
* @since 2021-07-20
* @since 2021-07-21
*/
@Repository
public interface AbnormalMessageMapper extends BaseMapper<AbnormalMessage> {

18
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalMessage.java
Unescape Escape View File

@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author Philip
* @since 2021-07-20
* @since 2021-07-21
*/
@TableName("Z_ABNORMAL_MESSAGE")
@ -84,6 +84,11 @@ public class AbnormalMessage extends Model<AbnormalMessage> {
*/
@TableField("UP_DATE_TIME")
private LocalDateTime upDateTime;
/**
* 等级
*/
@TableField("GRADE")
private String grade;
/**
* 消息触发时间
*/
@ -217,6 +222,14 @@ public class AbnormalMessage extends Model<AbnormalMessage> {
this.upDateTime = upDateTime;
}
public String getGrade() {
return grade;
}
public void setGrade(String grade) {
this.grade = grade;
}
public LocalDateTime getResponseDateTime() {
return responseDateTime;
}
@ -297,6 +310,8 @@ public static final String UP_MESSAGE_TYPE = "UP_MESSAGE_TYPE";
public static final String UP_DATE_TIME = "UP_DATE_TIME";
public static final String GRADE = "GRADE";
public static final String RESPONSE_DATE_TIME = "RESPONSE_DATE_TIME";
public static final String ABNORMAL_NODE = "ABNORMAL_NODE";
@ -332,6 +347,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
", upUser = " + upUser +
", upMessageType = " + upMessageType +
", upDateTime = " + upDateTime +
", grade = " + grade +
", responseDateTime = " + responseDateTime +
", abnormalNode = " + abnormalNode +
", status = " + status +

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalMessageService.java
Unescape Escape View File

@ -13,7 +13,7 @@ import java.util.List;
* </p>
*
* @author Philip
* @since 2021-07-20
* @since 2021-07-21
*/
public interface AbnormalMessageService extends IService<AbnormalMessage> {

110
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -14,9 +14,11 @@ import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.helper.NextNumberHelper;
import com.foreverwin.mesnac.common.service.AnomalyService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.dto.ShopOrderDto;
import com.foreverwin.mesnac.meapi.mapper.*;
import com.foreverwin.mesnac.meapi.model.*;
import com.foreverwin.mesnac.meapi.service.*;
import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
@ -102,6 +104,21 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Autowired
private OperationMapper operationMapper;
@Autowired
private MessageTypeService messageTypeService;
@Autowired
private MessageTypeMapper messageTypeMapper;
@Autowired
private WorkCenterMapper workCenterMapper;
@Autowired
private ItemMapper itemMapper;
@Autowired
private UserGroupMapper userGroupMapper;
@Override
public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
@ -566,6 +583,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
}
this.anomalyReportSendMessage(abnormalBill);
return message;
@ -734,12 +753,17 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
List<NwaUser> sendUsersList = nwaUserService.checkUserGroup(abnormalBill.getReportSendUserGroup());
String site = CommonMethods.getSite();
String user = CommonMethods.getUser();
String locale = LocaleContextHolder.getLocale().getLanguage();
LocalDateTime now = LocalDateTime.now();
AbnormalMessage abnormalMessage = new AbnormalMessage();
//发送消息的主键
String handle = UUID.randomUUID().toString();
abnormalMessage.setHandle(handle);
//站点
abnormalMessage.setSite(site);
//异常单
abnormalMessage.setAbnormalBillBo(abnormalBill.getHandle());
//异常类型
abnormalMessage.setType(abnormalBill.getType());
//根据异常的类型找到消息的类型
switch (abnormalMessage.getType()){
@ -753,19 +777,83 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalMessage.setMessageType(Constants.ABNORMAL_MESSAGE_RESOURCE);
break;
}
//设置发送的用户组和发送用户
//设置发送的用户组
abnormalMessage.setSendUserGroup(abnormalBill.getReportSendUserGroup());
//设置发送用户
StringBuilder sendUser = new StringBuilder();
for (int i = 0; i < sendUsersList.size(); i++) {
if(i == (sendUsersList.size() - 1)){
sendUser.append(sendUsersList.get(i));
}else{
sendUser.append(sendUsersList.get(i)).append(",");
}
}
abnormalMessage.setSendUser(sendUser.toString());
//设置发送用户，响应时设置
// StringBuilder sendUser = new StringBuilder();
// for (int i = 0; i < sendUsersList.size(); i++) {
// if(i == (sendUsersList.size() - 1)){
// sendUser.append(sendUsersList.get(i));
// }else{
// sendUser.append(sendUsersList.get(i)).append(",");
// }
// }
// abnormalMessage.setSendUser(sendUser.toString());
//找到消息内容
MessageType messageTypeEntity = new MessageType();
messageTypeEntity.setSite(site);
messageTypeEntity.setMessageType(abnormalMessage.getMessageType());
QueryWrapper<MessageType> messageTypeQueryWrapper = new QueryWrapper<MessageType>();
messageTypeQueryWrapper.setEntity(messageTypeEntity);
MessageType messageType = messageTypeMapper.selectOne(messageTypeQueryWrapper);
if(messageType == null){
throw new BaseException("异常提报时找不到要发送的消息类型");
}
//格式化消息
String body = messageType.getBody();
//替换消息类型中的参数
Map<String, String> messageMap = new HashMap<>();
//根据车间找到对应车间的描述
WorkCenter workCenter = workCenterMapper.findWorkCenterDescriptionByWorkCenter(site, abnormalBill.getWorkCenter(), locale);
//根据资源找到对应的产线的描述
WorkCenter line = workCenterMapper.findWorkCenterDescriptionByResrce(HandleEnum.RESOURCE.getHandle(site, abnormalBill.getResrce()), locale);
//项目号
ShopOrderDto projectNo = shopOrderMapper.findByShopOrderBo(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBill.getShopOrder()));
//物料
Item _item = itemMapper.selectById(locale, abnormalBill.getItemBo());
String item = _item.getItem() + "/" + _item.getDescription();
messageMap.put("WORKCENTER",workCenter.getDescription());
messageMap.put("WORKCENTER_LIN",line.getDescription());
messageMap.put("PROJECT",projectNo.getItemNumber());
messageMap.put("SHOPORDER",abnormalBill.getWorkCenter());
messageMap.put("ITEM",item);
String message = StringUtils.format(body, messageMap);
//得到要发送的消息
abnormalMessage.setContent(message);
//得到升级的用户组
// List<String> _upSendUserGroups = Arrays.asList(abnormalMessage.getSendUserGroup().split(","));
// for(int i = 0; i < _upSendUserGroups.size(); i++){
// _upSendUserGroups.set(i,_upSendUserGroups.get(i)+"_UP");
// }
// List<UserGroup> upSendUserGroups = userGroupMapper.getUserGroupListByGroups(site, _upSendUserGroups);
// if(upSendUserGroups != null && upSendUserGroups.size() > 0){
// abnormalMessage.setUpUserGroup(upSendUserGroups.get(0).getUserGroup());
// }
//得到升级的用户组
abnormalMessage.setUpUserGroup(abnormalMessage.getSendUserGroup()+"_UP");
//得到升级的消息类型
abnormalMessage.setUpMessageType(abnormalMessage.getMessageType());
//得到消息触发的时间
abnormalMessage.setResponseDateTime(now);
//得到升级的时间和等级
UserGroup customFieldByGroup = userGroupMapper.getCustomFieldByGroup(site, abnormalMessage.getSendUserGroup());
abnormalMessage.setUpDateTime(abnormalMessage.getResponseDateTime().plusMinutes(Integer.parseInt(customFieldByGroup.getMessageNoticeTime())));
abnormalMessage.setGrade(customFieldByGroup.getMessageNoticeLevel());
//得到异常节点
abnormalMessage.setAbnormalNode(Constants.ABNORMAL_MESSAGE_REPORT);
//设置状态
if(Constants.ABNORMAL_MESSAGE_REPORT.equals(abnormalMessage.getAbnormalNode())){
abnormalMessage.setStatus("Y");
}else{
abnormalMessage.setStatus("N");
}
abnormalMessage.setCreatedUser(user);
abnormalMessage.setCreatedDateTime(now);
abnormalMessage.setModifiedUser(user);
abnormalMessage.setModifiedDateTime(now);
return false;
}

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalMessageServiceImpl.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.util.List;
* </p>
*
* @author Philip
* @since 2021-07-20
* @since 2021-07-21
*/
@Service
@Transactional(rollbackFor = Exception.class)

2
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -917,7 +917,7 @@
Z_ABNORMAL_BILL ZAB
INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE
INNER JOIN RESRCE R ON R.RESRCE = ZAB.RESRCE AND R.SITE = ZAB.SITE
LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = ('WORKCENTERBO:' || ZAB.SITE || ',' || ZAB.WORK_CENTER) AND WCT.LOCALE =#{language}
LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = ('WorkCenterBO:' || ZAB.SITE || ',' || ZAB.WORK_CENTER) AND WCT.LOCALE =#{language}
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE
LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = ZAB.RESPONSE_USER AND ZNU2.SITE = ZAB.SITE
LEFT JOIN Z_NWA_USER ZNU3 ON ZNU3.USER_NAME = ZABD.RESOLVE_USER AND ZNU3.SITE = ZAB.SITE

18
anomaly/src/main/resources/mapper/AbnormalMessageMapper.xml
Unescape Escape View File

@ -16,6 +16,7 @@
<result column="UP_USER" property="upUser" />
<result column="UP_MESSAGE_TYPE" property="upMessageType" />
<result column="UP_DATE_TIME" property="upDateTime" />
<result column="GRADE" property="grade" />
<result column="RESPONSE_DATE_TIME" property="responseDateTime" />
<result column="ABNORMAL_NODE" property="abnormalNode" />
<result column="STATUS" property="status" />
@ -27,7 +28,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, ABNORMAL_BILL_BO, TYPE, MESSAGE_TYPE, SEND_USER_GROUP, SEND_USER, CONTENT, UP_USER_GROUP, UP_USER, UP_MESSAGE_TYPE, UP_DATE_TIME, RESPONSE_DATE_TIME, ABNORMAL_NODE, STATUS, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
HANDLE, SITE, ABNORMAL_BILL_BO, TYPE, MESSAGE_TYPE, SEND_USER_GROUP, SEND_USER, CONTENT, UP_USER_GROUP, UP_USER, UP_MESSAGE_TYPE, UP_DATE_TIME, GRADE, RESPONSE_DATE_TIME, ABNORMAL_NODE, STATUS, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -73,6 +74,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -102,6 +104,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -139,6 +142,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -176,6 +180,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -213,6 +218,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -250,6 +256,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -287,6 +294,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -320,6 +328,7 @@
<if test="upUser!=null">UP_USER,</if>
<if test="upMessageType!=null">UP_MESSAGE_TYPE,</if>
<if test="upDateTime!=null">UP_DATE_TIME,</if>
<if test="grade!=null">GRADE,</if>
<if test="responseDateTime!=null">RESPONSE_DATE_TIME,</if>
<if test="abnormalNode!=null">ABNORMAL_NODE,</if>
<if test="status!=null">STATUS,</if>
@ -341,6 +350,7 @@
<if test="upUser!=null">#{upUser},</if>
<if test="upMessageType!=null">#{upMessageType},</if>
<if test="upDateTime!=null">#{upDateTime},</if>
<if test="grade!=null">#{grade},</if>
<if test="responseDateTime!=null">#{responseDateTime},</if>
<if test="abnormalNode!=null">#{abnormalNode},</if>
<if test="status!=null">#{status},</if>
@ -369,6 +379,7 @@
#{upUser},
#{upMessageType},
#{upDateTime},
#{grade},
#{responseDateTime},
#{abnormalNode},
#{status},
@ -393,6 +404,7 @@
<if test="et.upUser!=null">UP_USER=#{et.upUser},</if>
<if test="et.upMessageType!=null">UP_MESSAGE_TYPE=#{et.upMessageType},</if>
<if test="et.upDateTime!=null">UP_DATE_TIME=#{et.upDateTime},</if>
<if test="et.grade!=null">GRADE=#{et.grade},</if>
<if test="et.responseDateTime!=null">RESPONSE_DATE_TIME=#{et.responseDateTime},</if>
<if test="et.abnormalNode!=null">ABNORMAL_NODE=#{et.abnormalNode},</if>
<if test="et.status!=null">STATUS=#{et.status},</if>
@ -417,6 +429,7 @@
UP_USER=#{et.upUser},
UP_MESSAGE_TYPE=#{et.upMessageType},
UP_DATE_TIME=#{et.upDateTime},
GRADE=#{et.grade},
RESPONSE_DATE_TIME=#{et.responseDateTime},
ABNORMAL_NODE=#{et.abnormalNode},
STATUS=#{et.status},
@ -441,6 +454,7 @@
<if test="et.upUser!=null">UP_USER=#{et.upUser},</if>
<if test="et.upMessageType!=null">UP_MESSAGE_TYPE=#{et.upMessageType},</if>
<if test="et.upDateTime!=null">UP_DATE_TIME=#{et.upDateTime},</if>
<if test="et.grade!=null">GRADE=#{et.grade},</if>
<if test="et.responseDateTime!=null">RESPONSE_DATE_TIME=#{et.responseDateTime},</if>
<if test="et.abnormalNode!=null">ABNORMAL_NODE=#{et.abnormalNode},</if>
<if test="et.status!=null">STATUS=#{et.status},</if>
@ -464,6 +478,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
@ -518,6 +533,7 @@
<if test="ew.entity.upUser!=null"> AND UP_USER=#{ew.entity.upUser}</if>
<if test="ew.entity.upMessageType!=null"> AND UP_MESSAGE_TYPE=#{ew.entity.upMessageType}</if>
<if test="ew.entity.upDateTime!=null"> AND UP_DATE_TIME=#{ew.entity.upDateTime}</if>
<if test="ew.entity.grade!=null"> AND GRADE=#{ew.entity.grade}</if>
<if test="ew.entity.responseDateTime!=null"> AND RESPONSE_DATE_TIME=#{ew.entity.responseDateTime}</if>
<if test="ew.entity.abnormalNode!=null"> AND ABNORMAL_NODE=#{ew.entity.abnormalNode}</if>
<if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>

9
common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
Unescape Escape View File

@ -140,4 +140,13 @@ public interface Constants {
String ABNORMAL_MESSAGE_OTHER = "OTYC";//其他异常消息类型
String ABNORMAL_MESSAGE_RESOURCE = "RSYC";//设备异常消息类型
/**
* 异常节点
*/
String ABNORMAL_MESSAGE_REPORT = "REPORT";//异常上报
String ABNORMAL_MESSAGE_RESPONSE = "RESPONSE";//响应
String ABNORMAL_MESSAGE_PROGRAM_CONFIRM = "PROGRAM_CONFIRM";//方案确认
String ABNORMAL_MESSAGE_CORRECTION_CONFIRM = "CORRECTION_CONFIRM";//纠防确认
String ABNORMAL_MESSAGE_CANCEL = "CANCEL";//取消
}

Write Preview
Loading…
Cancel
Save