作者 钟来

修改bug

正在显示 11 个修改的文件 包含 19 行增加16 行删除
package com.zhonglai.luhui.device.analysis.comm.dto;
import com.zhonglai.luhui.device.analysis.dto.Message;
import com.zhonglai.luhui.device.analysis.dto.MessageCode;
import com.zhonglai.luhui.device.analysis.dto.MessageCodeType;
/**
* 回复给前端的消息
*/
public class ApiClientRePlyDto {
private int code;
private MessageCodeType code;
private String message;
private Object data;
public int getCode() {
public MessageCodeType getCode() {
return code;
}
public void setCode(int code) {
public void setCode(MessageCodeType code) {
this.code = code;
}
... ... @@ -36,7 +38,7 @@ public class ApiClientRePlyDto {
public void setReplyMessage(Message message)
{
message.setData(this.code);
message.setCode(this.code);
message.setMessage(this.message);
message.setData(this.data);
}
... ...
... ... @@ -18,7 +18,7 @@ public class PutReq {
ApiClientRePlyDto noticeMessage = new ApiClientRePlyDto();
if(jsonObject.has("code") && "1".equals(jsonObject.get("code").getAsString()))
{
noticeMessage.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
noticeMessage.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
noticeMessage.setMessage("操作成功");
}
return new AnalysisResult(false, true, jsonObject, noticeMessage);
... ...
... ... @@ -29,7 +29,7 @@ public class ReadReq {
{
noticeMessage.setData(GsonConstructor.get().fromJson(jsonObject.getAsJsonObject("data").toString(), HashMap.class));
}
noticeMessage.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
noticeMessage.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
noticeMessage.setMessage("操作成功");
}
return new AnalysisResult(false, true, rJsonObject, noticeMessage);
... ...
... ... @@ -25,7 +25,7 @@ public class PutReq {
{
message.setData(GsonConstructor.get().fromJson(jsonObject.getAsJsonObject("data"), HashMap.class));
}
message.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
message.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
message.setMessage("操作成功");
}
return new AnalysisResult(false, true, jsonObject, message);
... ...
... ... @@ -57,7 +57,7 @@ public class PLC004ProtocolParserFactoryImpl implements ProtocolParserFactory {
ApiClientRePlyDto apiClientRePlyDto = new ApiClientRePlyDto();
if(jsonObject.has("result") && "1".equals(jsonObject.get("result").getAsString()))
{
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setMessage("操作成功");
}
return new AnalysisResult(false, true, data, apiClientRePlyDto);
... ...
... ... @@ -31,7 +31,7 @@ public class CkaDtSndR {
Map<String,Object> wmap = new HashMap<>();
wmap.put("1",map);
ApiClientRePlyDto apiClientRePlyDto = new ApiClientRePlyDto();
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setData(wmap);
return new AnalysisResult(false, true, jsonObject, apiClientRePlyDto);
}
... ...
... ... @@ -93,7 +93,7 @@ public class CkaDtSndS {
if(DeviceCommandListenService.hasClienConnection(clientid))
{
ApiClientRePlyDto apiClientRePlyDto = new ApiClientRePlyDto();
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setData(JSONObject.parseObject(jsonObject.toString(),HashMap.class));
return new AnalysisResult(true,true,jsonObject, apiClientRePlyDto);
}
... ...
... ... @@ -105,5 +105,6 @@ public class DeviceProductProtocol {
deviceDataWriteConfigList.add(new DeviceDataConfig(72,"YC_AUTO_P002",PLCType.排污,PLCDataType.控制器状态码,"41","远程自动按钮",null,"01"));
deviceDataWriteConfigList.add(new DeviceDataConfig(74,"SYS_REST",PLCType.推水机,PLCDataType.复位,"01","设备故障复位",null,"1"));
}
}
... ...
... ... @@ -24,12 +24,12 @@ public class PutReqTopic implements BusinessAgreement<PutReqDto> {
public ServerDto analysis(Topic topic, PutReqDto data) throws Exception {
ApiClientRePlyDto apiClientRePlyDto = new ApiClientRePlyDto();
apiClientRePlyDto.setData(data.getTime());
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE);
apiClientRePlyDto.setMessage(data.getMsg());
switch (data.getResult())
{
case "1":
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setMessage("成功");
break;
}
... ...
... ... @@ -25,12 +25,12 @@ public class PutReqTopic implements BusinessAgreement<PutReqDto> {
data.setMessageid(topic.getMessageid());
ApiClientRePlyDto apiClientRePlyDto = new ApiClientRePlyDto();
apiClientRePlyDto.setData(data.getData());
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setMessage("成功");
switch (data.getCode())
{
case 0:
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE);
apiClientRePlyDto.setMessage("失败");
break;
}
... ...
... ... @@ -104,7 +104,7 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> {
{
apiClientRePlyDto.setData(JSONObject.parseObject(data.getData().toJSONString(), HashMap.class));
}
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_SUCCESS_CODE);
apiClientRePlyDto.setMessage("成功");
clienNoticeService.replySendMessage(topic, apiClientRePlyDto);
... ... @@ -116,7 +116,7 @@ public class ReadReqTopic implements BusinessAgreement<ReadReqDto> {
{
apiClientRePlyDto.setData(JSONObject.parseObject(data.getData().toJSONString(), HashMap.class));
}
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE.code);
apiClientRePlyDto.setCode(MessageCode.DEFAULT_FAIL_CODE);
apiClientRePlyDto.setMessage("失败");
clienNoticeService.replySendMessage(topic,apiClientRePlyDto);
return null;
... ...